diff --git a/ChangeLog b/ChangeLog
index 75ccc538b..a482369ef 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2011-04-10  Alexandre Duret-Lutz  <adl@lrde.epita.fr>
+
+	Always pass --enable-devel or --disable-devel to BuDDy.
+
+	* configure.ac: Do not add CXXFLAGS and CFLAGS in ac_configure_args,
+	it causes problem when using config.cache.  Instead ...
+	* m4/devel.m4: Add --enable-devel or --disable-devel on
+	ac_configure_args, now that BuDDy understands that.
+
 2011-04-10  Alexandre Duret-Lutz  <adl@lrde.epita.fr>
 
 	* src/misc/escape.hh: Fix Doxygen documentation.
diff --git a/configure.ac b/configure.ac
index 507552ce9..71ebc29b2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -59,10 +59,6 @@ adl_ENABLE_DEBUG
 ad_GCC_OPTIM
 adl_NDEBUG
 
-# Make sure we pass debug/optimization flags to sub-libraries
-as_fn_append ac_configure_args \
-	     " 'CXXFLAGS=$CXXFLAGS' 'CFLAGS=$CFLAGS' 'CPPFLAGS=$CPPFLAGS'"
-
 spot_INTEL
 if test x$enable_warnings = xyes; then
   CF_GXX_WARNINGS
diff --git a/m4/devel.m4 b/m4/devel.m4
index fee3fc150..280c35505 100644
--- a/m4/devel.m4
+++ b/m4/devel.m4
@@ -7,7 +7,17 @@ AC_DEFUN([adl_ENABLE_DEVEL],
  # explicitely turned off.
  case $VERSION in
    *[[abcdefghijklmnopqrstuvwxyz]])
-     enable_devel=${enable_devel-yes} ;;
+     if test -z "${enable_devel}"; then
+       enable_devel=yes
+       # Pass this flag to sub-libraries
+       as_fn_append ac_configure_args " --enable-devel"
+     fi;;
+   *)
+     if test -z "${enable_devel}"; then
+       enable_devel=no
+       # Pass this flag to sub-libraries
+       as_fn_append ac_configure_args " --disable-devel"
+     fi;;
  esac
 
  if test x"$enable_devel" = xyes; then