2003-02-12 Phil Edwards <pme@gcc.gnu.org>

[pf3gnuchains/gcc-fork.git] / gcc / aclocal.m4

diff --git a/gcc/aclocal.m4 b/gcc/aclocal.m4
index 3ae8b83..6e5fa4a 100644 (file)
--- a/gcc/aclocal.m4
+++ b/gcc/aclocal.m4
@@ -308,10 +308,7 @@ procedure conftest is begin null; end conftest;
 EOF
 gcc_cv_prog_adac=no
 # Have to do ac_tool_prefix and user overrides by hand.
-user_adac=$ADAC
-user_cc=$CC
-for cand in ${ac_tool_prefix}$user_adac        $user_adac      \
-           ${ac_tool_prefix}$user_cc   $user_cc        \
+for cand in ${ADAC+"$ADAC"} ${CC+"$CC"}        \
            ${ac_tool_prefix}gcc        gcc             \
            ${ac_tool_prefix}cc         cc              \
            ${ac_tool_prefix}gnatgcc    gnatgcc         \
@@ -1631,14 +1628,14 @@ AC_DEFUN(gcc_AC_INITFINI_ARRAY,
        [  --enable-initfini-array      use .init_array/.fini_array sections],
        [], [
 AC_CACHE_CHECK(for .preinit_array/.init_array/.fini_array support,
-                gcc_cv_initfinit_array, [dnl
+                gcc_cv_initfini_array, [dnl
   AC_TRY_RUN([
 static int x = -1;
 int main (void) { return x; }
 int foo (void) { x = 0; }
 int (*fp) (void) __attribute__ ((section (".init_array"))) = foo;],
-            [gcc_cv_initfinit_array=yes], [gcc_cv_initfinit_array=no],
-            [gcc_cv_initfinit_array=no])])
+            [gcc_cv_initfini_array=yes], [gcc_cv_initfini_array=no],
+            [gcc_cv_initfini_array=no])])
   enable_initfini_array=$gcc_cv_initfini_array
 ])
 if test $enable_initfini_array = yes; then