From: Akim Demaille Date: Mon, 5 Jun 2000 16:05:49 +0000 (+0000) Subject: * acgeneral.m4 (_AC_INIT_PARSE_ARGS): Move the setting X-Git-Tag: autoconf-2.50~834 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=92da78474f8b1c9e112b3faaa99be076b2fcefa9;p=thirdparty%2Fautoconf.git * acgeneral.m4 (_AC_INIT_PARSE_ARGS): Move the setting of ac_tool_prefix before the call to AC_DIVERT_POP. --- diff --git a/ChangeLog b/ChangeLog index 3a434ceef..127bffa0a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2000-06-05 Mo DeJong + + * acgeneral.m4 (_AC_INIT_PARSE_ARGS): Move the setting + of ac_tool_prefix before the call to AC_DIVERT_POP. + 2000-06-05 Akim Demaille * acgeneral.m4 (AC_CHECK_TOOL_PREFIX): AU define it. diff --git a/acgeneral.m4 b/acgeneral.m4 index d87610d62..82032da7e 100644 --- a/acgeneral.m4 +++ b/acgeneral.m4 @@ -1289,10 +1289,10 @@ build=$build_alias host=$host_alias target=$target_alias -AC_DIVERT_POP()dnl - ac_tool_prefix= test -n "$host_alias" && ac_tool_prefix=$host_alias- + +AC_DIVERT_POP()dnl ])# _AC_INIT_PARSE_ARGS diff --git a/configure b/configure index 4a5c7a610..cd16a6981 100755 --- a/configure +++ b/configure @@ -103,7 +103,7 @@ do # Accept the important Cygnus configure options, so we can diagnose typos. - case "$ac_option" in + case $ac_option in -bindir | --bindir | --bindi | --bind | --bin | --bi) ac_prev=bindir ;; @@ -145,7 +145,7 @@ do expr "x$ac_feature" : ".*[^-a-zA-Z0-9_]" >/dev/null && { echo "configure: error: invalid feature name: $ac_feature" >&2; exit 1; } ac_feature=`echo $ac_feature | sed 's/-/_/g'` - case "$ac_option" in + case $ac_option in *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;; *) ac_optarg=yes ;; esac @@ -328,7 +328,7 @@ do expr "x$ac_package" : ".*[^-a-zA-Z0-9_]" >/dev/null && { echo "configure: error: invalid package name: $ac_package" >&2; exit 1; } ac_package=`echo $ac_package| sed 's/-/_/g'` - case "$ac_option" in + case $ac_option in *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;; *) ac_optarg=yes ;; esac @@ -407,6 +407,9 @@ build=$build_alias host=$host_alias target=$target_alias +ac_tool_prefix= +test -n "$host_alias" && ac_tool_prefix=$host_alias- + # Find the source files, if location was not specified. if test -z "$srcdir"; then ac_srcdir_defaulted=yes @@ -498,7 +501,7 @@ EOF fi if test -n "$ac_init_help"; then - case "$ac_init_help" in + case $ac_init_help in short | recursive ) echo "Configuration of Autoconf 2.14a:";; esac cat <<\EOF @@ -514,7 +517,7 @@ if test "$ac_init_help" = "recursive"; then ac_dots=`echo $ac_subdir | sed -e 's%^\./%%;s%[^/]$%&/%;s%[^/]*/%../%g'` - case "$srcdir" in + case $srcdir in .) # No --srcdir option. We are building in place. ac_sub_srcdir=$srcdir ;; [\\/]* | ?:[\\/]* ) # Absolute path. @@ -588,7 +591,7 @@ ac_configure_args= ac_sep= for ac_arg do - case "$ac_arg" in + case $ac_arg in -no-create | --no-create | --no-creat | --no-crea | --no-cre \ | --no-cr | --no-c) ;; -no-recursion | --no-recursion | --no-recursio | --no-recursi \ @@ -706,7 +709,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:621: checking for a BSD compatible install" >&5 +echo "configure:623: 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 @@ -715,7 +718,7 @@ else ac_save_IFS=$IFS; IFS=':' for ac_dir in $PATH; do # Account for people who put trailing slashes in PATH elements. - case "$ac_dir/" in + case $ac_dir/ in /|./|.//|/etc/*|/usr/sbin/*|/usr/etc/*|/sbin/*|/usr/afsws/bin/*|/usr/ucb/*) ;; *) # OSF1 and SCO ODT 3.0 have their own names for install. @@ -753,7 +756,7 @@ fi INSTALL=$ac_install_sh fi fi -echo "configure:667: result: $INSTALL" >&5 +echo "configure:669: result: $INSTALL" >&5 echo "${ECHO_T}$INSTALL" >&6 # Use test -z because SunOS4 sh mishandles braces in ${var-val}. @@ -764,7 +767,7 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}' test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' -echo "configure:674: checking whether build environment is sane" >&5 +echo "configure:676: checking whether build environment is sane" >&5 echo $ECHO_N "checking whether build environment is sane... $ECHO_C" >&6 # Just in case sleep 1 @@ -801,7 +804,7 @@ else Check your system clock" >&2; exit 1; } fi rm -f conftest* -echo "configure:709: result: yes" >&5 +echo "configure:711: result: yes" >&5 echo "${ECHO_T}yes" >&6 if test "$program_transform_name" = s,x,x,; then program_transform_name= @@ -822,7 +825,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:728: checking whether ${MAKE-make} sets \${MAKE}" >&5 +echo "configure:730: 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 @@ -842,11 +845,11 @@ fi rm -f conftestmake fi if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then - echo "configure:748: result: yes" >&5 + echo "configure:750: result: yes" >&5 echo "${ECHO_T}yes" >&6 SET_MAKE= else - echo "configure:752: result: no" >&5 + echo "configure:754: result: no" >&5 echo "${ECHO_T}no" >&6 SET_MAKE="MAKE=${MAKE-make}" fi @@ -868,78 +871,78 @@ cat >>confdefs.h <&5 +echo "configure:770: 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:775: result: found" >&5 + echo "configure:777: result: found" >&5 echo "${ECHO_T}found" >&6 else ACLOCAL="$missing_dir/missing aclocal" - echo "configure:779: result: missing" >&5 + echo "configure:781: result: missing" >&5 echo "${ECHO_T}missing" >&6 fi -echo "configure:782: checking for working autoconf" >&5 +echo "configure:784: 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:789: result: found" >&5 + echo "configure:791: result: found" >&5 echo "${ECHO_T}found" >&6 else AUTOCONF="$missing_dir/missing autoconf" - echo "configure:793: result: missing" >&5 + echo "configure:795: result: missing" >&5 echo "${ECHO_T}missing" >&6 fi -echo "configure:796: checking for working automake" >&5 +echo "configure:798: 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:803: result: found" >&5 + echo "configure:805: result: found" >&5 echo "${ECHO_T}found" >&6 else AUTOMAKE="$missing_dir/missing automake" - echo "configure:807: result: missing" >&5 + echo "configure:809: result: missing" >&5 echo "${ECHO_T}missing" >&6 fi -echo "configure:810: checking for working autoheader" >&5 +echo "configure:812: 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:817: result: found" >&5 + echo "configure:819: result: found" >&5 echo "${ECHO_T}found" >&6 else AUTOHEADER="$missing_dir/missing autoheader" - echo "configure:821: result: missing" >&5 + echo "configure:823: result: missing" >&5 echo "${ECHO_T}missing" >&6 fi -echo "configure:824: checking for working makeinfo" >&5 +echo "configure:826: 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:831: result: found" >&5 + echo "configure:833: result: found" >&5 echo "${ECHO_T}found" >&6 else MAKEINFO="$missing_dir/missing makeinfo" - echo "configure:835: result: missing" >&5 + echo "configure:837: result: missing" >&5 echo "${ECHO_T}missing" >&6 fi @@ -954,12 +957,12 @@ 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:848: checking for $ac_word" >&5 +echo "configure:850: 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 else - case "$M4" in + case $M4 in [\\/]* | ?:[\\/]*) ac_cv_path_M4="$M4" # Let the user override the test with a path. ;; @@ -980,10 +983,10 @@ esac fi M4=$ac_cv_path_M4 if test -n "$M4"; then - echo "configure:873: result: $M4" >&5 + echo "configure:875: result: $M4" >&5 echo "${ECHO_T}$M4" >&6 else - echo "configure:876: result: no" >&5 + echo "configure:878: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -991,7 +994,7 @@ test -n "$M4" && break done test -n "$M4" || M4="m4" -echo "configure:882: checking whether m4 supports frozen files" >&5 +echo "configure:884: 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 @@ -1003,7 +1006,7 @@ if test x"$M4" != x; then esac fi fi -echo "configure:894: result: $ac_cv_prog_gnu_m4" >&5 +echo "configure:896: 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; } @@ -1016,7 +1019,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:906: checking for $ac_word" >&5 +echo "configure:908: 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 @@ -1038,10 +1041,10 @@ fi fi AWK=$ac_cv_prog_AWK if test -n "$AWK"; then - echo "configure:927: result: $AWK" >&5 + echo "configure:929: result: $AWK" >&5 echo "${ECHO_T}$AWK" >&6 else - echo "configure:930: result: no" >&5 + echo "configure:932: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -1049,30 +1052,30 @@ test -n "$AWK" && break done # Generating man pages. -echo "configure:936: checking for working help2man" >&5 +echo "configure:938: 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:943: result: found" >&5 + echo "configure:945: result: found" >&5 echo "${ECHO_T}found" >&6 else HELP2MAN="\${SHELL} \${top_srcdir}/missing help2man" - echo "configure:947: result: missing" >&5 + echo "configure:949: result: missing" >&5 echo "${ECHO_T}missing" >&6 fi # We use a path for perl so the #! line in autoscan will work. # Extract the first word of "perl", so it can be a program name with args. set dummy perl; ac_word=$2 -echo "configure:953: checking for $ac_word" >&5 +echo "configure:955: 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 else - case "$PERL" in + case $PERL in [\\/]* | ?:[\\/]*) ac_cv_path_PERL="$PERL" # Let the user override the test with a path. ;; @@ -1094,10 +1097,10 @@ esac fi PERL=$ac_cv_path_PERL if test -n "$PERL"; then - echo "configure:979: result: $PERL" >&5 + echo "configure:981: result: $PERL" >&5 echo "${ECHO_T}$PERL" >&6 else - echo "configure:982: result: no" >&5 + echo "configure:984: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -1118,7 +1121,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:1001: checking for a BSD compatible install" >&5 +echo "configure:1003: 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 @@ -1127,7 +1130,7 @@ else ac_save_IFS=$IFS; IFS=':' for ac_dir in $PATH; do # Account for people who put trailing slashes in PATH elements. - case "$ac_dir/" in + case $ac_dir/ in /|./|.//|/etc/*|/usr/sbin/*|/usr/etc/*|/sbin/*|/usr/afsws/bin/*|/usr/ucb/*) ;; *) # OSF1 and SCO ODT 3.0 have their own names for install. @@ -1165,7 +1168,7 @@ fi INSTALL=$ac_install_sh fi fi -echo "configure:1047: result: $INSTALL" >&5 +echo "configure:1049: result: $INSTALL" >&5 echo "${ECHO_T}$INSTALL" >&6 # Use test -z because SunOS4 sh mishandles braces in ${var-val}. @@ -1351,7 +1354,7 @@ cat >>$CONFIG_STATUS <<\EOF ac_need_defaults=: while test $# != 0 do - case "$1" in + case $1 in --*=*) ac_option=`echo "$1" | sed -e 's/=.*//'` ac_optarg=`echo "$1" | sed -e 's/[^=]*=//'` @@ -1365,7 +1368,7 @@ do ac_need_defaults=false;; esac - case "$1" in + case $1 in # Handling of the options. EOF cat >>$CONFIG_STATUS <>$CONFIG_STATUS <<\EOF for ac_file in : $CONFIG_FILES; do test "x$ac_file" = x: && continue # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in". - case "$ac_file" in + case $ac_file in *:*) ac_file_in=`echo "$ac_file" | sed 's%[^:]*:%%'` ac_file=`echo "$ac_file" | sed 's%:.*%%'` ;; *) ac_file_in=$ac_file.in ;; @@ -1565,7 +1568,7 @@ for ac_file in : $CONFIG_FILES; do test "x$ac_file" = x: && continue ac_dir_suffix= ac_dots= fi - case "$ac_given_srcdir" in + case $ac_given_srcdir in .) srcdir=. if test -z "$ac_dots"; then top_srcdir=. else top_srcdir=`echo $ac_dots | sed 's%/$%%'`; fi ;; @@ -1577,7 +1580,7 @@ for ac_file in : $CONFIG_FILES; do test "x$ac_file" = x: && continue top_srcdir=$ac_dots$ac_given_srcdir ;; esac - case "$ac_given_INSTALL" in + case $ac_given_INSTALL in [\\/$]* | ?:[\\/]* ) INSTALL=$ac_given_INSTALL ;; *) INSTALL=$ac_dots$ac_given_INSTALL ;; esac diff --git a/lib/autoconf/general.m4 b/lib/autoconf/general.m4 index d87610d62..82032da7e 100644 --- a/lib/autoconf/general.m4 +++ b/lib/autoconf/general.m4 @@ -1289,10 +1289,10 @@ build=$build_alias host=$host_alias target=$target_alias -AC_DIVERT_POP()dnl - ac_tool_prefix= test -n "$host_alias" && ac_tool_prefix=$host_alias- + +AC_DIVERT_POP()dnl ])# _AC_INIT_PARSE_ARGS