Define the debug mode tokes instead.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@8763 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/config/ChangeLog b/config/ChangeLog
index 67c93edd6de624f20d8336b5d536933910bd45c8..d11a83ddf641340c49437993c9259e93c8aaac4f 100644 (file)
--- a/config/ChangeLog
+++ b/config/ChangeLog
@@ -1,7 +1,11 @@
+2004-05-18  Lars Gullik Bjonnes  <larsbj@lyx.org>
+
+       * lyxinclude.m4 (lyx_warning): change debug mode setup to use AC_DEFINE
+
 2004-05-18  Lars Gullik Bjonnes  <larsbj@gullik.net>
 
        * lyxinclude.m4 (enable-debug): Use the libstdc++ debugging mode
-       if configuring with enable-debug. 
+       if configuring with enable-debug.
 
 2004-05-05  Jean-Marc Lasgouttes  <lasgouttes@lyx.org>
 

diff --git a/config/lyxinclude.m4 b/config/lyxinclude.m4
index adcc68ac38c681582a41b6b3963dd0a3c40902bd..293961b599fb1f0e6d85c5ad61853c856ffae2e2 100644 (file)
--- a/config/lyxinclude.m4
+++ b/config/lyxinclude.m4
@@ -24,7 +24,7 @@ fi
 changequote([, ]) dnl
 AC_SUBST(lyx_devel_version)
 if test $lyx_devel_version = yes ; then
-  AC_DEFINE(DEVEL_VERSION, 1, Define if you are building a development version of LyX)
+  AC_DEFINE(DEVEL_VERSION, 1, [Define if you are building a development version of LyX])
 fi])
 
 
@@ -217,7 +217,10 @@ if test x$GXX = xyes; then
     esac
     if test x$enable_debug = xyes ; then
        case $gxx_version in
-           3.4*) CXXFLAGS="-g -D_GLIBCXX_DEBUG -D_GLIBCXX_DEBUG_PEDANTIC $CXXFLAGS";;
+           3.4*) CXXFLAGS="-g $CXXFLAGS"
+               AC_DEFINE(_GLIBCXX_DEBUG, 1, [libstdc++ debug mode])
+               AC_DEFINE(_GLIBCXX_DEBUG_PEDANTIC, 1, [libstdc++ pedantic debug mode])
+               ;;
            *)    CXXFLAGS="-g $CXXFLAGS";;
        esac
     fi
@@ -227,6 +230,7 @@ if test x$GXX = xyes; then
        2.95.*) CXXFLAGS="$CXXFLAGS -W -Wall";;
        2.96*)  CXXFLAGS="$CXXFLAGS -W -Wall";;
        3.1*)  CXXFLAGS="$CXXFLAGS -W -Wall";;
+       3.4*)   CXXFLAGS="$CXXFLAGS -Wextra -Wall";;
        *)      CXXFLAGS="$CXXFLAGS -W -Wall";;
     esac
   fi