From: Akim Demaille Date: Tue, 12 Sep 2000 15:03:13 +0000 (+0000) Subject: * acspecific.m4 (AC_PROG_INSTALL): Exclude c:install on AmigaOS. X-Git-Tag: autoconf-2.50~633 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0c6d235eebd54f3d644f5780672fbcf70341dfde;p=thirdparty%2Fautoconf.git * acspecific.m4 (AC_PROG_INSTALL): Exclude c:install on AmigaOS. --- diff --git a/ChangeLog b/ChangeLog index ad9999e11..a30257156 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2000-09-12 Rüdiger Kuhlmann + + * acspecific.m4 (AC_PROG_INSTALL): Exclude c:install on AmigaOS. + 2000-09-12 Akim Demaille The test suite fails on some hosts because for instance diff --git a/acspecific.m4 b/acspecific.m4 index b1715fb4b..d71df813c 100644 --- a/acspecific.m4 +++ b/acspecific.m4 @@ -201,6 +201,7 @@ AC_DEFUN([AC_PROG_INSTALL], # SunOS /usr/etc/install # IRIX /sbin/install # AIX /bin/install +# AmigaOS /C/install, which installs bootblocks on floppy discs # AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag # AFS /usr/afsws/bin/install, which mishandles nonexistent args # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" @@ -212,7 +213,9 @@ AC_CACHE_VAL(ac_cv_path_install, for ac_dir in $PATH; do # Account for people who put trailing slashes in PATH elements. case $ac_dir/ in - /|./|.//|/etc/*|/usr/sbin/*|/usr/etc/*|/sbin/*|/usr/afsws/bin/*|/usr/ucb/*) ;; + / | ./ | .// | /[cC]/* \ + | /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* \ + | /usr/ucb/* ) ;; *) # OSF1 and SCO ODT 3.0 have their own names for install. # Don't use installbsd from OSF since it installs stuff as root diff --git a/configure b/configure index 4db3d3b1c..49b48b40a 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by Autoconf 2.49a for Autoconf 2.49b. +# Generated by Autoconf 2.49b for Autoconf 2.49b. # # Report bugs to . # @@ -571,7 +571,7 @@ fi test -n "$ac_init_help" && exit 0 if $ac_init_version; then cat <<\EOF -configure (Autoconf 2.49b) 2.49a +configure (Autoconf 2.49b) 2.49b Copyright (C) 1992, 93, 94, 95, 96, 98, 99, 2000 Free Software Foundation, Inc. @@ -657,7 +657,7 @@ echo "\ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by configure (Autoconf 2.49b) 2.49a, executed with +It was created by configure (Autoconf 2.49b) 2.49b, executed with > $0 $ac_configure_args " >&5 @@ -771,11 +771,12 @@ ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure. # SunOS /usr/etc/install # IRIX /sbin/install # AIX /bin/install +# AmigaOS /C/install, which installs bootblocks on floppy discs # AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag # 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:778: checking for a BSD compatible install" >&5 +echo "configure:779: 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 @@ -785,7 +786,9 @@ else for ac_dir in $PATH; do # Account for people who put trailing slashes in PATH elements. case $ac_dir/ in - /|./|.//|/etc/*|/usr/sbin/*|/usr/etc/*|/sbin/*|/usr/afsws/bin/*|/usr/ucb/*) ;; + / | ./ | .// | /cC/* \ + | /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* \ + | /usr/ucb/* ) ;; *) # OSF1 and SCO ODT 3.0 have their own names for install. # Don't use installbsd from OSF since it installs stuff as root @@ -822,7 +825,7 @@ fi INSTALL=$ac_install_sh fi fi -echo "configure:825: result: $INSTALL" >&5 +echo "configure:828: result: $INSTALL" >&5 echo "${ECHO_T}$INSTALL" >&6 # Use test -z because SunOS4 sh mishandles braces in ${var-val}. @@ -833,7 +836,7 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}' test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' -echo "configure:836: checking whether build environment is sane" >&5 +echo "configure:839: checking whether build environment is sane" >&5 echo $ECHO_N "checking whether build environment is sane... $ECHO_C" >&6 # Just in case sleep 1 @@ -870,7 +873,7 @@ else Check your system clock" >&2; exit 1; } fi rm -f conftest* -echo "configure:873: result: yes" >&5 +echo "configure:876: result: yes" >&5 echo "${ECHO_T}yes" >&6 if test "$program_transform_name" = s,x,x,; then program_transform_name= @@ -891,7 +894,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:894: checking whether ${MAKE-make} sets \${MAKE}" >&5 +echo "configure:897: 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 @@ -911,11 +914,11 @@ fi rm -f conftestmake fi if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then - echo "configure:914: result: yes" >&5 + echo "configure:917: result: yes" >&5 echo "${ECHO_T}yes" >&6 SET_MAKE= else - echo "configure:918: result: no" >&5 + echo "configure:921: result: no" >&5 echo "${ECHO_T}no" >&6 SET_MAKE="MAKE=${MAKE-make}" fi @@ -937,78 +940,78 @@ cat >>confdefs.h <&5 +echo "configure:943: 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:947: result: found" >&5 + echo "configure:950: result: found" >&5 echo "${ECHO_T}found" >&6 else ACLOCAL="$missing_dir/missing aclocal" - echo "configure:951: result: missing" >&5 + echo "configure:954: result: missing" >&5 echo "${ECHO_T}missing" >&6 fi -echo "configure:955: checking for working autoconf" >&5 +echo "configure:958: 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:962: result: found" >&5 + echo "configure:965: result: found" >&5 echo "${ECHO_T}found" >&6 else AUTOCONF="$missing_dir/missing autoconf" - echo "configure:966: result: missing" >&5 + echo "configure:969: result: missing" >&5 echo "${ECHO_T}missing" >&6 fi -echo "configure:970: checking for working automake" >&5 +echo "configure:973: 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:977: result: found" >&5 + echo "configure:980: result: found" >&5 echo "${ECHO_T}found" >&6 else AUTOMAKE="$missing_dir/missing automake" - echo "configure:981: result: missing" >&5 + echo "configure:984: result: missing" >&5 echo "${ECHO_T}missing" >&6 fi -echo "configure:985: checking for working autoheader" >&5 +echo "configure:988: 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:992: result: found" >&5 + echo "configure:995: result: found" >&5 echo "${ECHO_T}found" >&6 else AUTOHEADER="$missing_dir/missing autoheader" - echo "configure:996: result: missing" >&5 + echo "configure:999: result: missing" >&5 echo "${ECHO_T}missing" >&6 fi -echo "configure:1000: checking for working makeinfo" >&5 +echo "configure:1003: 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:1007: result: found" >&5 + echo "configure:1010: result: found" >&5 echo "${ECHO_T}found" >&6 else MAKEINFO="$missing_dir/missing makeinfo" - echo "configure:1011: result: missing" >&5 + echo "configure:1014: result: missing" >&5 echo "${ECHO_T}missing" >&6 fi @@ -1023,7 +1026,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:1026: checking for $ac_word" >&5 +echo "configure:1029: 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 @@ -1049,10 +1052,10 @@ esac fi M4=$ac_cv_path_M4 if test -n "$M4"; then - echo "configure:1052: result: $M4" >&5 + echo "configure:1055: result: $M4" >&5 echo "${ECHO_T}$M4" >&6 else - echo "configure:1055: result: no" >&5 + echo "configure:1058: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -1060,7 +1063,7 @@ test -n "$M4" && break done test -n "$M4" || M4="m4" -echo "configure:1063: checking whether m4 supports frozen files" >&5 +echo "configure:1066: 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 @@ -1072,7 +1075,7 @@ if test x"$M4" != x; then esac fi fi -echo "configure:1075: result: $ac_cv_prog_gnu_m4" >&5 +echo "configure:1078: 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; } @@ -1085,7 +1088,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:1088: checking for $ac_word" >&5 +echo "configure:1091: 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 @@ -1109,10 +1112,10 @@ fi fi AWK=$ac_cv_prog_AWK if test -n "$AWK"; then - echo "configure:1112: result: $AWK" >&5 + echo "configure:1115: result: $AWK" >&5 echo "${ECHO_T}$AWK" >&6 else - echo "configure:1115: result: no" >&5 + echo "configure:1118: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -1120,25 +1123,25 @@ test -n "$AWK" && break done # Generating man pages. -echo "configure:1123: checking for working help2man" >&5 +echo "configure:1126: 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:1130: result: found" >&5 + echo "configure:1133: result: found" >&5 echo "${ECHO_T}found" >&6 else HELP2MAN="\${SHELL} \${top_srcdir}/missing help2man" - echo "configure:1134: result: missing" >&5 + echo "configure:1137: 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:1141: checking for $ac_word" >&5 +echo "configure:1144: 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 @@ -1165,10 +1168,10 @@ esac fi PERL=$ac_cv_path_PERL if test -n "$PERL"; then - echo "configure:1168: result: $PERL" >&5 + echo "configure:1171: result: $PERL" >&5 echo "${ECHO_T}$PERL" >&6 else - echo "configure:1171: result: no" >&5 + echo "configure:1174: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -1185,11 +1188,12 @@ fi # SunOS /usr/etc/install # IRIX /sbin/install # AIX /bin/install +# AmigaOS /C/install, which installs bootblocks on floppy discs # AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag # 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:1192: checking for a BSD compatible install" >&5 +echo "configure:1196: 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 @@ -1199,7 +1203,9 @@ else for ac_dir in $PATH; do # Account for people who put trailing slashes in PATH elements. case $ac_dir/ in - /|./|.//|/etc/*|/usr/sbin/*|/usr/etc/*|/sbin/*|/usr/afsws/bin/*|/usr/ucb/*) ;; + / | ./ | .// | /cC/* \ + | /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* \ + | /usr/ucb/* ) ;; *) # OSF1 and SCO ODT 3.0 have their own names for install. # Don't use installbsd from OSF since it installs stuff as root @@ -1236,7 +1242,7 @@ fi INSTALL=$ac_install_sh fi fi -echo "configure:1239: result: $INSTALL" >&5 +echo "configure:1245: result: $INSTALL" >&5 echo "${ECHO_T}$INSTALL" >&6 # Use test -z because SunOS4 sh mishandles braces in ${var-val}. @@ -1427,7 +1433,7 @@ EOF cat >>$CONFIG_STATUS <