put debug -DFOO stuff into CPPFLAGS, not CFLAGS, so CFLAGS can be

* configure.in: put debug -DFOO stuff into CPPFLAGS, not CFLAGS,
so CFLAGS can be overridden at make time properly

-Yosh

diff --git a/ChangeLog b/ChangeLog
index c9eeed9..c76a615 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sun Nov 29 14:17:09 PST 1998 Manish Singh <yosh@gimp.org>
+
+       * configure.in: put debug -DFOO stuff into CPPFLAGS, not CFLAGS,
+       so CFLAGS can be overridden at make time properly
+
 Sat Nov 28 01:23:25 1998  Tim Janik  <timj@gtk.org>
 
        * ghash.c: implemented incremental freezing facility.

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index c9eeed9..c76a615 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,8 @@
+Sun Nov 29 14:17:09 PST 1998 Manish Singh <yosh@gimp.org>
+
+       * configure.in: put debug -DFOO stuff into CPPFLAGS, not CFLAGS,
+       so CFLAGS can be overridden at make time properly
+
 Sat Nov 28 01:23:25 1998  Tim Janik  <timj@gtk.org>
 
        * ghash.c: implemented incremental freezing facility.

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index c9eeed9..c76a615 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+Sun Nov 29 14:17:09 PST 1998 Manish Singh <yosh@gimp.org>
+
+       * configure.in: put debug -DFOO stuff into CPPFLAGS, not CFLAGS,
+       so CFLAGS can be overridden at make time properly
+
 Sat Nov 28 01:23:25 1998  Tim Janik  <timj@gtk.org>
 
        * ghash.c: implemented incremental freezing facility.

diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index c9eeed9..c76a615 100644 (file)
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,3 +1,8 @@
+Sun Nov 29 14:17:09 PST 1998 Manish Singh <yosh@gimp.org>
+
+       * configure.in: put debug -DFOO stuff into CPPFLAGS, not CFLAGS,
+       so CFLAGS can be overridden at make time properly
+
 Sat Nov 28 01:23:25 1998  Tim Janik  <timj@gtk.org>
 
        * ghash.c: implemented incremental freezing facility.

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index c9eeed9..c76a615 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,8 @@
+Sun Nov 29 14:17:09 PST 1998 Manish Singh <yosh@gimp.org>
+
+       * configure.in: put debug -DFOO stuff into CPPFLAGS, not CFLAGS,
+       so CFLAGS can be overridden at make time properly
+
 Sat Nov 28 01:23:25 1998  Tim Janik  <timj@gtk.org>
 
        * ghash.c: implemented incremental freezing facility.

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index c9eeed9..c76a615 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,8 @@
+Sun Nov 29 14:17:09 PST 1998 Manish Singh <yosh@gimp.org>
+
+       * configure.in: put debug -DFOO stuff into CPPFLAGS, not CFLAGS,
+       so CFLAGS can be overridden at make time properly
+
 Sat Nov 28 01:23:25 1998  Tim Janik  <timj@gtk.org>
 
        * ghash.c: implemented incremental freezing facility.

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index c9eeed9..c76a615 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+Sun Nov 29 14:17:09 PST 1998 Manish Singh <yosh@gimp.org>
+
+       * configure.in: put debug -DFOO stuff into CPPFLAGS, not CFLAGS,
+       so CFLAGS can be overridden at make time properly
+
 Sat Nov 28 01:23:25 1998  Tim Janik  <timj@gtk.org>
 
        * ghash.c: implemented incremental freezing facility.

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index c9eeed9..c76a615 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+Sun Nov 29 14:17:09 PST 1998 Manish Singh <yosh@gimp.org>
+
+       * configure.in: put debug -DFOO stuff into CPPFLAGS, not CFLAGS,
+       so CFLAGS can be overridden at make time properly
+
 Sat Nov 28 01:23:25 1998  Tim Janik  <timj@gtk.org>
 
        * ghash.c: implemented incremental freezing facility.

diff --git a/configure.in b/configure.in
index 95a2eda..dc529c0 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -83,10 +83,10 @@ fi
 
 if test "x$enable_debug" = "xyes"; then
   test "$cflags_set" = set || CFLAGS="$CFLAGS -g"
-  CFLAGS="$CFLAGS -DG_ENABLE_DEBUG"
+  CPPFLAGS="$CPPFLAGS -DG_ENABLE_DEBUG"
 else
   if test "x$enable_debug" = "xno"; then
-    CFLAGS="$CFLAGS -DG_DISABLE_ASSERT -DG_DISABLE_CHECKS"
+    CPPFLAGS="$CPPFLAGS -DG_DISABLE_ASSERT -DG_DISABLE_CHECKS"
   fi
 fi