1999-01-19 Ben Elliston <bje@cygnus.com>

	* acspecific.m4 (AC_PROG_CXXCPP): Substitute @CXXCPP@ correctly
	when $CXXCPP is overridden in the supervisory shell. Contributed
	by Michael Schoene <mrs@mlc.de>.

diff --git a/ChangeLog b/ChangeLog
index 8b72be4c4b997c1ea46ac1ab9dc0fd7f77d110c7..4d580b5ce76d4d1cae25936e819d38632f08bc1d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+1999-01-19  Ben Elliston  <bje@cygnus.com>
+
+       * acspecific.m4 (AC_PROG_CXXCPP): Substitute @CXXCPP@ correctly
+       when $CXXCPP is overridden in the supervisory shell. Contributed
+       by Michael Schoene <mrs@mlc.de>.
+
 1999-01-16  Ben Elliston  <bje@cygnus.com>
 
        * acgeneral.m4 (AC_ACVERSION): Bump to 2.14.1 for prereleases.

diff --git a/acspecific.m4 b/acspecific.m4
index 5c6f1c9e5fb36fe4d598638d6d0b8840c681b41e..1fa16c306c121af0b79fd33348d1e2e17e13c882 100644 (file)
--- a/acspecific.m4
+++ b/acspecific.m4
@@ -528,8 +528,9 @@ AC_LANG_CPLUSPLUS[]dnl
   AC_TRY_CPP([#include <stdlib.h>], , CXXCPP=/lib/cpp)
   ac_cv_prog_CXXCPP="$CXXCPP"
 AC_LANG_RESTORE[]dnl
-fi])dnl
+])dnl
 CXXCPP="$ac_cv_prog_CXXCPP"
+fi
 AC_MSG_RESULT($CXXCPP)
 AC_SUBST(CXXCPP)dnl
 ])

diff --git a/lib/autoconf/specific.m4 b/lib/autoconf/specific.m4
index 5c6f1c9e5fb36fe4d598638d6d0b8840c681b41e..1fa16c306c121af0b79fd33348d1e2e17e13c882 100644 (file)
--- a/lib/autoconf/specific.m4
+++ b/lib/autoconf/specific.m4
@@ -528,8 +528,9 @@ AC_LANG_CPLUSPLUS[]dnl
   AC_TRY_CPP([#include <stdlib.h>], , CXXCPP=/lib/cpp)
   ac_cv_prog_CXXCPP="$CXXCPP"
 AC_LANG_RESTORE[]dnl
-fi])dnl
+])dnl
 CXXCPP="$ac_cv_prog_CXXCPP"
+fi
 AC_MSG_RESULT($CXXCPP)
 AC_SUBST(CXXCPP)dnl
 ])