Stop being ridiculous :*(

* acgeneral.m4 (AC_SHELL_DIRNAME):  When using m4 the argument
is named `$1' not `$dir'.
When using m4 you ought to quote properly.
When using m4, you should check that there are not too many shell
quotes (inside the macro itself, and where it is called).
When you do this, Autoconf, hm, works better.

diff --git a/ChangeLog b/ChangeLog
index d384cfdc47c892fd4895d939789921496849f901..f7c835aa98f79abe5404afbbee59099042254c3c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2000-07-10  Akim Demaille  <akim@epita.fr>
+
+       Stop being ridiculous :*(
+
+       * acgeneral.m4 (AC_SHELL_DIRNAME):  When using m4 the argument
+       is named `$1' not `$dir'.
+       When using m4 you ought to quote properly.
+       When using m4, you should check that there are not too many shell
+       quotes (inside the macro itself, and where it is called).
+       When you do this, Autoconf, hm, works better.
+
 2000-07-10  Steven G. Johnson  <stevenj@alum.mit.edu>
 
        Improve --help documentation of important environment variables.

diff --git a/Makefile.in b/Makefile.in
index 527e80bc686f7fd3d16556cff4fc96b9f27b79b1..4d54c77eabab5e88cb1d4270c08492da3a53725a 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -70,6 +70,7 @@ SUBDIRS = . m4 man doc tests
 
 SUFFIXES = .m4 .m4f .pl .sh
 ACLOCAL_AMFLAGS = --version >/dev/null && touch aclocal.m4
+WGET = wget
 
 bin_SCRIPTS = autoconf autoheader autoreconf autoupdate ifnames @PERLSCRIPTS@
 EXTRA_SCRIPTS = autoscan
@@ -446,6 +447,13 @@ install-data-hook: INSTALL.txt
 
 autoconf.m4f: autoconf.m4 $(common)
 
+wget-update:
+       $(WGET) ftp://ftp.gnu.org/gnu/GNUinfo/standards.texi -O $(srcdir)/doc/standards.texi
+       $(WGET) ftp://ftp.gnu.org/gnu/GNUinfo/make-stds.texi -O $(srcdir)/doc/make-stds.texi
+       $(WGET) ftp://ftp.gnu.org/gnu/texinfo/texinfo.tex    -O $(srcdir)/doc/texinfo.tex
+       $(WGET) ftp://ftp.gnu.org/gnu/config/config.guess    -O $(srcdir)/config.guess
+       $(WGET) ftp://ftp.gnu.org/gnu/config/config.sub      -O $(srcdir)/config.sub
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:

diff --git a/acgeneral.m4 b/acgeneral.m4
index b0b928d5c9ec8c26350759edac5d3cdf8909df59..09c8c31169cf89cc0360361324d683f87b0b97ee 100644 (file)
--- a/acgeneral.m4
+++ b/acgeneral.m4
@@ -791,11 +791,11 @@ done; }
 # I have heard rumors that this special treatment of // may be dropped
 # in future versions of POSIX, but for now it's still the standard.
 define([_AC_SHELL_DIRNAME],
-[expr "X$dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-      "X$dir" : 'X\(//\)[^/]' \| \
-      "X$dir" : 'X\(//\)$' \| \
-      "X$dir" : 'X\(/\)' \| \
-      .       : '\(.\)'])
+[expr X$1 : 'X\(.*[[^/]]\)//*[[^/][^/]]*/*$' \| \
+      X$1 : 'X\(//\)[[^/]]' \| \
+      X$1 : 'X\(//\)$' \| \
+      X$1 : 'X\(/\)' \| \
+      .   : '\(.\)'])
 
 
 ## --------------------------------------------------- ##

diff --git a/configure b/configure
index 83c646ff7b4d5725135ed6a19ae6a33f1af8d872..1c198f3f7ff10188025ea9e3ba218fc42b4ced99 100755 (executable)
--- a/configure
+++ b/configure
@@ -18,8 +18,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
 # Maximum number of lines to put in a shell here document.
 : ${ac_max_here_lines=48}
 # Sed expression to map a string onto a valid sh and CPP variable names.
-ac_tr_sh='sed -e y%*+%pp%;s%[^a-zA-Z0-9_]%_%g'
-ac_tr_cpp='sed -e y%*abcdefghijklmnopqrstuvwxyz%PABCDEFGHIJKLMNOPQRSTUVWXYZ%;s%[^A-Z0-9_]%_%g'
+ac_tr_sh='sed y%*+%pp%;s%[^a-zA-Z0-9_]%_%g'
+ac_tr_cpp='sed y%*abcdefghijklmnopqrstuvwxyz%PABCDEFGHIJKLMNOPQRSTUVWXYZ%;s%[^A-Z0-9_]%_%g'
 
 # By default always use an empty string as the executable extension.
 # Only change it if the script calls AC_EXEEXT.
@@ -99,7 +99,7 @@ do
     continue
   fi
 
-  ac_optarg=`echo "$ac_option" | sed -n 's/^[^=]*=//p'`
+  ac_optarg=`expr "x$ac_option" : 'x[^=]*=\(.*\)'`
 
   # Accept the important Cygnus configure options, so we can diagnose typos.
 
@@ -132,7 +132,7 @@ do
     datadir=$ac_optarg ;;
 
   -disable-* | --disable-*)
-    ac_feature=`echo "$ac_option" |sed -e 's/-*disable-//'`
+    ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
     # Reject names that are not valid shell variable names.
     expr "x$ac_feature" : ".*[^-a-zA-Z0-9_]" >/dev/null &&
       { echo "configure: error: invalid feature name: $ac_feature" >&2; exit 1; }
@@ -140,7 +140,7 @@ do
     eval "enable_$ac_feature=no" ;;
 
   -enable-* | --enable-*)
-    ac_feature=`echo "$ac_option" | sed -e 's/-*enable-//;s/=.*//'`
+    ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
     # Reject names that are not valid shell variable names.
     expr "x$ac_feature" : ".*[^-a-zA-Z0-9_]" >/dev/null &&
       { echo "configure: error: invalid feature name: $ac_feature" >&2; exit 1; }
@@ -172,10 +172,8 @@ do
     ac_init_help=short ;;
 
   -host | --host | --hos | --ho)
-    cross_compiling=yes
     ac_prev=host_alias ;;
   -host=* | --host=* | --hos=* | --ho=*)
-    cross_compiling=yes
     host_alias=$ac_optarg ;;
 
   -includedir | --includedir | --includedi | --included | --include \
@@ -323,7 +321,7 @@ do
     ac_init_version=: ;;
 
   -with-* | --with-*)
-    ac_package=`echo "$ac_option"|sed -e 's/-*with-//;s/=.*//'`
+    ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
     # Reject names that are not valid shell variable names.
     expr "x$ac_package" : ".*[^-a-zA-Z0-9_]" >/dev/null &&
       { echo "configure: error: invalid package name: $ac_package" >&2; exit 1; }
@@ -332,15 +330,15 @@ do
       *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;;
       *) ac_optarg=yes ;;
     esac
-    eval "with_${ac_package}='$ac_optarg'" ;;
+    eval "with_$ac_package='$ac_optarg'" ;;
 
   -without-* | --without-*)
-    ac_package=`echo "$ac_option" |sed -e 's/-*without-//'`
+    ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'`
     # Reject names that are not valid shell variable names.
     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'`
-    eval "with_${ac_package}=no" ;;
+    eval "with_$ac_package=no" ;;
 
   --x)
     # Obsolete; use --with-x.
@@ -365,7 +363,7 @@ Try \`configure --help' for more information." >&2; exit 1; }
     ;;
 
   *=*)
-    ac_envvar=`echo "$ac_option" | sed -e 's/=.*//'`
+    ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='`
     # Reject names that are not valid shell variable names.
     expr "x$ac_envvar" : ".*[^a-zA-Z0-9_]" >/dev/null &&
       { echo "configure: error: invalid variable name: $ac_envvar" >&2; exit 1; }
@@ -374,6 +372,7 @@ Try \`configure --help' for more information." >&2; exit 1; }
     export $ac_envvar ;;
 
   *)
+    # FIXME: should be removed in autoconf 3.0.
     echo "configure: WARNING: you should use --build, --host, --target" >&2
     expr "x$ac_option" : ".*[^a-zA-Z0-9.]" >/dev/null &&
       echo "configure: WARNING: invalid host type: $ac_option" >&2
@@ -407,6 +406,17 @@ build=$build_alias
 host=$host_alias
 target=$target_alias
 
+# FIXME: should be removed in autoconf 3.0.
+if test "x$host_alias" != x; then
+  if test "x$build_alias" = x; then
+    cross_compiling=maybe
+    echo "configure: WARNING: If you wanted to set the --build type, don't use --host.
+    If a cross compiler is detected then cross compile mode will be used." >&2
+  elif test "x$build_alias" != "x$host_alias"; then
+    cross_compiling=yes
+  fi
+fi
+
 ac_tool_prefix=
 test -n "$host_alias" && ac_tool_prefix=$host_alias-
 
@@ -445,7 +455,7 @@ if test "$ac_init_help" = "long"; then
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
 To assign environment variables (e.g., CC, CFLAGS...), specify them as
-VAR=VALUE.
+VAR=VALUE.  See below for descriptions of useful variables.
 
 Defaults for the options are specified in brackets.
 
@@ -515,7 +525,7 @@ if test "$ac_init_help" = "recursive"; then
     cd $ac_subdir
     # A "../" for each directory in /$ac_subdir.
     ac_dots=`echo $ac_subdir |
-             sed -e 's%^\./%%;s%[^/]$%&/%;s%[^/]*/%../%g'`
+             sed 's,^\./,,;s,[^/]$,&/,;s,[^/]*/,../,g'`
 
     case $srcdir in
     .) # No --srcdir option.  We are building in place.
@@ -571,6 +581,7 @@ fi
 $ac_unset LANG || test "${LANG+set}" != set || LANG=C && export LANG
 $ac_unset LC_ALL || test "${LC_ALL+set}" != set || LC_ALL=C && export LC_ALL
 $ac_unset LC_CTYPE || test "${LC_CTYPE+set}" != set || LC_CTYPE=C && export LC_CTYPE
+$ac_unset LANGUAGE || test "${LANGUAGE+set}" != set || LANGUAGE=C && export LANGUAGE
 $ac_unset LC_MESSAGES || test "${LC_MESSAGES+set}" != set || LC_MESSAGES=C && export LC_MESSAGES
 
 # IFS
@@ -650,8 +661,15 @@ for ac_site_file in $CONFIG_SITE; do
 done
 
 if test -r "$cache_file"; then
-  test "x$cache_file" != "x/dev/null" && echo "loading cache $cache_file"
-      test -f "$cache_file" && . $cache_file
+  # Some versions of bash will fail to source /dev/null (special
+  # files actually), so we avoid doing that.
+  if test -f "$cache_file"; then
+    echo "loading cache $cache_file"
+    case $cache_file in
+      [\\/]* | ?:[\\/]* ) . $cache_file;;
+      *)                      . ./$cache_file;;
+    esac
+  fi
 else
   echo "creating cache $cache_file"
   >$cache_file
@@ -662,6 +680,7 @@ 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'
+ac_gnu_compiler=$ac_cv_prog_gcc
 
 if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then
   # Stardent Vistra SVR4 grep lacks -e, says Kaveh R. Ghazi.
@@ -709,7 +728,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:623: checking for a BSD compatible install" >&5
+echo "configure:641: 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
@@ -756,7 +775,7 @@ fi
     INSTALL=$ac_install_sh
   fi
 fi
-echo "configure:669: result: $INSTALL" >&5
+echo "configure:687: result: $INSTALL" >&5
 echo "${ECHO_T}$INSTALL" >&6
 
 # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
@@ -767,7 +786,7 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
 
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
-echo "configure:676: checking whether build environment is sane" >&5
+echo "configure:694: checking whether build environment is sane" >&5
 echo $ECHO_N "checking whether build environment is sane... $ECHO_C" >&6
 # Just in case
 sleep 1
@@ -804,7 +823,7 @@ else
 Check your system clock" >&2; exit 1; }
 fi
 rm -f conftest*
-echo "configure:711: result: yes" >&5
+echo "configure:729: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 if test "$program_transform_name" = s,x,x,; then
   program_transform_name=
@@ -825,9 +844,9 @@ 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:730: checking whether ${MAKE-make} sets \${MAKE}" >&5
+echo "configure:748: 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_%'`
+set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,./+-,__p_,'`
 if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -845,11 +864,11 @@ fi
 rm -f conftestmake
 fi
 if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
-  echo "configure:750: result: yes" >&5
+  echo "configure:768: result: yes" >&5
 echo "${ECHO_T}yes" >&6
   SET_MAKE=
 else
-  echo "configure:754: result: no" >&5
+  echo "configure:772: result: no" >&5
 echo "${ECHO_T}no" >&6
   SET_MAKE="MAKE=${MAKE-make}"
 fi
@@ -871,78 +890,78 @@ cat >>confdefs.h <<EOF
 EOF
 
 missing_dir=`cd $ac_aux_dir && pwd`
-echo "configure:770: checking for working aclocal" >&5
+echo "configure:788: 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:777: result: found" >&5
+   echo "configure:795: result: found" >&5
 echo "${ECHO_T}found" >&6
 else
    ACLOCAL="$missing_dir/missing aclocal"
-   echo "configure:781: result: missing" >&5
+   echo "configure:799: result: missing" >&5
 echo "${ECHO_T}missing" >&6
 fi
 
-echo "configure:784: checking for working autoconf" >&5
+echo "configure:802: 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:791: result: found" >&5
+   echo "configure:809: result: found" >&5
 echo "${ECHO_T}found" >&6
 else
    AUTOCONF="$missing_dir/missing autoconf"
-   echo "configure:795: result: missing" >&5
+   echo "configure:813: result: missing" >&5
 echo "${ECHO_T}missing" >&6
 fi
 
-echo "configure:798: checking for working automake" >&5
+echo "configure:816: 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:805: result: found" >&5
+   echo "configure:823: result: found" >&5
 echo "${ECHO_T}found" >&6
 else
    AUTOMAKE="$missing_dir/missing automake"
-   echo "configure:809: result: missing" >&5
+   echo "configure:827: result: missing" >&5
 echo "${ECHO_T}missing" >&6
 fi
 
-echo "configure:812: checking for working autoheader" >&5
+echo "configure:830: 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:819: result: found" >&5
+   echo "configure:837: result: found" >&5
 echo "${ECHO_T}found" >&6
 else
    AUTOHEADER="$missing_dir/missing autoheader"
-   echo "configure:823: result: missing" >&5
+   echo "configure:841: result: missing" >&5
 echo "${ECHO_T}missing" >&6
 fi
 
-echo "configure:826: checking for working makeinfo" >&5
+echo "configure:844: 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:833: result: found" >&5
+   echo "configure:851: result: found" >&5
 echo "${ECHO_T}found" >&6
 else
    MAKEINFO="$missing_dir/missing makeinfo"
-   echo "configure:837: result: missing" >&5
+   echo "configure:855: result: missing" >&5
 echo "${ECHO_T}missing" >&6
 fi
 
@@ -957,7 +976,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:850: checking for $ac_word" >&5
+echo "configure:868: 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
@@ -983,10 +1002,10 @@ esac
 fi
 M4=$ac_cv_path_M4
 if test -n "$M4"; then
-  echo "configure:875: result: $M4" >&5
+  echo "configure:893: result: $M4" >&5
 echo "${ECHO_T}$M4" >&6
 else
-  echo "configure:878: result: no" >&5
+  echo "configure:896: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -994,7 +1013,7 @@ test -n "$M4" && break
 done
 test -n "$M4" || M4="m4"
 
-echo "configure:884: checking whether m4 supports frozen files" >&5
+echo "configure:902: 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
@@ -1006,7 +1025,7 @@ if test x"$M4" != x; then
   esac
 fi
 fi
-echo "configure:896: result: $ac_cv_prog_gnu_m4" >&5
+echo "configure:914: 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; }
@@ -1019,7 +1038,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:908: checking for $ac_word" >&5
+echo "configure:926: 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
@@ -1041,10 +1060,10 @@ fi
 fi
 AWK=$ac_cv_prog_AWK
 if test -n "$AWK"; then
-  echo "configure:929: result: $AWK" >&5
+  echo "configure:947: result: $AWK" >&5
 echo "${ECHO_T}$AWK" >&6
 else
-  echo "configure:932: result: no" >&5
+  echo "configure:950: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -1052,25 +1071,25 @@ test -n "$AWK" && break
 done
 
 # Generating man pages.
-echo "configure:938: checking for working help2man" >&5
+echo "configure:956: 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:945: result: found" >&5
+   echo "configure:963: result: found" >&5
 echo "${ECHO_T}found" >&6
 else
    HELP2MAN="\${SHELL} \${top_srcdir}/missing help2man"
-   echo "configure:949: result: missing" >&5
+   echo "configure:967: 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:955: checking for $ac_word" >&5
+echo "configure:973: 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
@@ -1097,10 +1116,10 @@ esac
 fi
 PERL=$ac_cv_path_PERL
 if test -n "$PERL"; then
-  echo "configure:981: result: $PERL" >&5
+  echo "configure:999: result: $PERL" >&5
 echo "${ECHO_T}$PERL" >&6
 else
-  echo "configure:984: result: no" >&5
+  echo "configure:1002: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -1121,7 +1140,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:1003: checking for a BSD compatible install" >&5
+echo "configure:1021: 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
@@ -1168,7 +1187,7 @@ fi
     INSTALL=$ac_install_sh
   fi
 fi
-echo "configure:1049: result: $INSTALL" >&5
+echo "configure:1067: result: $INSTALL" >&5
 echo "${ECHO_T}$INSTALL" >&6
 
 # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
@@ -1184,6 +1203,8 @@ if test -f $srcdir/standards.texi; then
   standards_texi=standards.texi
 fi
 
+ac_config_files="$ac_config_files acversion.m4 Makefile m4/Makefile man/Makefile doc/Makefile
+          tests/Makefile tests/atconfig"
 trap '' 1 2 15
 cat >confcache <<\EOF
 # This file is a shell script that caches the results of configure
@@ -1191,7 +1212,7 @@ cat >confcache <<\EOF
 # scripts and configure runs.  It is not useful on other systems.
 # If it contains results you don't want to keep, you may remove or edit it.
 #
-# By default, configure uses ./config.cache as the cache file,
+# By default, configure uses `config.cache' as the cache file,
 # creating it if it does not exist already.  You can give configure
 # the --cache-file=FILE option to use a different cache file; that is
 # what configure does when it calls configure scripts in
@@ -1218,11 +1239,11 @@ EOF
       ;;
     *)
       # `set' quotes correctly as required by POSIX, so do not add quotes.
-      sed -n -e 's/^\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\)=\(.*\)/\1=\2/p'
+      sed -n 's/^\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\)=\(.*\)/\1=\2/p'
       ;;
     esac;
 } |
-  sed -e 's/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/' >>confcache
+  sed 's/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/' >>confcache
 if cmp -s $cache_file confcache; then :; else
   if test -w $cache_file; then
     test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file"
@@ -1253,14 +1274,16 @@ fi
 # take arguments), then we branch to the cleanup section.  Otherwise,
 # look for a macro that doesn't take arguments.
 cat >confdef2opt.sed <<\EOF
-s%^[   ]*#[    ]*define[       ][      ]*\([^  (][^    (]*([^)]*)\)[   ]*\(.*\)%-D\1=\2%g
+t clear
+: clear
+s,^[   ]*#[    ]*define[       ][      ]*\([^  (][^    (]*([^)]*)\)[   ]*\(.*\),-D\1=\2,g
 t cleanup
-s%^[   ]*#[    ]*define[       ][      ]*\([^  ][^     ]*\)[   ]*\(.*\)%-D\1=\2%g
+s,^[   ]*#[    ]*define[       ][      ]*\([^  ][^     ]*\)[   ]*\(.*\),-D\1=\2,g
 : cleanup
-s%[    `~#$^&*(){}\\|;'"<>?]%\\&%g
-s%\[%\\&%g
-s%\]%\\&%g
-s%\$%$$%g
+s,[    `~#$^&*(){}\\|;'"<>?],\\&,g
+s,\[,\\&,g
+s,\],\\&,g
+s,\$,$$,g
 EOF
 # We use echo to avoid assuming a particular line-breaking character.
 # The extra dot is to prevent the shell from consuming trailing
@@ -1292,13 +1315,13 @@ echo "Cache variables:" >&5
       ;;
     *)
       # `set' quotes correctly as required by POSIX, so do not add quotes.
-      sed -n -e 's/^\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\)=\(.*\)/\1=\2/p'
+      sed -n 's/^\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\)=\(.*\)/\1=\2/p'
       ;;
     esac;
-} | sed -e 's/^/| /' >&5
+} | sed 's/^/| /' >&5
 echo >&5
 echo "confdefs.h:" >&5
-cat confdefs.h | sed -e 's/^/| /' >&5
+cat confdefs.h | sed 's/^/| /' >&5
 
 : ${CONFIG_STATUS=./config.status}
 trap 'rm -f $CONFIG_STATUS conftest*; exit 1' 1 2 15
@@ -1311,18 +1334,28 @@ cat >$CONFIG_STATUS <<\EOF
 # configure, is in ./config.log if it exists.
 
 debug=false
-me=`echo "$0" | sed -e 's,.*/,,'`
+me=`echo "$0" | sed 's,.*/,,'`
 SHELL=${CONFIG_SHELL-/bin/sh}
 
-# Files that config.status was made for.
-config_files="\
-  acversion.m4 Makefile m4/Makefile man/Makefile doc/Makefile tests/Makefile
-  tests/atconfig"
-EOF
-# Be careful that the expansion of AC_LIST_LINKS (which may contain
-# uses of shell variables) is itself expanded in an unquoted `here'-document.
-cat >>$CONFIG_STATUS <<EOF
 EOF
+
+# Files that config.status was made for.
+if test -n "$ac_config_files"; then
+  echo "config_files=\"$ac_config_files\"" >>$CONFIG_STATUS
+fi
+
+if test -n "$ac_config_headers"; then
+  echo "config_headers=\"$ac_config_headers\"" >>$CONFIG_STATUS
+fi
+
+if test -n "$ac_config_links"; then
+  echo "config_links=\"$ac_config_links\"" >>$CONFIG_STATUS
+fi
+
+if test -n "$ac_config_commands"; then
+  echo "config_commands=\"$ac_config_commands\"" >>$CONFIG_STATUS
+fi
+
 cat >>$CONFIG_STATUS <<\EOF
 
 ac_cs_usage="\
@@ -1362,8 +1395,8 @@ while test $# != 0
 do
   case $1 in
   --*=*)
-    ac_option=`echo "$1" | sed -e 's/=.*//'`
-    ac_optarg=`echo "$1" | sed -e 's/[^=]*=//'`
+    ac_option=`expr "x$1" : 'x\([^=]*\)='`
+    ac_optarg=`expr "x$1" : 'x[^=]*=\(.*\)'`
     shift
     set dummy "$ac_option" "$ac_optarg" ${1+"$@"}
     shift
@@ -1392,7 +1425,7 @@ Try \`$me --help' for more information."; exit 1 ;;
   --help | --hel | -h )
     echo "$ac_cs_usage"; exit 0 ;;
   --debug | --d* | -d )
-    debug=:; shift ;;
+    debug=: ;;
   --file | --fil | --fi | --f )
     shift
     CONFIG_FILES="$CONFIG_FILES $1"
@@ -1439,7 +1472,7 @@ $debug ||
 : ${TMPDIR=/tmp}
 {
   tmp=`(umask 077 && mktemp -d -q "$TMPDIR/csXXXXXX") 2>/dev/null` &&
-  test -n "$tmp"
+  test -n "$tmp" && test -d "$tmp"
 }  ||
 {
   tmp=$TMPDIR/cs$$-$RANDOM && (umask 077 && mkdir $tmp)
@@ -1461,52 +1494,52 @@ cat >>$CONFIG_STATUS <<EOF
 # This happens for instance when ./config.status config.h
 if test -n "\$CONFIG_FILES"; then
   # Protect against being on the right side of a sed subst in config.status.
-  sed 's/%@/@@/; s/@%/@@/; s/%;t t\$/@;t t/; /@;t t\$/s/[\\\\&%]/\\\\&/g;
-   s/@@/%@/; s/@@/@%/; s/@;t t\$/%;t t/' >\$tmp/subs.sed <<\\CEOF
-s%@SHELL@%$SHELL%;t t
-s%@exec_prefix@%$exec_prefix%;t t
-s%@prefix@%$prefix%;t t
-s%@program_transform_name@%$program_transform_name%;t t
-s%@bindir@%$bindir%;t t
-s%@sbindir@%$sbindir%;t t
-s%@libexecdir@%$libexecdir%;t t
-s%@datadir@%$datadir%;t t
-s%@sysconfdir@%$sysconfdir%;t t
-s%@sharedstatedir@%$sharedstatedir%;t t
-s%@localstatedir@%$localstatedir%;t t
-s%@libdir@%$libdir%;t t
-s%@includedir@%$includedir%;t t
-s%@oldincludedir@%$oldincludedir%;t t
-s%@infodir@%$infodir%;t t
-s%@mandir@%$mandir%;t t
-s%@ECHO_C@%$ECHO_C%;t t
-s%@ECHO_N@%$ECHO_N%;t t
-s%@ECHO_T@%$ECHO_T%;t t
-s%@CFLAGS@%$CFLAGS%;t t
-s%@CPPFLAGS@%$CPPFLAGS%;t t
-s%@CXXFLAGS@%$CXXFLAGS%;t t
-s%@FFLAGS@%$FFLAGS%;t t
-s%@DEFS@%$DEFS%;t t
-s%@LDFLAGS@%$LDFLAGS%;t t
-s%@LIBS@%$LIBS%;t t
-s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%;t t
-s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%;t t
-s%@INSTALL_DATA@%$INSTALL_DATA%;t t
-s%@PACKAGE@%$PACKAGE%;t t
-s%@VERSION@%$VERSION%;t t
-s%@ACLOCAL@%$ACLOCAL%;t t
-s%@AUTOCONF@%$AUTOCONF%;t t
-s%@AUTOMAKE@%$AUTOMAKE%;t t
-s%@AUTOHEADER@%$AUTOHEADER%;t t
-s%@MAKEINFO@%$MAKEINFO%;t t
-s%@SET_MAKE@%$SET_MAKE%;t t
-s%@AT_TESTPATH@%$AT_TESTPATH%;t t
-s%@M4@%$M4%;t t
-s%@AWK@%$AWK%;t t
-s%@HELP2MAN@%$HELP2MAN%;t t
-s%@PERL@%$PERL%;t t
-s%@PERLSCRIPTS@%$PERLSCRIPTS%;t t
-s%@standards_texi@%$standards_texi%;t t
+  sed 's/,@/@@/; s/@,/@@/; s/,;t t\$/@;t t/; /@;t t\$/s/[\\\\&,]/\\\\&/g;
+   s/@@/,@/; s/@@/@,/; s/@;t t\$/,;t t/' >\$tmp/subs.sed <<\\CEOF
+s,@SHELL@,$SHELL,;t t
+s,@exec_prefix@,$exec_prefix,;t t
+s,@prefix@,$prefix,;t t
+s,@program_transform_name@,$program_transform_name,;t t
+s,@bindir@,$bindir,;t t
+s,@sbindir@,$sbindir,;t t
+s,@libexecdir@,$libexecdir,;t t
+s,@datadir@,$datadir,;t t
+s,@sysconfdir@,$sysconfdir,;t t
+s,@sharedstatedir@,$sharedstatedir,;t t
+s,@localstatedir@,$localstatedir,;t t
+s,@libdir@,$libdir,;t t
+s,@includedir@,$includedir,;t t
+s,@oldincludedir@,$oldincludedir,;t t
+s,@infodir@,$infodir,;t t
+s,@mandir@,$mandir,;t t
+s,@ECHO_C@,$ECHO_C,;t t
+s,@ECHO_N@,$ECHO_N,;t t
+s,@ECHO_T@,$ECHO_T,;t t
+s,@CFLAGS@,$CFLAGS,;t t
+s,@CPPFLAGS@,$CPPFLAGS,;t t
+s,@CXXFLAGS@,$CXXFLAGS,;t t
+s,@FFLAGS@,$FFLAGS,;t t
+s,@DEFS@,$DEFS,;t t
+s,@LDFLAGS@,$LDFLAGS,;t t
+s,@LIBS@,$LIBS,;t t
+s,@INSTALL_PROGRAM@,$INSTALL_PROGRAM,;t t
+s,@INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t
+s,@INSTALL_DATA@,$INSTALL_DATA,;t t
+s,@PACKAGE@,$PACKAGE,;t t
+s,@VERSION@,$VERSION,;t t
+s,@ACLOCAL@,$ACLOCAL,;t t
+s,@AUTOCONF@,$AUTOCONF,;t t
+s,@AUTOMAKE@,$AUTOMAKE,;t t
+s,@AUTOHEADER@,$AUTOHEADER,;t t
+s,@MAKEINFO@,$MAKEINFO,;t t
+s,@SET_MAKE@,$SET_MAKE,;t t
+s,@AT_TESTPATH@,$AT_TESTPATH,;t t
+s,@M4@,$M4,;t t
+s,@AWK@,$AWK,;t t
+s,@HELP2MAN@,$HELP2MAN,;t t
+s,@PERL@,$PERL,;t t
+s,@PERLSCRIPTS@,$PERLSCRIPTS,;t t
+s,@standards_texi@,$standards_texi,;t t
 CEOF
 
 EOF
@@ -1555,21 +1588,31 @@ cat >>$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
-  *:*) ac_file_in=`echo "$ac_file" | sed 's%[^:]*:%%'`
-       ac_file=`echo "$ac_file" | sed 's%:.*%%'` ;;
+  *:*) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
+       ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
   *) ac_file_in=$ac_file.in ;;
   esac
 
   # Adjust a relative srcdir, top_srcdir, and INSTALL for subdirectories.
-
-  # Remove last slash and all that follows it.  Not all systems have dirname.
-  ac_dir=`echo "$ac_file" | sed 's%/[^/][^/]*$%%'`
+  ac_dir=`expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+      X"$ac_file" : 'X\(//\)[^/]' \| \
+      X"$ac_file" : 'X\(//\)$' \| \
+      X"$ac_file" : 'X\(/\)' \| \
+      .   : '\(.\)'`
   if test "$ac_dir" != "$ac_file" && test "$ac_dir" != .; then
-    # The file is in a subdirectory.
-    test -d "$ac_dir" || mkdir "$ac_dir"
-    ac_dir_suffix="/`echo $ac_dir|sed 's%^\./%%'`"
+    { case "$ac_dir" in
+  [\\/]* | ?:[\\/]* ) ac_incr_dir=;;
+  *)                      ac_incr_dir=.;;
+esac
+ac_dummy=""$ac_dir""
+for ac_mkdir_dir in `IFS=/; set X $ac_dummy; shift; echo "$@"`; do
+  ac_incr_dir=$ac_incr_dir/$ac_mkdir_dir
+  test -d $ac_incr_dir || mkdir $ac_incr_dir
+done; }
+
+    ac_dir_suffix="/`echo $ac_dir|sed 's,^\./,,'`"
     # A "../" for each directory in $ac_dir_suffix.
-    ac_dots=`echo "$ac_dir_suffix" | sed 's%/[^/]*%../%g'`
+    ac_dots=`echo "$ac_dir_suffix" | sed 's,/[^/]*,../,g'`
   else
     ac_dir_suffix= ac_dots=
   fi
@@ -1577,7 +1620,7 @@ for ac_file in : $CONFIG_FILES; do test "x$ac_file" = x: && continue
   case $ac_given_srcdir in
   .)  srcdir=.
       if test -z "$ac_dots"; then top_srcdir=.
-      else top_srcdir=`echo $ac_dots | sed 's%/$%%'`; fi ;;
+      else top_srcdir=`echo $ac_dots | sed 's,/$,,'`; fi ;;
   [\\/]* | ?:[\\/]* )
       srcdir=$ac_given_srcdir$ac_dir_suffix;
       top_srcdir=$ac_given_srcdir ;;
@@ -1594,7 +1637,7 @@ for ac_file in : $CONFIG_FILES; do test "x$ac_file" = x: && continue
   echo creating "$ac_file"
   rm -f "$ac_file"
   configure_input="Generated automatically from `echo $ac_file_in |
-                                                 sed 's%.*/%%'` by configure."
+                                                 sed 's,.*/,,'` by configure."
 
   # Don't redirect the output to AC_FILE directly: use `mv' so that
   # updating is atomic, and doesn't need trapping.
@@ -1607,16 +1650,16 @@ for ac_file in : $CONFIG_FILES; do test "x$ac_file" = x: && continue
   done
 EOF
 cat >>$CONFIG_STATUS <<EOF
-  sed -e "$ac_vpsub
+  sed "$ac_vpsub
 $extrasub
 EOF
 cat >>$CONFIG_STATUS <<\EOF
 :t
 /@[a-zA-Z_][a-zA-Z_0-9]*@/!b
-s%@configure_input@%$configure_input%;t t
-s%@srcdir@%$srcdir%;t t
-s%@top_srcdir@%$top_srcdir%;t t
-s%@INSTALL@%$INSTALL%;t t
+s,@configure_input@,$configure_input,;t t
+s,@srcdir@,$srcdir,;t t
+s,@top_srcdir@,$top_srcdir,;t t
+s,@INSTALL@,$INSTALL,;t t
 " $ac_file_inputs | (eval "$ac_sed_cmds") >$tmp/out
   mv $tmp/out $ac_file
 

diff --git a/lib/autoconf/general.m4 b/lib/autoconf/general.m4
index b0b928d5c9ec8c26350759edac5d3cdf8909df59..09c8c31169cf89cc0360361324d683f87b0b97ee 100644 (file)
--- a/lib/autoconf/general.m4
+++ b/lib/autoconf/general.m4
@@ -791,11 +791,11 @@ done; }
 # I have heard rumors that this special treatment of // may be dropped
 # in future versions of POSIX, but for now it's still the standard.
 define([_AC_SHELL_DIRNAME],
-[expr "X$dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-      "X$dir" : 'X\(//\)[^/]' \| \
-      "X$dir" : 'X\(//\)$' \| \
-      "X$dir" : 'X\(/\)' \| \
-      .       : '\(.\)'])
+[expr X$1 : 'X\(.*[[^/]]\)//*[[^/][^/]]*/*$' \| \
+      X$1 : 'X\(//\)[[^/]]' \| \
+      X$1 : 'X\(//\)$' \| \
+      X$1 : 'X\(/\)' \| \
+      .   : '\(.\)'])
 
 
 ## --------------------------------------------------- ##

diff --git a/man/autoconf.1 b/man/autoconf.1
index 0a1fe2b2f6aa790875c9045632e39f3025af6452..bc26dd031bca00ea506e675190436c80a0ff3462 100644 (file)
--- a/man/autoconf.1
+++ b/man/autoconf.1
@@ -33,7 +33,7 @@ directory storing the `aclocal.m4' file
 save output in FILE (stdout is the default)
 .TP
 \fB\-W\fR, \fB\-\-warnings\fR=\fICATEGORY\fR
-report the warnings falling in CATEGORY
+report the warnings falling in CATEGORY [syntax]
 .SS "Warning categories include:"
 .TP
 `cross'
@@ -48,8 +48,16 @@ dubious syntactic constructs
 `all'
 all the warnings
 .TP
+`noCATEGORY'
+turn off the warnings on CATEGORY
+.TP
+`none'
+turn off all the warnings
+.TP
 `error'
 warnings are error
+.PP
+The environment variable `WARNINGS' is honored.
 .SS "Tracing:"
 .TP
 \fB\-t\fR, \fB\-\-trace\fR=\fIMACRO\fR

diff --git a/man/autoreconf.1 b/man/autoreconf.1
index 4b35a091f8a2d4ed1fa539eee43e7b2ec663a350..d9d12d338df3fe9a8731feb333f926a65b1f47e6 100644 (file)
--- a/man/autoreconf.1
+++ b/man/autoreconf.1
@@ -1,5 +1,5 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.020.
-.TH AUTORECONF "1" "June 2000" "GNU autoconf 2.14a" FSF
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.022.
+.TH AUTORECONF "1" "July 2000" "GNU autoconf 2.14a" FSF
 .SH NAME
 autoreconf \- Update generated configuration files
 .SH SYNOPSIS
@@ -13,6 +13,7 @@ current directory.  By default, it only remakes those files that are
 older than their predecessors.  If you install a new version of
 Autoconf, running `autoreconf' remakes all of the files by giving it
 the `--force' option.
+.SS "Operation modes:"
 .TP
 \fB\-h\fR, \fB\-\-help\fR
 print this help, then exit
@@ -23,14 +24,33 @@ print version number, then exit
 \fB\-v\fR, \fB\-\-verbose\fR
 verbosely report processing
 .TP
-\fB\-m\fR, \fB\-\-macrodir\fR=\fIDIR\fR
-directory storing macro files
-.TP
-\fB\-l\fR, \fB\-\-localdir\fR=\fIDIR\fR
-directory storing `aclocal.m4' and `acconfig.h'
+\fB\-d\fR, \fB\-\-debug\fR
+don't remove temporary files
 .TP
 \fB\-f\fR, \fB\-\-force\fR
 consider every files are obsolete
+.TP
+\fB\-i\fR, \fB\-\-install\fR
+copy missing auxiliary files
+.TP
+\fB\-\-symlink\fR
+instead of copying, install symbolic links
+.PP
+The option `--install' is similar to the option `--add-missing' in
+other tools.
+.SS "Library directories:"
+.TP
+\fB\-m\fR, \fB\-\-macrodir\fR=\fIACDIR\fR
+Autoconf's macro files location (rarely needed)
+.TP
+\fB\-l\fR, \fB\-\-localdir\fR=\fIDIR\fR
+location of `aclocal.m4' and `acconfig.h'
+.TP
+\fB\-M\fR, \fB\-\-m4dir\fR=\fIM4DIR\fR
+this package's Autoconf extensions
+.PP
+Unless specified, heuristics try to compute `M4DIR' from the `Makefile.am',
+or defaults to `m4' if it exists.
 .SS "The following options are passed to `automake':"
 .TP
 \fB\-\-cygnus\fR