From: Tom Tromey <tromey@redhat.com>
Date: Thu, 5 Feb 1998 20:43:29 +0000 (+0000)
Subject: applied AC_PROG_CXXCPP patch
X-Git-Tag: pre-depend-change~12
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4948270c5cf74ef56cbd49a5876b6ce26779e85b;p=thirdparty%2Fautomake.git

applied AC_PROG_CXXCPP patch
---

diff --git a/ChangeLog b/ChangeLog
index 79e547a56..c3a832cc1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Feb  5 13:38:55 1998  Tom Tromey  <tromey@cygnus.com>
+
+	* automake.in (scan_one_configure_file): Put CXCPP before CXX in
+	regexp.  From Garth Corral.  Test cxxxcpp.test.
+
 Sun Jan 25 11:16:53 1998  Tom Tromey  <tromey@cygnus.com>
 
 	* automake.in (generate_makefile): Run handle_minor_options before
diff --git a/THANKS b/THANKS
index 71539a64e..a4e46eac1 100644
--- a/THANKS
+++ b/THANKS
@@ -17,6 +17,7 @@ Erick Branderhorst	branderh@iaehv.nl
 François Pinard		pinard@iro.umontreal.ca
 Fred Fish		fnf@ninemoons.com
 Garrett D'Amore		garrett@qualcomm.com
+Garth Corral		garthc@inktomi.com
 Glenn Amerine		glenn@pie.mhsc.org
 Gord Matzigkeit		gord@gnu.ai.mit.edu
 Greg A. Woods		woods@most.weird.com
diff --git a/automake.in b/automake.in
index 844ecd47f..fd661217b 100755
--- a/automake.in
+++ b/automake.in
@@ -4115,7 +4115,7 @@ sub scan_one_configure_file
 	$seen_make_set = 1 if /AC_PROG_MAKE_SET/;
 	$seen_arg_prog = 1 if /AC_ARG_PROGRAM/;
 
-	if (/AC_PROG_(YACC|RANLIB|CC|CXX|LEX|AWK|CPP|CXXCPP|LN_S)/)
+	if (/AC_PROG_(YACC|RANLIB|CC|CXXCPP|CXX|LEX|AWK|CPP|LN_S)/)
 	{
 	    $configure_vars{$1} = 1;
 	}
diff --git a/tests/ChangeLog b/tests/ChangeLog
index 351cc34a0..66176adfd 100644
--- a/tests/ChangeLog
+++ b/tests/ChangeLog
@@ -1,3 +1,7 @@
+Thu Feb  5 13:22:17 1998  Tom Tromey  <tromey@cygnus.com>
+
+	* cxxcpp.test: New file.
+
 Mon Dec  1 15:48:16 1997  Tom Tromey  <tromey@cygnus.com>
 
 	* cond3.test: New file.
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 86ccbff33..8144e9a4e 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -27,7 +27,7 @@ yaccpp.test texinfo3.test texinfo4.test tagsub.test cxxlibobj.test \
 seenc.test cygwin32.test lisp.test stamph.test ldadd.test \
 version2.test conf2.test cond.test cond2.test xsource.test \
 libobj6.test depend3.test output5.test ammissing.test install.test \
-libobj7.test objc.test cond3.test
+libobj7.test objc.test cond3.test cxxcpp.test
 
 EXTRA_DIST = defs $(TESTS)
 
diff --git a/tests/Makefile.in b/tests/Makefile.in
index 6fa561d56..3839bb262 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -88,7 +88,7 @@ yaccpp.test texinfo3.test texinfo4.test tagsub.test cxxlibobj.test \
 seenc.test cygwin32.test lisp.test stamph.test ldadd.test \
 version2.test conf2.test cond.test cond2.test xsource.test \
 libobj6.test depend3.test output5.test ammissing.test install.test \
-libobj7.test objc.test cond3.test
+libobj7.test objc.test cond3.test cxxcpp.test
 
 EXTRA_DIST = defs $(TESTS)
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
diff --git a/tests/cxxcpp.test b/tests/cxxcpp.test
new file mode 100755
index 000000000..0a90fc78a
--- /dev/null
+++ b/tests/cxxcpp.test
@@ -0,0 +1,16 @@
+#! /bin/sh
+
+# Make sure automake sees AC_PROG_CXXCPP.  From Garth Corral.
+
+. $srcdir/defs || exit 1
+
+cat >> configure.in << 'END'
+AC_PROG_CXXCPP
+END
+
+
+: > Makefile.am
+
+$AUTOMAKE || exit 1
+
+grep '^CXXCPP' Makefile.in