From 7bcd027712088a7d84d6fc0ec0607588ef49a837 Mon Sep 17 00:00:00 2001
From: Alexandre Duret-Lutz <adl@lrde.epita.fr>
Date: Mon, 11 Oct 2004 12:32:49 +0000
Subject: [PATCH] * configure.ac: Empty CFLAGS and CXXFLAGS. * m4/debug.m4:
 Update CXXFLAGS too.

---
 ChangeLog    | 5 +++++
 configure.ac | 5 +++++
 m4/debug.m4  | 2 ++
 3 files changed, 12 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 334f6a0b9..b8927da3f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-10-11  Alexandre Duret-Lutz  <adl@src.lip6.fr>
+
+	* configure.ac: Empty CFLAGS and CXXFLAGS.
+	* m4/debug.m4: Update CXXFLAGS too.
+
 2004-10-08  Alexandre Duret-Lutz  <adl@src.lip6.fr>
 
 	* doc/Doxyfile.in: Upgrade to Doxygen 1.3.9.
diff --git a/configure.ac b/configure.ac
index 726a1c8cc..1cfef9786 100644
--- a/configure.ac
+++ b/configure.ac
@@ -24,6 +24,11 @@ AC_INIT([spot], [0.0y])
 AC_CONFIG_AUX_DIR([tools])
 AM_INIT_AUTOMAKE([gnits nostdinc 1.8])
 
+# If the user didn't supplied a CFLAGS value,
+# set an empty one to prevent autoconf to stick -O2 -g here.
+test -z "$CFLAGS" && CFLAGS=
+test -z "$CXXFLAGS" && CXXFLAGS=
+
 adl_ENABLE_DEVEL
 adl_CHECK_PYTHON
 
diff --git a/m4/debug.m4 b/m4/debug.m4
index 6d1dc6ec9..50bf5f3cb 100644
--- a/m4/debug.m4
+++ b/m4/debug.m4
@@ -8,6 +8,7 @@ AC_DEFUN([adl_ENABLE_DEBUG],
       # are able to grok the resulting debug infos.
       if test "${ac_cv_prog_cc_g}" = yes; then
         CFLAGS="$CFLAGS -g"
+        CXXFLAGS="$CXXFLAGS -g"
       fi
       ;;
     no)
@@ -15,6 +16,7 @@ AC_DEFUN([adl_ENABLE_DEBUG],
     *)
       if test "${ac_cv_prog_cc_g}" = yes; then
         CFLAGS="$CFLAGS -g"
+        CXXFLAGS="$CXXFLAGS -g"
       fi
       ;;
   esac])