Fix CFLAGS manipulation

The code for ensuring that CFLAGS contain -g if
--enable-debug has been specified did not work right.

https://bugzilla.gnome.org/show_bug.cgi?id=685204
This commit is contained in:
Matthias Clasen 2014-01-20 08:16:09 -05:00
parent fc6d6b6e10
commit ff9a61eed9

View File

@ -61,7 +61,7 @@ AC_CONFIG_SRCDIR([glib/glib.h])
AC_CONFIG_MACRO_DIR([m4macros]) AC_CONFIG_MACRO_DIR([m4macros])
# Save this value here, since automake will set cflags later # Save this value here, since automake will set cflags later
cflags_set=${CFLAGS+set} cflags_set=${CFLAGS:+set}
AM_INIT_AUTOMAKE([1.11 -Wno-portability no-define no-dist-gzip dist-xz tar-ustar]) AM_INIT_AUTOMAKE([1.11 -Wno-portability no-define no-dist-gzip dist-xz tar-ustar])
AM_MAINTAINER_MODE([enable]) AM_MAINTAINER_MODE([enable])
@ -285,7 +285,7 @@ AC_SYS_LARGEFILE
PKG_PROG_PKG_CONFIG(0.16) PKG_PROG_PKG_CONFIG(0.16)
if test "x$enable_debug" = "xyes"; then if test "x$enable_debug" = "xyes"; then
if test x$cflags_set != xset ; then if test "x$cflags_set" != "x" ; then
case " $CFLAGS " in case " $CFLAGS " in
*[[\ \ ]]-g[[\ \ ]]*) ;; *[[\ \ ]]-g[[\ \ ]]*) ;;
*) CFLAGS="$CFLAGS -g" ;; *) CFLAGS="$CFLAGS -g" ;;