Some patches

[Aron Griffis <agriffis at bigfoot dot com>]

Hello,

There are three patches I always apply to automake-1.4 before I can
use it on Tru64 UNIX V5.x.

The first patch alleviates the need for GNU grep in insthook.test.  I
don't think it's bad for automake to rely on other GNU programs,
however in this case it seems possible to easily remove one
dependency.

The second patch removes the dependency on gcc, or a compiler that
understands gcc flags.  This results in a second pass of the compiler,
which is not ideal but is far more portable a solution.  You probably
don't want to integrate this patch directly, but rather to test for
gcc and act accordingly, maybe even at run-time.  IMHO this should be
a high priority since otherwise automake is unnecessarily tied to gcc.

The third patch simply upgrades the version of libtool.  If this
hasn't been done yet in your sources, please update to version 1.3.5.
Versions prior to 1.3.4 don't support Tru64 UNIX V5.0 and greater.
This patch is not attached since I'm sure it would be easier for you
to simply grab the latest libtool and integrate it yourselves.

Please Cc me in replies since I'm not on the automake list.

Thanks,
Aron Griffis

-- 
Aron Griffis                  
Tru64 UNIX Platform & Kernel
Compaq Computer Corporation, ZKO3-3/T30
diff -ru old/automake-1.4/tests/insthook.test automake-1.4/tests/insthook.test
--- old/automake-1.4/tests/insthook.test	Mon Dec 21 15:59:42 1998
+++ automake-1.4/tests/insthook.test	Tue Apr 25 16:27:06 2000
@@ -13,4 +13,5 @@
 $AUTOMAKE || exit 1
 
 test "`grep install-exec-hook Makefile.in | wc -l`" -gt 1 || exit 1
-grep -A2 '^install-exec-am:' Makefile.in | grep install-exec-hook
+awk '$0~/^install-exec-am:/{getline;getline;print;}' Makefile.in \
+    | grep install-exec-hook
diff -ru old/automake-1.4/depend2.am automake-1.4/depend2.am
--- old/automake-1.4/depend2.am	Tue Jan  5 18:08:36 1999
+++ automake-1.4/depend2.am	Wed Apr 26 16:41:46 2000
@@ -26,7 +26,8 @@
 ##   -MM, not -M (despite what the docs say).
 ## - Using -M directly means running the compiler twice (even worse
 ##   than renaming).
-	$(@PFX@COMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
+	$(@PFX@COMPILE) -M $< > .deps/$(*F).pp; \
+	$(@PFX@COMPILE) -c $<
 ## This next piece of magic avoids the `deleted header file' problem.
 ## The problem is that when a header file which appears in a .P file
 ## is deleted, the dependency causes make to die (because there is
@@ -34,7 +35,7 @@
 ## dummy dependencies for each header file.  Too bad gcc doesn't do
 ## this for us directly.
 	@-cp .deps/$(*F).pp .deps/$(*F).P; \
-	tr ' ' '\012' < .deps/$(*F).pp \
+	tr -s '[:space:]' '\012' < .deps/$(*F).pp \
 ## Some versions of gcc put a space before the `:'.  On the theory
 ## that the space means something, we add a space to the output as
 ## well.
@@ -45,12 +46,13 @@
 %.lo: %@EXT@
 	@echo '$(LT@PFX@COMPILE) -c $<'; \
 ## See above to understand implementation weirdness.
-	$(LT@PFX@COMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
+	$(@PFX@COMPILE) -M $< > .deps/$(*F).pp; \
+	$(LT@PFX@COMPILE) -c $<
 ## Account for versions of gcc that put a space before the `:'.
 	@-sed -e 's/^\([^:]*\)\.o[ 	]*:/\1.lo \1.o :/' \
 	  < .deps/$(*F).pp > .deps/$(*F).P; \
 ## See above to understand deleted header file trick.
-	tr ' ' '\012' < .deps/$(*F).pp \
+	tr -s '[:space:]' '\012' < .deps/$(*F).pp \
 ## Some versions of gcc put a space before the `:'.  On the theory
 ## that the space means something, we add a space to the output as
 ## well.