Disable asserts in non-debug builds

Enable both debug and non-debug builds on travis.

Closes #3972
Closes https://github.com/postgis/postgis/pull/185

git-svn-id: http://svn.osgeo.org/postgis/trunk@16223 b70326c6-7e19-0410-871a-916f4a2858ee

diff --git a/.travis.yml b/.travis.yml
index 761355510b9f276e37082438dc7ec442a344e130..1dadf3c3cf2be274827fdef81b1f16304a5ee998 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,7 +5,7 @@ env:
     - CFLAGS="-g -Og" MATRIX_EVAL="touch check-no-trailing-blanks"
     - CFLAGS="-g -O2 -fstack-protector -Wformat -Werror=format-security" LDFLAGS="-Wl,-Bsymbolic-functions -Wl,-z,relro"
     - CFLAGS="-g -O3 -mtune=generic -fno-omit-frame-pointer -Werror"
-    - CFLAGS="-g -O0 --coverage -fprofile-arcs -ftest-coverage" LDFLAGS="--coverage -fprofile-arcs -ftest-coverage"
+    - CFLAGS="-g -O0 --coverage -fprofile-arcs -ftest-coverage" LDFLAGS="--coverage -fprofile-arcs -ftest-coverage" CONFIGURE_FLAGS="--enable-debug"
 
 addons:
   postgresql: "9.6"
@@ -55,7 +55,7 @@ cache:
     - /home/travis/deb
 
 script:
-  - ./configure CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" || cat config.log
+  - ./configure CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" $CONFIGURE_FLAGS || cat config.log
   - make -j
   - chmod 755 /home/travis
   - logbt -- make check

diff --git a/configure.ac b/configure.ac
index 872354a985df21bf6793b2f48732992774304eb7..1a0483f85db0b3207cd1c9a3a909c79681908247 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1043,10 +1043,11 @@ AC_ARG_ENABLE([debug], AC_HELP_STRING([--enable-debug], [Enable debugging code a
        [ENABLE_DEBUG=1], [ENABLE_DEBUG=0])
 
 if test $ENABLE_DEBUG -eq 1; then
-    AC_DEFINE_UNQUOTED([PARANOIA_LEVEL], [10], [Enable use of memory checks])
+    AC_DEFINE([PARANOIA_LEVEL], [10], [Enable use of memory checks])
     CFLAGS="$CFLAGS -g"
 else
-    AC_DEFINE_UNQUOTED([PARANOIA_LEVEL], [0], [Disable use of memory checks])
+    AC_DEFINE([PARANOIA_LEVEL], [0], [Disable use of memory checks])
+    AC_DEFINE([NDEBUG], [0], [Disable C asserts])
 fi