* acgeneral.m4 (AC_TRY_COMPILER): Fix quotation.

diff --git a/ChangeLog b/ChangeLog
index 1440317748c83ca00aac6e2f9aba06c3617ee797..dae43f85f876f7ec5fdac74b8453f6284e8c76e9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2000-05-19  Akim Demaille  <akim@epita.fr>
+
+       * acgeneral.m4 (AC_TRY_COMPILER): Fix quotation.
+
 2000-05-19  Akim Demaille  <akim@epita.fr>
 
        Fix Autoconf/123.

diff --git a/acgeneral.m4 b/acgeneral.m4
index 9bba944d3d7e21639e8ba5feb44c33c4ea01beb1..bc3edaa9f9fc99ca4aefd5c4f0ae8f23ebc4693e 100644 (file)
--- a/acgeneral.m4
+++ b/acgeneral.m4
@@ -2671,14 +2671,14 @@ popdef([AC_Prog])dnl
 # language.
 AC_DEFUN(AC_TRY_COMPILER,
 [AC_LINK_IFELSE([AC_LANG_SOURCE([[$1]])],
-[[$2]=yes
+[$2=yes
   # If we can't run a trivial program, we are probably using a cross compiler.
   if (./conftest; exit) 2>/dev/null; then
-    [$3]=no
+    $3=no
   else
-    [$3]=yes
+    $3=yes
   fi],
-[[$2]=no])[]dnl
+[$2=no])[]dnl
 ])# AC_TRY_COMPILER
 
 

diff --git a/configure b/configure
index b4772c7bdcac3cbd5d7533c738d283af8b884b1c..7b125aa280857ad716668997f84257eb446ef791 100755 (executable)
--- a/configure
+++ b/configure
@@ -170,8 +170,10 @@ do
     ac_init_help=short ;;
 
   -host | --host | --hos | --ho)
+    cross_compiling=yes
     ac_prev=host ;;
   -host=* | --host=* | --hos=* | --ho=*)
+    cross_compiling=yes
     host=$ac_optarg ;;
 
   -includedir | --includedir | --includedi | --included | --include \
@@ -642,7 +644,6 @@ ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-cross_compiling=$ac_cv_prog_cc_cross
 
 if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then
   # Stardent Vistra SVR4 grep lacks -e, says Kaveh R. Ghazi.
@@ -690,7 +691,7 @@ ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure.
 # AFS /usr/afsws/bin/install, which mishandles nonexistent args
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # ./install, which can be erroneously created by make from ./install.sh.
-echo "configure:608: checking for a BSD compatible install" >&5
+echo "configure:609: checking for a BSD compatible install" >&5
 echo $ECHO_N "checking for a BSD compatible install... $ECHO_C" >&6
 if test -z "$INSTALL"; then
 if test "${ac_cv_path_install+set}" = set; then
@@ -737,7 +738,7 @@ fi
     INSTALL=$ac_install_sh
   fi
 fi
-echo "configure:654: result: $INSTALL" >&5
+echo "configure:655: result: $INSTALL" >&5
 echo "${ECHO_T}$INSTALL" >&6
 
 # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
@@ -748,7 +749,7 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
 
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
-echo "configure:661: checking whether build environment is sane" >&5
+echo "configure:662: checking whether build environment is sane" >&5
 echo $ECHO_N "checking whether build environment is sane... $ECHO_C" >&6
 # Just in case
 sleep 1
@@ -785,7 +786,7 @@ else
 Check your system clock" >&2; exit 1; }
 fi
 rm -f conftest*
-echo "configure:696: result: yes" >&5
+echo "configure:697: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 if test "$program_transform_name" = s,x,x,; then
   program_transform_name=
@@ -806,7 +807,7 @@ test "$program_suffix" != NONE &&
 # sed with no file args requires a program.
 test -z "$program_transform_name" && program_transform_name="s,x,x,"
 
-echo "configure:715: checking whether ${MAKE-make} sets \${MAKE}" >&5
+echo "configure:716: checking whether ${MAKE-make} sets \${MAKE}" >&5
 echo $ECHO_N "checking whether ${MAKE-make} sets \${MAKE}... $ECHO_C" >&6
 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
 if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then
@@ -826,11 +827,11 @@ fi
 rm -f conftestmake
 fi
 if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
-  echo "configure:735: result: yes" >&5
+  echo "configure:736: result: yes" >&5
 echo "${ECHO_T}yes" >&6
   SET_MAKE=
 else
-  echo "configure:739: result: no" >&5
+  echo "configure:740: result: no" >&5
 echo "${ECHO_T}no" >&6
   SET_MAKE="MAKE=${MAKE-make}"
 fi
@@ -852,78 +853,78 @@ cat >>confdefs.h <<EOF
 EOF
 
 missing_dir=`cd $ac_aux_dir && pwd`
-echo "configure:755: checking for working aclocal" >&5
+echo "configure:756: checking for working aclocal" >&5
 echo $ECHO_N "checking for working aclocal... $ECHO_C" >&6
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
 if (aclocal --version) < /dev/null > /dev/null 2>&1; then
    ACLOCAL=aclocal
-   echo "configure:762: result: found" >&5
+   echo "configure:763: result: found" >&5
 echo "${ECHO_T}found" >&6
 else
    ACLOCAL="$missing_dir/missing aclocal"
-   echo "configure:766: result: missing" >&5
+   echo "configure:767: result: missing" >&5
 echo "${ECHO_T}missing" >&6
 fi
 
-echo "configure:769: checking for working autoconf" >&5
+echo "configure:770: checking for working autoconf" >&5
 echo $ECHO_N "checking for working autoconf... $ECHO_C" >&6
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
 if (autoconf --version) < /dev/null > /dev/null 2>&1; then
    AUTOCONF=autoconf
-   echo "configure:776: result: found" >&5
+   echo "configure:777: result: found" >&5
 echo "${ECHO_T}found" >&6
 else
    AUTOCONF="$missing_dir/missing autoconf"
-   echo "configure:780: result: missing" >&5
+   echo "configure:781: result: missing" >&5
 echo "${ECHO_T}missing" >&6
 fi
 
-echo "configure:783: checking for working automake" >&5
+echo "configure:784: checking for working automake" >&5
 echo $ECHO_N "checking for working automake... $ECHO_C" >&6
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
 if (automake --version) < /dev/null > /dev/null 2>&1; then
    AUTOMAKE=automake
-   echo "configure:790: result: found" >&5
+   echo "configure:791: result: found" >&5
 echo "${ECHO_T}found" >&6
 else
    AUTOMAKE="$missing_dir/missing automake"
-   echo "configure:794: result: missing" >&5
+   echo "configure:795: result: missing" >&5
 echo "${ECHO_T}missing" >&6
 fi
 
-echo "configure:797: checking for working autoheader" >&5
+echo "configure:798: checking for working autoheader" >&5
 echo $ECHO_N "checking for working autoheader... $ECHO_C" >&6
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
 if (autoheader --version) < /dev/null > /dev/null 2>&1; then
    AUTOHEADER=autoheader
-   echo "configure:804: result: found" >&5
+   echo "configure:805: result: found" >&5
 echo "${ECHO_T}found" >&6
 else
    AUTOHEADER="$missing_dir/missing autoheader"
-   echo "configure:808: result: missing" >&5
+   echo "configure:809: result: missing" >&5
 echo "${ECHO_T}missing" >&6
 fi
 
-echo "configure:811: checking for working makeinfo" >&5
+echo "configure:812: checking for working makeinfo" >&5
 echo $ECHO_N "checking for working makeinfo... $ECHO_C" >&6
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
 if (makeinfo --version) < /dev/null > /dev/null 2>&1; then
    MAKEINFO=makeinfo
-   echo "configure:818: result: found" >&5
+   echo "configure:819: result: found" >&5
 echo "${ECHO_T}found" >&6
 else
    MAKEINFO="$missing_dir/missing makeinfo"
-   echo "configure:822: result: missing" >&5
+   echo "configure:823: result: missing" >&5
 echo "${ECHO_T}missing" >&6
 fi
 
@@ -933,7 +934,7 @@ for ac_prog in gm4 gnum4 m4
 do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "configure:830: checking for $ac_word" >&5
+echo "configure:831: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_M4+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -958,10 +959,10 @@ esac
 fi
 M4=$ac_cv_path_M4
 if test -n "$M4"; then
-  echo "configure:855: result: $M4" >&5
+  echo "configure:856: result: $M4" >&5
 echo "${ECHO_T}$M4" >&6
 else
-  echo "configure:858: result: no" >&5
+  echo "configure:859: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -969,7 +970,7 @@ test -n "$M4" && break
 done
 test -n "$M4" || M4="m4"
 
-echo "configure:864: checking whether m4 supports frozen files" >&5
+echo "configure:865: checking whether m4 supports frozen files" >&5
 echo $ECHO_N "checking whether m4 supports frozen files... $ECHO_C" >&6
 if test "${ac_cv_prog_gnu_m4+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -981,7 +982,7 @@ if test x"$M4" != x; then
   esac
 fi
 fi
-echo "configure:876: result: $ac_cv_prog_gnu_m4" >&5
+echo "configure:877: result: $ac_cv_prog_gnu_m4" >&5
 echo "${ECHO_T}$ac_cv_prog_gnu_m4" >&6
 if test x"$ac_cv_prog_gnu_m4" != xyes; then
   { echo "configure: error: GNU m4 1.4 is required" >&2; exit 1; }
@@ -991,7 +992,7 @@ for ac_prog in mawk gawk nawk awk
 do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "configure:885: checking for $ac_word" >&5
+echo "configure:886: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_AWK+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -1016,34 +1017,34 @@ fi
 fi
 AWK=$ac_cv_prog_AWK
 if test -n "$AWK"; then
-  echo "configure:910: result: $AWK" >&5
+  echo "configure:911: result: $AWK" >&5
 echo "${ECHO_T}$AWK" >&6
 else
-  echo "configure:913: result: no" >&5
+  echo "configure:914: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
 test -n "$AWK" && break
 done
 
-echo "configure:918: checking for working help2man" >&5
+echo "configure:919: checking for working help2man" >&5
 echo $ECHO_N "checking for working help2man... $ECHO_C" >&6
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
 if (help2man --version) < /dev/null > /dev/null 2>&1; then
    HELP2MAN=help2man
-   echo "configure:925: result: found" >&5
+   echo "configure:926: result: found" >&5
 echo "${ECHO_T}found" >&6
 else
    HELP2MAN="\${SHELL} \${top_srcdir}/missing help2man"
-   echo "configure:929: result: missing" >&5
+   echo "configure:930: result: missing" >&5
 echo "${ECHO_T}missing" >&6
 fi
 
 # Extract the first word of "perl", so it can be a program name with args.
 set dummy perl; ac_word=$2
-echo "configure:934: checking for $ac_word" >&5
+echo "configure:935: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_PERL+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -1069,10 +1070,10 @@ esac
 fi
 PERL=$ac_cv_path_PERL
 if test -n "$PERL"; then
-  echo "configure:960: result: $PERL" >&5
+  echo "configure:961: result: $PERL" >&5
 echo "${ECHO_T}$PERL" >&6
 else
-  echo "configure:963: result: no" >&5
+  echo "configure:964: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -1093,7 +1094,7 @@ fi
 # AFS /usr/afsws/bin/install, which mishandles nonexistent args
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # ./install, which can be erroneously created by make from ./install.sh.
-echo "configure:982: checking for a BSD compatible install" >&5
+echo "configure:983: checking for a BSD compatible install" >&5
 echo $ECHO_N "checking for a BSD compatible install... $ECHO_C" >&6
 if test -z "$INSTALL"; then
 if test "${ac_cv_path_install+set}" = set; then
@@ -1140,7 +1141,7 @@ fi
     INSTALL=$ac_install_sh
   fi
 fi
-echo "configure:1028: result: $INSTALL" >&5
+echo "configure:1029: result: $INSTALL" >&5
 echo "${ECHO_T}$INSTALL" >&6
 
 # Use test -z because SunOS4 sh mishandles braces in ${var-val}.

diff --git a/lib/autoconf/general.m4 b/lib/autoconf/general.m4
index 9bba944d3d7e21639e8ba5feb44c33c4ea01beb1..bc3edaa9f9fc99ca4aefd5c4f0ae8f23ebc4693e 100644 (file)
--- a/lib/autoconf/general.m4
+++ b/lib/autoconf/general.m4
@@ -2671,14 +2671,14 @@ popdef([AC_Prog])dnl
 # language.
 AC_DEFUN(AC_TRY_COMPILER,
 [AC_LINK_IFELSE([AC_LANG_SOURCE([[$1]])],
-[[$2]=yes
+[$2=yes
   # If we can't run a trivial program, we are probably using a cross compiler.
   if (./conftest; exit) 2>/dev/null; then
-    [$3]=no
+    $3=no
   else
-    [$3]=yes
+    $3=yes
   fi],
-[[$2]=no])[]dnl
+[$2=no])[]dnl
 ])# AC_TRY_COMPILER