* m4/depend.m4 (AM_DEPENDENCIES): Don't define `depcpp' which is

not used.
Do not require the corresponding AC_PROG_CC as AC_PROG_CC is
actually modified to require AM_DEPENDENCIES.
Rename `confdir' as `conftest.dir' so that the configure trap
remove it.

diff --git a/ChangeLog b/ChangeLog
index b866b058e8898521b441bdc2f2ae80202fc270f1..22f85ccd73e65be37e262df7f7f9886bb799189d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2001-07-14  Akim Demaille  <akim@epita.fr>
+
+       * m4/depend.m4 (AM_DEPENDENCIES): Don't define `depcpp' which is
+       not used.
+       Do not require the corresponding AC_PROG_CC as AC_PROG_CC is
+       actually modified to require AM_DEPENDENCIES.
+       Rename `confdir' as `conftest.dir' so that the configure trap
+       remove it.
+
 2001-07-04  Tom Tromey  <tromey@redhat.com>
 
        Fix for nolink.test:

diff --git a/Makefile.in b/Makefile.in
index 14019523118cfac9eae22aa9f6b30a581da8e18d..56d17a69f24b3ffbe9575b284bee1c8c39abbf75 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated automatically by automake 1.4h from Makefile.am.
+# Makefile.in generated automatically by automake 1.4g from Makefile.am.
 
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
 # Free Software Foundation, Inc.
@@ -105,8 +105,8 @@ RECURSIVE_TARGETS = info-recursive dvi-recursive install-info-recursive \
        install-exec-recursive installdirs-recursive install-recursive \
        uninstall-recursive check-recursive installcheck-recursive
 DIST_COMMON = README AUTHORS COPYING ChangeLog INSTALL Makefile.am \
-       Makefile.in NEWS THANKS TODO aclocal.in aclocal.m4 automake.in \
-       configure configure.in install-sh mdate-sh missing \
+       Makefile.in NEWS README-alpha THANKS TODO aclocal.in aclocal.m4 \
+       automake.in configure configure.in install-sh mdate-sh missing \
        mkinstalldirs stamp-vti version.texi
 DIST_SUBDIRS = $(SUBDIRS)
 all: all-recursive
@@ -115,7 +115,7 @@ all: all-recursive
 .SUFFIXES: .dvi .info .ps .texi
 $(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
        cd $(top_srcdir) && \
-         $(AUTOMAKE) --gnu  Makefile
+         $(AUTOMAKE) --gnits  Makefile
 Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
        cd $(top_builddir) && \
          CONFIG_HEADERS= CONFIG_LINKS= \
@@ -345,6 +345,11 @@ distdir = $(PACKAGE)-$(VERSION)
 GZIP_ENV = --best
 
 distdir: $(DISTFILES)
+       @if sed 15q $(srcdir)/NEWS | fgrep -e "$(VERSION)" >/dev/null; \
+       then :; else \
+         echo "NEWS not updated; not releasing" 1>&2; \
+         exit 1; \
+       fi
        -chmod -R a+w $(distdir) >/dev/null 2>&1; rm -rf $(distdir)
        mkdir $(distdir)
        $(mkinstalldirs) $(distdir)/.

diff --git a/aclocal.m4 b/aclocal.m4
index 489613620a08f17346d82be25260057deaf02393..b7b3f3a20d626b4b2a9976eb0b7ff12f2b9538ca 100644 (file)
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,4 +1,4 @@
-# aclocal.m4 generated automatically by aclocal 1.4h
+# aclocal.m4 generated automatically by aclocal 1.4g
 
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000
 # Free Software Foundation, Inc.

diff --git a/automake.in b/automake.in
index 6bcae0361f5d6d693f04e76fd2c2165a50f40b4f..d0973284afa53f2c179c995167c9b289800669c7 100755 (executable)
--- a/automake.in
+++ b/automake.in
@@ -5237,12 +5237,12 @@ sub saw_sources_p
 
     # count all the sources
     my $count = 0;
-    foreach my $val (values %extension_seen) 
+    foreach my $val (values %extension_seen)
     {
        $count += $val;
     }
 
-    if (!$headers) 
+    if (!$headers)
     {
        $count -= count_files_for_language ('header');
     }

diff --git a/configure b/configure
index 47094e42d9d7cccbf4c3142f89d04daee0faa92b..9e837e65ad4dbd0767f0e74c7f0ec9b7115080be 100755 (executable)
--- a/configure
+++ b/configure
@@ -677,7 +677,7 @@ else
   echo "configure: warning: ${am_backtick}missing' script is too old or missing" 1>&2
 fi
 
-for ac_prog in gawk mawk nawk awk
+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

diff --git a/m4/depend.m4 b/m4/depend.m4
index 11f7cdc5b04364379159a42e8dca6c4726806276..0c12f5d5e5c7b3e6709887456994bf9a78bb04c8 100644 (file)
--- a/m4/depend.m4
+++ b/m4/depend.m4
@@ -1,4 +1,6 @@
-# serial 3
+# serial 4                                             -*- Autoconf -*-
+
+
 
 # There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
 # written in clear, in which case automake, when reading aclocal.m4,
@@ -6,36 +8,29 @@
 # C support machinery.  Also note that it means that autoscan, seeing
 # CC etc. in the Makefile, will ask for an AC_PROG_CC use...
 
+
+
 # AM_DEPENDENCIES(NAME)
 # ---------------------
 # See how the compiler implements dependency checking.
 # NAME is "CC", "CXX" or "OBJC".
 # We try a few techniques and use that to set a single cache variable.
+#
+# We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was
+# modified to invoke AM_DEPENDENCIES(CC); we would have a circular
+# dependency, and given that the user is not expected to run this macro,
+# just rely on AC_PROG_CC.
 AC_DEFUN([AM_DEPENDENCIES],
 [AC_REQUIRE([AM_SET_DEPDIR])dnl
 AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl
-am_compiler_list=
-ifelse([$1], CC,
-       [AC_REQUIRE([AC_PROG_][CC])dnl
-AC_REQUIRE([AC_PROG_][CPP])
-depcc="$CC"
-depcpp="$CPP"],
-       [$1], CXX, [AC_REQUIRE([AC_PROG_][CXX])dnl
-AC_REQUIRE([AC_PROG_][CXXCPP])
-depcc="$CXX"
-depcpp="$CXXCPP"],
-       [$1], OBJC, [am_compiler_list='gcc3 gcc'
-depcc="$OBJC"
-depcpp=""],
-       [$1], GCJ,  [am_compiler_list='gcc3 gcc'
-depcc="$GCJ"
-depcpp=""],
-       [AC_REQUIRE([AC_PROG_][$1])dnl
-depcc="$$1"
-depcpp=""])
+AC_REQUIRE([AM_MAKE_INCLUDE])dnl
+AC_REQUIRE([AM_DEP_TRACK])dnl
 
-AC_REQUIRE([AM_MAKE_INCLUDE])
-AC_REQUIRE([AM_DEP_TRACK])
+ifelse([$1], CC,   [depcc="$CC"   am_compiler_list=],
+       [$1], CXX,  [depcc="$CXX"  am_compiler_list=],
+       [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc']
+       [$1], GCJ,  [depcc="$GCJ"  am_compiler_list='gcc3 gcc'],
+                   [depcc="$$1"   am_compiler_list=])
 
 AC_CACHE_CHECK([dependency style of $depcc],
                [am_cv_$1_dependencies_compiler_type],
@@ -45,15 +40,15 @@ AC_CACHE_CHECK([dependency style of $depcc],
   # instance it was reported that on HP-UX the gcc test will end up
   # making a dummy file named `D' -- because `-MD' means `put the output
   # in D'.
-  mkdir confdir
+  mkdir conftest.dir
   # Copy depcomp to subdir because otherwise we won't find it if we're
   # using a relative directory.
-  cp "$am_depcomp" confdir
-  cd confdir
+  cp "$am_depcomp" conftest.dir
+  cd conftest.dir
 
   am_cv_$1_dependencies_compiler_type=none
   if test "$am_compiler_list" = ""; then
-     am_compiler_list="`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp`"
+     am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp`
   fi
   for depmode in $am_compiler_list; do
     # We need to recreate these files for each test, as the compiler may
@@ -62,7 +57,7 @@ AC_CACHE_CHECK([dependency style of $depcc],
     echo '#include "conftest.h"' > conftest.c
     echo 'int i;' > conftest.h
 
-    case "$depmode" in
+    case $depmode in
     nosideeffect)
       # after this tag, mechanisms are not by side-effect, so they'll
       # only be used when explicitly requested
@@ -77,18 +72,18 @@ AC_CACHE_CHECK([dependency style of $depcc],
     # We check with `-c' and `-o' for the sake of the "dashmstdout"
     # mode.  It turns out that the SunPro C++ compiler does not properly
     # handle `-M -o', and we need to detect this.
-    if depmode="$depmode" \
+    if depmode=$depmode \
        source=conftest.c object=conftest.o \
        depfile=conftest.Po tmpdepfile=conftest.TPo \
        $SHELL ./depcomp $depcc -c conftest.c -o conftest.o >/dev/null 2>&1 &&
        grep conftest.h conftest.Po > /dev/null 2>&1; then
-      am_cv_$1_dependencies_compiler_type="$depmode"
+      am_cv_$1_dependencies_compiler_type=$depmode
       break
     fi
   done
 
   cd ..
-  rm -rf confdir
+  rm -rf conftest.dir
 else
   am_cv_$1_dependencies_compiler_type=none
 fi