From Erik Lindahl:

	* lib/depcomp (tru64): Some Tru64 compilers use `foo.d' and not
	`foo.o.d'.
	* m4/depend.m4 (_AM_DEPENDENCIES): Check to make sure compilation
	output is suitable for make.

diff --git a/ChangeLog b/ChangeLog
index 3532e6470f4f5cb7d420f509fa6b64445d2601dd..5523a50547b2f74d8a594b9b53aaecc3d41646de 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2001-07-21  Tom Tromey  <tromey@redhat.com>
 
+       From Erik Lindahl:
+       * lib/depcomp (tru64): Some Tru64 compilers use `foo.d' and not
+       `foo.o.d'.
+       * m4/depend.m4 (_AM_DEPENDENCIES): Check to make sure compilation
+       output is suitable for make.
+
        * automake.texi (Macros): Document AM_PROG_AS.
        (Assembly Support): New node.
        * m4/Makefile.am (m4data_DATA): Added as.m4.

diff --git a/THANKS b/THANKS
index 8bddad85cb66137dae11be5f62c48c3fc8903c01..534414e6915357f1ed2b479ffcd3c912b50cd8ed 100644 (file)
--- a/THANKS
+++ b/THANKS
@@ -37,6 +37,7 @@ Elrond                        Elrond@Wunder-Nett.org
 Erez Zadok             ezk@cs.columbia.edu
 Eric Magnien           emagnien@club-internet.fr
 Erick Branderhorst     branderh@iaehv.nl
+Erik Lindahl           E.Lindahl@chem.rug.nl
 François Pinard                pinard@iro.umontreal.ca
 Fred Fish              fnf@ninemoons.com
 Ganesan Rajagopal      rganesan@novell.com

diff --git a/lib/depcomp b/lib/depcomp
index 3cb7d712de9037e4b4b6128e7986601af90abe20..65899658ee7fe8de71d8f8fbcd869440f173ed5d 100755 (executable)
--- a/lib/depcomp
+++ b/lib/depcomp
@@ -200,9 +200,12 @@ aix)
 tru64)
    # The Tru64 AIX compiler uses -MD to generate dependencies as a side
    # effect.  `cc -MD -o foo.o ...' puts the dependencies into `foo.o.d'.
+   # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put 
+   # dependencies in `foo.d' instead, so we check for that too.
    # Subdirectories are respected.
 
-   tmpdepfile="$object.d"
+   tmpdepfile1="$object.d"
+   tmpdepfile2=`echo "$object" | sed -e 's/.o$/.d/'` 
    if test "$libtool" = yes; then
       "$@" -Wc,-MD
    else
@@ -212,10 +215,15 @@ tru64)
    stat=$?
    if test $stat -eq 0; then :
    else
-      rm -f "$tmpdepfile"
+      rm -f "$tmpdepfile1" "$tmpdepfile2"
       exit $stat
    fi
 
+   if test -f "$tmpdepfile1"; then
+      tmpdepfile="$tmpdepfile1"
+   else
+      tmpdepfile="$tmpdepfile2"
+   fi
    if test -f "$tmpdepfile"; then
       sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
       # That's a space and a tab in the [].

diff --git a/m4/depend.m4 b/m4/depend.m4
index 106004847ada38137f05f4f8d5f0b9ab72633e19..2ea62fb6a4efd0eb7293c9742617a4cac6fa3f3d 100644 (file)
--- a/m4/depend.m4
+++ b/m4/depend.m4
@@ -56,6 +56,7 @@ AC_CACHE_CHECK([dependency style of $depcc],
     # This happens at least with the AIX C compiler.
     echo '#include "conftest.h"' > conftest.c
     echo 'int i;' > conftest.h
+    echo "${am__include} ${am__quote}conftest.Po${am__quote}" > confmf
 
     case $depmode in
     nosideeffect)
@@ -76,7 +77,8 @@ AC_CACHE_CHECK([dependency style of $depcc],
        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
+       grep conftest.h conftest.Po > /dev/null 2>&1 &&
+       ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
       am_cv_$1_dependencies_compiler_type=$depmode
       break
     fi