bugfix #454: Only set -g and -O2 CFLAGS when no CFLAGS was given.

diff --git a/Changelog b/Changelog
index fcb4833effdc4c433e90422b954b434ac7d92c9c..bd90ff2e689111e9d41842a76362d8d5413ff350 100644 (file)
--- a/Changelog
+++ b/Changelog
@@ -1,7 +1,7 @@
 1.6.14
        * bugfix #459: Export only symbols defined in ldns_symbols
        * bugfix #458: Track all newly created signatures when signing.
-       * bugfix #454: Don't set -g and -O2 CFLAGS from configure.
+       * bugfix #454: Only set -g and -O2 CFLAGS when no CFLAGS was given.
        * bugfix #457: Memroy leak fix for ldns_key_new_frm_algorithm.
        * pyldns memory handling fixes and the python3/ldns-signzone.py
          examples script contribution from Karel Slany.

diff --git a/configure.ac b/configure.ac
index 269105656c914dc2c1350dfaf3f6dee76406b42d..c142e4e8dfad360385d3c289e5025ea4d2140f01 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -63,6 +63,10 @@ COPY_FILES($srcdir/$1/*.h, $2)
 # Checks for typedefs, structures, and compiler characteristics.
 AC_C_CONST
 AC_LANG_C
+if test "x$CFLAGS" = "x" ; then
+ACX_CHECK_COMPILER_FLAG(g, [CFLAGS="-g"])
+ACX_CHECK_COMPILER_FLAG(O2, [CFLAGS="-O2 $CFLAGS"])
+fi
 ACX_CHECK_COMPILER_FLAG(Wall, [CFLAGS="-Wall $CFLAGS"])
 ACX_CHECK_COMPILER_FLAG(W, [CFLAGS="-W $CFLAGS"])
 ACX_CHECK_COMPILER_FLAG(Wwrite-strings, [CFLAGS="-Wwrite-strings $CFLAGS"])