Don't override user-specified CFLAGS.
authorMiroslav Lichvar <mlichvar@redhat.com>
Mon, 3 Dec 2012 20:04:56 +0000 (21:04 +0100)
committerErik de Castro Lopo <erikd@mega-nerd.com>
Tue, 4 Dec 2012 06:44:42 +0000 (17:44 +1100)
configure.ac

index 2db9035..f4a31e4 100644 (file)
@@ -25,6 +25,8 @@ AC_CONFIG_MACRO_DIR([m4])
 AM_INIT_AUTOMAKE([foreign -Wall tar-pax no-dist-gzip dist-xz subdir-objects])
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
 
+user_cflags=$CFLAGS
+
 #Prefer whatever the current ISO standard is.
 AC_PROG_CC_STDC
 AC_USE_SYSTEM_EXTENSIONS
@@ -346,7 +348,9 @@ if test "x$debug" = xtrue; then
 else
        CPPFLAGS="-DNDEBUG $CPPFLAGS"
        if test "x$GCC" = xyes; then
-    CFLAGS="-O3 -funroll-loops -Wall -W -Winline $CFLAGS"
+               if test "x$user_cflags" = x; then
+                       CFLAGS="-O3 -funroll-loops -Wall -W -Winline"
+               fi
        fi
 fi