configure.in (CXXFLAGS): The buggy g++ -g work-around was buggy itself...

1999-08-03  Alexandre Oliva  <oliva@dcc.unicamp.br>

	* configure.in (CXXFLAGS): The buggy g++ -g work-around was buggy
	itself; check for Makefile *anywhere* in CONFIG_FILES.
	* configure: Rebuilt.

From-SVN: r28477

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index efacbf566fa37c37bf4c86c64f1b02c63e1ec65f..32ccba09ba4bd011a726695e43cbd67aa02f6434 100644 (file)
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,9 @@
+1999-08-03  Alexandre Oliva  <oliva@dcc.unicamp.br>
+
+       * configure.in (CXXFLAGS): The buggy g++ -g work-around was buggy
+       itself; check for Makefile *anywhere* in CONFIG_FILES.
+       * configure: Rebuilt.
+
 1999-08-02  Tom Tromey  <tromey@cygnus.com>
 
        * aclocal.m4, configure: Rebuilt for new libtool.

diff --git a/libjava/configure b/libjava/configure
index 06e7d1c1f8f56ebfbc8d0bfae220cfd127278f40..9d133c72077e14090c1f8dcb0a5682bc57f91294 100755 (executable)
--- a/libjava/configure
+++ b/libjava/configure
@@ -5170,7 +5170,7 @@ CXX="${CXX}"
 EOF
 cat >> $CONFIG_STATUS <<\EOF
 test -z "$CONFIG_HEADERS" || echo timestamp > include/stamp-h
-case " $CONFIG_FILES " in " Makefile ")
+case " $CONFIG_FILES " in *" Makefile "*)
      if test "x$libjava_cv_gxx_debug_jboolean_bug" = xyes; then
       rm -f Makefile.new
       sed < Makefile > Makefile.new \

diff --git a/libjava/configure.in b/libjava/configure.in
index 4d91d2c85c6b243a3d6b77a265c328060ac198a7..cc3206bdc025e1b10381beeb130b7703dd70fc28 100644 (file)
--- a/libjava/configure.in
+++ b/libjava/configure.in
@@ -549,11 +549,11 @@ AC_CACHE_CHECK([for g++ -g jboolean bug], [libjava_cv_gxx_debug_jboolean_bug],
 ])
 if test "x$libjava_cv_gxx_debug_jboolean_bug" = xyes; then
   JCFLAGS="$JCFLAGS -g0"
-  dnl Top-leve Makefile overrides CXXFLAGS, and AM_CXXFLAGS is before it,
-  dnl so we have to use this dirty hack
+  dnl Top-level Makefile overrides CXXFLAGS, and AM_CXXFLAGS is before it,
+  dnl so we have to use this dirty hack :-(
   dnl Note that, even though this code is within an if statement, it is
   dnl unconditionally added to config.status, so we have to test again.
-  AC_OUTPUT_COMMANDS([case " $CONFIG_FILES " in " Makefile ")
+  AC_OUTPUT_COMMANDS([case " $CONFIG_FILES " in *" Makefile "*)
      if test "x$libjava_cv_gxx_debug_jboolean_bug" = xyes; then
       rm -f Makefile.new
       sed < Makefile > Makefile.new \