enable-checking

git-svn-id: file:///svn/unbound/trunk@1998 be551aaa-1e26-0410-a405-d3ace91eadb9

diff --git a/configure b/configure
index 5ba26c67c7bb28f61d30d47a3b4143b67da0c281..5af6231bbbf8fb87e500c262dc650567a2424dc0 100755 (executable)
--- a/configure
+++ b/configure
@@ -912,6 +912,7 @@ with_chroot_dir
 with_share_dir
 with_pidfile
 with_username
+enable_checking
 enable_debug
 enable_shared
 enable_static
@@ -1572,8 +1573,8 @@ Optional Features:
   --disable-option-checking  ignore unrecognized --enable/--with options
   --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
   --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
-  --enable-debug          Enable debug warnings, asserts,
-                          makefile-dependencies
+  --enable-checking       Enable warnings, asserts, makefile-dependencies
+  --enable-debug          same as enable-checking
   --enable-shared[=PKGS]  build shared libraries [default=yes]
   --enable-static[=PKGS]  build static libraries [default=yes]
   --enable-fast-install[=PKGS]
@@ -5803,14 +5804,20 @@ fi
 
 
 # debug mode flags warnings
+# Check whether --enable-checking was given.
+if test "${enable_checking+set}" = set; then
+  enableval=$enable_checking;
+fi
+
 # Check whether --enable-debug was given.
 if test "${enable_debug+set}" = set; then
   enableval=$enable_debug;
 fi
 
-debug_enabled="$enable_debug"
+if test "$enable_debug" = "yes"; then debug_enabled="$enable_debug";
+else debug_enabled="$enable_checking"; fi
 
-case "$enable_debug" in
+case "$debug_enabled" in
         yes)
 
 
@@ -7282,13 +7289,13 @@ if test "${lt_cv_nm_interface+set}" = set; then
 else
   lt_cv_nm_interface="BSD nm"
   echo "int some_variable = 0;" > conftest.$ac_ext
-  (eval echo "\"\$as_me:7285: $ac_compile\"" >&5)
+  (eval echo "\"\$as_me:7292: $ac_compile\"" >&5)
   (eval "$ac_compile" 2>conftest.err)
   cat conftest.err >&5
-  (eval echo "\"\$as_me:7288: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+  (eval echo "\"\$as_me:7295: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
   (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
   cat conftest.err >&5
-  (eval echo "\"\$as_me:7291: output\"" >&5)
+  (eval echo "\"\$as_me:7298: output\"" >&5)
   cat conftest.out >&5
   if $GREP 'External.*some_variable' conftest.out > /dev/null; then
     lt_cv_nm_interface="MS dumpbin"
@@ -8493,7 +8500,7 @@ ia64-*-hpux*)
   ;;
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 8496 "configure"' > conftest.$ac_ext
+  echo '#line 8503 "configure"' > conftest.$ac_ext
   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -9860,11 +9867,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:9863: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:9870: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:9867: \$? = $ac_status" >&5
+   echo "$as_me:9874: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -10199,11 +10206,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:10202: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:10209: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:10206: \$? = $ac_status" >&5
+   echo "$as_me:10213: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -10304,11 +10311,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:10307: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:10314: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:10311: \$? = $ac_status" >&5
+   echo "$as_me:10318: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -10359,11 +10366,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:10362: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:10369: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:10366: \$? = $ac_status" >&5
+   echo "$as_me:10373: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -13162,7 +13169,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 13165 "configure"
+#line 13172 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -13258,7 +13265,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 13261 "configure"
+#line 13268 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H

diff --git a/configure.ac b/configure.ac
index 42cb1fcfb7cdd01a0d8da9c3b4507e8796083cab..471439e4380b1ce281b9eeab5d5dbe2a6321991f 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -162,10 +162,12 @@ ACX_CHECK_COMPILER_FLAG(xO4, [CFLAGS="$CFLAGS -xO4"])
 ACX_CHECK_COMPILER_FLAG(xtarget=generic, [CFLAGS="$CFLAGS -xtarget=generic"])
 
 # debug mode flags warnings
-AC_ARG_ENABLE(debug, AC_HELP_STRING([--enable-debug], [Enable debug warnings, asserts, makefile-dependencies]))
-debug_enabled="$enable_debug"
+AC_ARG_ENABLE(checking, AC_HELP_STRING([--enable-checking], [Enable warnings, asserts, makefile-dependencies]))
+AC_ARG_ENABLE(debug, AC_HELP_STRING([--enable-debug], [same as enable-checking]))
+if test "$enable_debug" = "yes"; then debug_enabled="$enable_debug"; 
+else debug_enabled="$enable_checking"; fi
 AC_SUBST(debug_enabled)
-case "$enable_debug" in
+case "$debug_enabled" in
         yes)
                ACX_CHECK_COMPILER_FLAG(W, [CFLAGS="$CFLAGS -W"])
                ACX_CHECK_COMPILER_FLAG(Wall, [CFLAGS="$CFLAGS -Wall"])

diff --git a/doc/Changelog b/doc/Changelog
index 02dfde6f3efce6a0438b08442042004b5d79d2fc..95bbefe436a65fbef044e8198514e38778dd0606 100644 (file)
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,6 +1,7 @@
 1 March 2010: Wouter
        - make install depends on make all.
        - Fix 5011 auto-trust-anchor-file initial read to skip RRSIGs.
+       - --enable-checking: enables assertions but does not look nonproduction.
 
 26 February 2010: Wouter
        - Fixup prototype for lexer cleanup in daemon code.

diff --git a/doc/README b/doc/README
index a111838e417165a1f72fa85677c0a9f6a6552165..d044307d59ccbadd9e6a3a20de7665898869ae80 100644 (file)
--- a/doc/README
+++ b/doc/README
@@ -32,6 +32,10 @@ This software is under BSD license, see LICENSE for details.
        This disables pthreads. Without this option the pthreads library 
        is detected automatically. Use this option to disable threading
        altogether, or, on Solaris, also use --with(out)-solaris-threads.
+  * --enable-checking
+       This enables assertions in the code that guard against a variety of
+       programming errors, among which buffer overflows.  The program exits
+       with an error if an assertion fails (but the buffer did not overflow).
   * --enable-static-exe
        This enables a debug option to statically link, against ldns and 
        libevent libraries.