Configure changes:

[~andy/gtk] / configure

diff --git a/configure b/configure
index 2b3471fe0146747552aa80bbc4370ba421c233a9..f8a043bb1349b8ece55441872b606a8374694230 100755 (executable)
--- a/configure
+++ b/configure
@@ -1339,7 +1339,7 @@ fi
 
 
 if test -n "$DEBUGFLAG"; then
-  CFLAGS="$DEBUGFLAG"
+  test "${CFLAGS+set}" = set || CFLAGS="$DEBUGFLAG"
 else
   CFLAGS="$CFLAGS -DNDEBUG"
 fi
@@ -1714,16 +1714,16 @@ fi
 
 
 if eval "test x$GCC = xyes"; then
-  if test ! `echo "$CFLAGS" | grep "\-Wall" 2> /dev/null` ; then
+  if test -z `echo "$CFLAGS" | grep "\-Wall" 2> /dev/null` ; then
     CFLAGS="$CFLAGS -Wall"
   fi
 
   if eval "test x$enable_ansi = xyes"; then
-    if test ! `echo "$CFLAGS" | grep "\-ansi" 2> /dev/null` ; then
+    if test -z `echo "$CFLAGS" | grep "\-ansi" 2> /dev/null` ; then
       CFLAGS="$CFLAGS -ansi"
     fi
 
-    if test ! `echo "$CFLAGS" | grep "\-pedantic" 2> /dev/null` ; then
+    if test -z `echo "$CFLAGS" | grep "\-pedantic" 2> /dev/null` ; then
       CFLAGS="$CFLAGS -pedantic"
     fi
   fi
@@ -3003,7 +3003,7 @@ else
 fi
 rm -f conftest*
    if test $gtk_ok = no; then
-       gtk_cv_x_locale=yes
+       need_x_locale=yes
    fi
 fi
    
@@ -3013,7 +3013,7 @@ echo "$ac_t""$gtk_ok" 1>&6
 
 echo $ac_n "checking need -DX_LOCALE""... $ac_c" 1>&6
 echo "configure:3016: checking need -DX_LOCALE" >&5
-if test x$gtk_cv_x_locale = xyes; then
+if test x$need_x_locale = xyes; then
   echo "$ac_t""yes (C library doesn't include wide string functions)" 1>&6
 else
   if test "$cross_compiling" = yes; then
@@ -3034,19 +3034,19 @@ else
 EOF
 if { (eval echo configure:3036: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
 then
-  gtk_cv_x_locale=no
+  need_x_locale=no
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -fr conftest*
-  gtk_cv_x_locale=yes
+  need_x_locale=yes
 fi
 rm -fr conftest*
 fi
 
-  echo "$ac_t""$gtk_cv_x_locale" 1>&6
+  echo "$ac_t""$need_x_locale" 1>&6
 fi
-if test $gtk_cv_x_locale = yes; then
+if test $need_x_locale = yes; then
   CFLAGS="$CFLAGS -DX_LOCALE"
 fi