Control debugging, optimization, and warning flags all independently.

This commit is contained in:
Jamey Sharp 2006-02-20 00:41:39 -08:00
parent 3f98dae4a8
commit 06c788932b
2 changed files with 32 additions and 10 deletions

View File

@ -55,28 +55,50 @@ AC_ARG_WITH(opt,
AC_HELP_STRING([--with-opt], [compile with reasonable optimizations]) AC_HELP_STRING([--with-opt], [compile with reasonable optimizations])
AC_HELP_STRING([--with-opt=FLAGS], [compile with specified FLAGS]) 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=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 case "$withval" in
yes) yes)
optflags="-O3" COPTFLAGS="-O3"
;; ;;
small) small)
optflags="-Os -fomit-frame-pointer -DNDEBUG" COPTFLAGS="-Os -fomit-frame-pointer -DNDEBUG"
;; ;;
no|debug) no)
optflags="-g" COPTFLAGS=""
;; ;;
*) *)
optflags="$withval" COPTFLAGS="$withval"
;; ;;
esac esac
]) ])
AC_CACHE_CHECK([what compiler optimizations to apply], [optflags], [optflags="-g"]) AC_CACHE_CHECK([what compiler optimizations to apply], [COPTFLAGS], [COPTFLAGS=""])
CDEBUGFLAGS="$optflags -Wall -pedantic -Wpointer-arith \ AC_SUBST(COPTFLAGS)
-Wstrict-prototypes -Wmissing-declarations -Wnested-externs"
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) 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([Makefile src/Makefile tests/Makefile])
AC_CONFIG_FILES([xcb.pc]) AC_CONFIG_FILES([xcb.pc])

View File

@ -49,7 +49,7 @@ COREPROTO = $(CORESOURCES) $(COREHEADERS)
xcbinclude_HEADERS = xcb.h xcbext.h xcbxlib.h $(COREHEADERS) $(EXTHEADERS) xcbinclude_HEADERS = xcb.h xcbext.h xcbxlib.h $(COREHEADERS) $(EXTHEADERS)
CFLAGS = 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_LIBADD = $(XCBPROTO_LIBS) $(XPROTO_LIBS) $(XAU_LIBS)
libXCB_la_SOURCES = \ libXCB_la_SOURCES = \
xcb_conn.c xcb_out.c xcb_in.c xcb_ext.c xcb_xid.c \ xcb_conn.c xcb_out.c xcb_in.c xcb_ext.c xcb_xid.c \