Set the non-debug compiling the default

Compiling with debugging can be enabled with the "--enable-debug" option
of the configure script.

diff --git a/Make_global.am b/Make_global.am
index 05a053c3c4ad4904127a3b1852a2ab78b433cd4a..e178fe50b314e50a74aefcd970ce32315798d7c2 100644 (file)
--- a/Make_global.am
+++ b/Make_global.am
@@ -7,10 +7,12 @@ LIBVERSION = 1:0:0
 AM_CPPFLAGS = $(kinclude_CFLAGS) $(all_includes) -I$(top_srcdir)/include \
        -I/usr/local/include
 
-AM_CFLAGS = -std=gnu99 -Wall
+AM_CFLAGS = -std=gnu99
 
 if ENABLE_DEBUG
-AM_CFLAGS += -g -ggdb -gdwarf-2 -g3 -DIPSET_DEBUG
+AM_CFLAGS += -g -g3 -ggdb -gdwarf-2 -DIPSET_DEBUG -Wall -Werror
+else
+AM_CFLAGS += -O2 -DNDEBUG
 endif
 
 if ! ENABLE_VERBOSE

diff --git a/configure.ac b/configure.ac
index c5bcdce1d5dc7b87f855bc309f1315c5bc140473..93d5331448227a686a57d41394bf139515baeb79 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -3,7 +3,7 @@ AC_INIT([ipset], [5.2], [kadlec@blackhole.kfki.hu])
 AC_CANONICAL_HOST
 AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_HEADER([config.h])
-AM_INIT_AUTOMAKE([-Wall -Werror foreign subdir-objects])
+AM_INIT_AUTOMAKE([foreign subdir-objects])
 
 dnl Shortcut: Linux supported alone
 case "$host" in
@@ -94,6 +94,8 @@ AC_ARG_ENABLE([debug],
 AM_CONDITIONAL([ENABLE_DEBUG], [test "x$enable_debug" = xyes])
 
 dnl Checks for programs
+: ${CFLAGS=""}
+
 AC_PROG_CC
 AM_PROG_CC_C_O
 AC_PROG_LIBTOOL
@@ -121,6 +123,8 @@ dnl Check extra warning flags except
 dnl    -Wconversion            -> we need it
 dnl    -Wunreachable-code      -> fails with ntoh*
 dnl    -Wpointer-arith         -> limbnl uses it
+if test "x$enable_debug" = "xyes"
+then
 AX_CFLAGS_GCC_OPTION(-Waggregate-return)
 AX_CFLAGS_GCC_OPTION(-Wbad-function-cast)
 AX_CFLAGS_GCC_OPTION(-Wcast-align)
@@ -146,7 +150,7 @@ AX_CFLAGS_GCC_OPTION(-Wswitch-default)
 AX_CFLAGS_GCC_OPTION(-Wundef)
 AX_CFLAGS_GCC_OPTION(-Wunused)
 AX_CFLAGS_GCC_OPTION(-Wwrite-strings)
-
+fi
 dnl Checks for library functions.
 
 dnl Generate output