From 32e935c8c67902dff2d089658f2877f60fd89b4e Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Thu, 9 Jun 2005 04:24:22 +0000
Subject: r7419: when we have both --enable-developer and --enable-debug we
 don't need -g twice in the CFLAGS (This used to be commit
 1383c024d11646b7f39e1ba936d8f847bb1a05f9)

---
 source4/build/m4/check_path.m4 | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

(limited to 'source4')

diff --git a/source4/build/m4/check_path.m4 b/source4/build/m4/check_path.m4
index 5d3c70049d..314a368cf2 100644
--- a/source4/build/m4/check_path.m4
+++ b/source4/build/m4/check_path.m4
@@ -130,23 +130,24 @@ AC_SUBST(bindir)
 AC_SUBST(sbindir)
 AC_SUBST(swatdir)
 
-debug=no
-AC_ARG_ENABLE(debug, 
-[  --enable-debug          Turn on compiler debugging information (default=no)],
-    [if eval "test x$enable_debug = xyes"; then
-        debug=yes
-	CFLAGS="${CFLAGS} -g"
-    fi])
-
 developer=no
 AC_ARG_ENABLE(developer, [  --enable-developer      Turn on developer warnings and debugging (default=no)],
-    [if eval "test x$enable_developer = xyes"; then
+    [if test x$enable_developer = xyes; then
 	debug=yes
 	CFLAGS="${CFLAGS} -g -Wall"
         developer=yes
     	DEVELOPER_CFLAGS="-Wshadow -Werror-implicit-function-declaration -Wstrict-prototypes -Wpointer-arith -Wcast-qual -Wcast-align -Wwrite-strings -Wdeclaration-after-statement -Wmissing-format-attribute -Wformat=2 -Wno-format-y2k -DDEBUG_PASSWORD -DDEVELOPER"
     fi])
 
+debug=no
+AC_ARG_ENABLE(debug, 
+[  --enable-debug          Turn on compiler debugging information (default=no)],
+    [if test x$enable_debug = xyes -a test x$enable_developer != xyes; then
+        debug=yes
+	CFLAGS="${CFLAGS} -g"
+    fi])
+
+
 experimental=no
 AC_ARG_ENABLE(experimental, [  --enable-experimental Turn on experimental features (default=no)],
     [if eval "test x$enable_experimental = xyes"; then
-- 
cgit