diff options
| author | Alexandre Oliva <oliva@dcc.unicamp.br> | 1999-08-03 17:35:08 +0000 |
|---|---|---|
| committer | Tom Tromey <tromey@gcc.gnu.org> | 1999-08-03 17:35:08 +0000 |
| commit | dd6aafbb4d1533686f642ced9c60009edf6a8acc (patch) | |
| tree | 1eacf1040a0e4e7208d728f012ca6a5eeeabcaf7 | |
| parent | 904972fa160d5225c8f14382a1129daf71f453b5 (diff) | |
| download | gcc-dd6aafbb4d1533686f642ced9c60009edf6a8acc.tar.gz | |
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
| -rw-r--r-- | libjava/ChangeLog | 6 | ||||
| -rwxr-xr-x | libjava/configure | 2 | ||||
| -rw-r--r-- | libjava/configure.in | 6 |
3 files changed, 10 insertions, 4 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index efacbf566fa..32ccba09ba4 100644 --- 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 06e7d1c1f8f..9d133c72077 100755 --- 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 4d91d2c85c6..cc3206bdc02 100644 --- 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 \ |