From 06c788932bb635da79076728927b7b93f64037c1 Mon Sep 17 00:00:00 2001
From: Jamey Sharp <jamey@minilop.net>
Date: Mon, 20 Feb 2006 00:41:39 -0800
Subject: [PATCH] Control debugging, optimization, and warning flags all
 independently.

---
 configure.ac    | 40 +++++++++++++++++++++++++++++++---------
 src/Makefile.am |  2 +-
 2 files changed, 32 insertions(+), 10 deletions(-)

diff --git a/configure.ac b/configure.ac
index 2f14c71..5e4405c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -55,28 +55,50 @@ AC_ARG_WITH(opt,
 AC_HELP_STRING([--with-opt],       [compile with reasonable optimizations])
 AC_HELP_STRING([--with-opt=FLAGS], [compile with specified FLAGS])
 AC_HELP_STRING([--with-opt=small], [compile for smallest code])
-AC_HELP_STRING([--with-opt=debug], [compile for debugging (default)]),
+AC_HELP_STRING([--without-opt],    [compile without optimization (default)]),
 [
 	case "$withval" in
 	yes)
-		optflags="-O3"
+		COPTFLAGS="-O3"
 		;;
 	small)
-		optflags="-Os -fomit-frame-pointer -DNDEBUG"
+		COPTFLAGS="-Os -fomit-frame-pointer -DNDEBUG"
 		;;
-	no|debug)
-		optflags="-g"
+	no)
+		COPTFLAGS=""
 		;;
 	*)
-		optflags="$withval"
+		COPTFLAGS="$withval"
 		;;
 	esac
 ])
-AC_CACHE_CHECK([what compiler optimizations to apply], [optflags], [optflags="-g"])
-CDEBUGFLAGS="$optflags -Wall -pedantic -Wpointer-arith \
-	-Wstrict-prototypes -Wmissing-declarations -Wnested-externs"
+AC_CACHE_CHECK([what compiler optimizations to apply], [COPTFLAGS], [COPTFLAGS=""])
+AC_SUBST(COPTFLAGS)
+
+AC_ARG_WITH(debug,
+AC_HELP_STRING([--with-debug],       [compile with debugging (default)])
+AC_HELP_STRING([--with-debug=FLAGS], [compile with specified debugging FLAGS])
+AC_HELP_STRING([--without-debug],    [compile without debugging]),
+[
+	case "$withval" in
+	yes)
+		CDEBUGFLAGS="-g"
+		;;
+	no)
+		CDEBUGFLAGS=""
+		;;
+	*)
+		CDEBUGFLAGS="$withval"
+		;;
+	esac
+])
+AC_CACHE_CHECK([what debugging options to apply], [CDEBUGFLAGS], [CDEBUGFLAGS="-g"])
 AC_SUBST(CDEBUGFLAGS)
 
+CWARNFLAGS="-Wall -pedantic -Wpointer-arith \
+	-Wstrict-prototypes -Wmissing-declarations -Wnested-externs"
+AC_SUBST(CWARNFLAGS)
+
 AC_CONFIG_FILES([Makefile src/Makefile tests/Makefile])
 AC_CONFIG_FILES([xcb.pc])
 
diff --git a/src/Makefile.am b/src/Makefile.am
index 8d43475..ea34a2c 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -49,7 +49,7 @@ COREPROTO   = $(CORESOURCES) $(COREHEADERS)
 xcbinclude_HEADERS = xcb.h xcbext.h xcbxlib.h $(COREHEADERS) $(EXTHEADERS)
 
 CFLAGS =
-AM_CFLAGS = -include config.h $(CDEBUGFLAGS) $(XCBPROTO_CFLAGS) $(XPROTO_CFLAGS) $(XAU_CFLAGS)
+AM_CFLAGS = -include config.h $(COPTFLAGS) $(CWARNFLAGS) $(CDEBUGFLAGS) $(XCBPROTO_CFLAGS) $(XPROTO_CFLAGS) $(XAU_CFLAGS)
 libXCB_la_LIBADD = $(XCBPROTO_LIBS) $(XPROTO_LIBS) $(XAU_LIBS)
 libXCB_la_SOURCES = \
 		xcb_conn.c xcb_out.c xcb_in.c xcb_ext.c xcb_xid.c \
-- 
2.7.4