From edde6b53b36246a41bbd2b3b9f4b6e06de663644 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Sat, 21 Jul 2001 18:45:47 +0000 Subject: [PATCH] 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. --- ChangeLog | 6 ++++++ THANKS | 1 + lib/depcomp | 12 ++++++++++-- m4/depend.m4 | 4 +++- 4 files changed, 20 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3532e647..5523a505 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,11 @@ 2001-07-21 Tom Tromey + 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 8bddad85..534414e6 100644 --- 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 3cb7d712..65899658 100755 --- 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 10600484..2ea62fb6 100644 --- 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 -- 2.43.5