Remove --with-opt and --with-debug options from configure.ac; use CFLAGS instead

configure supports using custom CFLAGS, so remove the --with-opt and
--with-debug options from configure.ac, and the corresponding usage of
COPTFLAGS and CDEBUGFLAGS in src/Makefile.am.

diff --git a/configure.ac b/configure.ac
index c9fc555..0dd396d 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -61,50 +61,6 @@ AC_SEARCH_LIBS(connect, socket)
 xcbincludedir='${includedir}/xcb'
 AC_SUBST(xcbincludedir)
 
-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([--without-opt],    [compile without optimization (default)]),
-[
-       case "$withval" in
-       yes)
-               COPTFLAGS="-O3"
-               ;;
-       small)
-               COPTFLAGS="-Os -fomit-frame-pointer -DNDEBUG"
-               ;;
-       no)
-               COPTFLAGS=""
-               ;;
-       *)
-               COPTFLAGS="$withval"
-               ;;
-       esac
-])
-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)
-
 if  test "x$GCC" = xyes ; then
     CWARNFLAGS="-Wall -pedantic -Wpointer-arith \
                -Wstrict-prototypes -Wmissing-declarations -Wnested-externs"

diff --git a/src/Makefile.am b/src/Makefile.am
index e8dc4cc..fdbd6b4 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -94,7 +94,7 @@ EXTENSION_XML = xproto.xml \
 xcbinclude_HEADERS = xcb.h xcbext.h xcbxlib.h $(EXTHEADERS)
 noinst_HEADERS = xcbint.h
 
-AM_CFLAGS = $(COPTFLAGS) $(CWARNFLAGS) $(CDEBUGFLAGS) $(NEEDED_CFLAGS) $(XDMCP_CFLAGS)
+AM_CFLAGS = $(CWARNFLAGS) $(NEEDED_CFLAGS) $(XDMCP_CFLAGS)
 libxcb_la_LIBADD = $(NEEDED_LIBS) $(XDMCP_LIBS)
 libxcb_la_SOURCES = \
                xcb_conn.c xcb_out.c xcb_in.c xcb_ext.c xcb_xid.c \