diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rwxr-xr-x | configure | 6 | ||||
| -rw-r--r-- | configure.in | 6 |
3 files changed, 14 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog index 748d26f770..ccbc9508e3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,11 @@ 2002-10-19 Roland McGrath <roland@redhat.com> + * configure.in: Call AC_CONFIG_SUBDIRS with empty argument + and then set $subdirs directly, because the new Autoconf breaks + compatibility in every way imaginable and insists on whining + about usage that worked since the dawn of time. + * configure: Regenerated. + * configure: Regenerated (using Autoconf 2.54). * sysdeps/alpha/elf/configure: Likewise. * sysdeps/generic/configure: Likewise. diff --git a/configure b/configure index 9f3df263d0..225c3b0efe 100755 --- a/configure +++ b/configure @@ -271,7 +271,7 @@ PACKAGE_STRING='GNU C Library (see version.h)' PACKAGE_BUGREPORT='glibc' ac_unique_file="include/features.h" -ac_subdirs_all="$ac_subdirs_all $add_ons" +ac_subdirs_all="$ac_subdirs_all " # Factoring default headers for most tests. ac_includes_default="\ #include <stdio.h> @@ -1536,8 +1536,7 @@ fi -subdirs="$subdirs $add_ons" - +subdirs="$subdirs " add_ons_pfx= if test x"$add_ons" != x; then for f in $add_ons; do @@ -1571,6 +1570,7 @@ echo "$as_me: error: # Test whether such a subdir really exists. if test -d $srcdir/$f; then add_ons_pfx="$add_ons_pfx $f/" + subdirs="$subdirs $f" else { { echo "$as_me:$LINENO: error: add-on directory \"$f\" does not exist" >&5 echo "$as_me: error: add-on directory \"$f\" does not exist" >&2;} diff --git a/configure.in b/configure.in index 3af6d1c09f..df18b8b935 100644 --- a/configure.in +++ b/configure.in @@ -157,7 +157,7 @@ if test "x$hidden" = xno; then AC_DEFINE(NO_HIDDEN) fi -AC_CONFIG_SUBDIRS($add_ons) +AC_CONFIG_SUBDIRS([ ])dnl Bonehead new Autoconf whines if we do it cleanly. add_ons_pfx= if test x"$add_ons" != x; then for f in $add_ons; do @@ -179,6 +179,10 @@ if test x"$add_ons" != x; then # Test whether such a subdir really exists. if test -d $srcdir/$f; then add_ons_pfx="$add_ons_pfx $f/" + dnl This variable is what AC_CONFIG_SUBDIRS is supposed to set, + dnl but the new Autoconf maintainers don't care about compatibility + dnl so we cannot use it normally any more without complaints. + subdirs="$subdirs $f" else AC_MSG_ERROR(add-on directory \"$f\" does not exist) fi |