* lib/autoconf/general.m4 (_AC_INIT_PARSE_ARGS): Make the check

  for absolute directory names in one loop.
* lib/autoconf/status.m4 (_AC_OUTPUT_CONFIG_STATUS): Handle
  abbreviations of --version and --debug.

diff --git a/ChangeLog b/ChangeLog
index 200b04bace5c4e03a7d723d12814734c64a40ee6..dd6afcb14ace70b4021d4e5314ffd663b49d946a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2005-05-11  Stepan Kasal  <kasal@ucw.cz>
+
+       * lib/autoconf/general.m4 (_AC_INIT_PARSE_ARGS): Make the check
+         for absolute directory names in one loop.
+       * lib/autoconf/status.m4 (_AC_OUTPUT_CONFIG_STATUS): Handle
+         abbreviations of --version and --debug.
+
 2005-05-10  Paul Eggert  <eggert@cs.ucla.edu>
 
        * doc/autoconf.texi (Autoconf Language): Be more precise about

diff --git a/lib/autoconf/general.m4 b/lib/autoconf/general.m4
index 2ff9df35ea55dda4ff2215ab9f16145240d8d5f5..b6f887c84632d45de5f400b1765442b86b02fe63 100644 (file)
--- a/lib/autoconf/general.m4
+++ b/lib/autoconf/general.m4
@@ -929,26 +929,17 @@ if test -n "$ac_prev"; then
 fi
 
 # Be sure to have absolute directory names.
-for ac_var in exec_prefix prefix
+for ac_var in  exec_prefix prefix bindir sbindir libexecdir datarootdir \
+               datadir sysconfdir sharedstatedir localstatedir includedir \
+               oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
+               libdir localedir mandir
 do
   eval ac_val=$`echo $ac_var`
   case $ac_val in
-    [[\\/$]]* | ?:[[\\/]]* | NONE | '' ) ;;
-    *)  AC_MSG_ERROR([expected an absolute directory name for --$ac_var: $ac_val]);;
-  esac
-done
-
-# Be sure to have absolute directory names.
-for ac_var in bindir sbindir libexecdir datarootdir datadir sysconfdir \
-              sharedstatedir localstatedir includedir oldincludedir \
-              docdir infodir htmldir dvidir pdfdir psdir libdir \
-              localedir mandir
-do
-  eval ac_val=$`echo $ac_var`
-  case $ac_val in
-    [[\\/$]]* | ?:[[\\/]]* ) ;;
-    *)  AC_MSG_ERROR([expected an absolute directory name for --$ac_var: $ac_val]);;
+    [[\\/$]]* | ?:[[\\/]]* )  continue;;
+    NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
   esac
+  AC_MSG_ERROR([expected an absolute directory name for --$ac_var: $ac_val])
 done
 
 # There might be people who depend on the old broken behavior: `$host'

diff --git a/lib/autoconf/status.m4 b/lib/autoconf/status.m4
index a1b31b524aea4184c730ded71f62c65982f111f4..d92c2de94d4652d7387bb8e013a0d2ed39237a2b 100644 (file)
--- a/lib/autoconf/status.m4
+++ b/lib/autoconf/status.m4
@@ -1428,7 +1428,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<\_ACEOF
   -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
     ac_cs_recheck=: ;;
-  --version | --vers* | -V )
+  --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
     echo "$ac_cs_version"; exit ;;
   --he | --h)
     # Conflict between --help and --header
@@ -1436,7 +1436,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF
 Try `$[0] --help' for more information.]);;
   --help | --hel | -h )
     echo "$ac_cs_usage"; exit ;;
-  --debug | --d* | -d )
+  --debug | --debu | --deb | --de | --d | -d )
     debug=: ;;
   --file | --fil | --fi | --f )
     $ac_shift