Configure changes:

[~andy/gtk] / configure.in

diff --git a/configure.in b/configure.in
index 6221c494cdbcfb66c259a5f0235003378221ea09..9e789c533a5c349f1b2660b642da5236e03b4a00 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -33,7 +33,7 @@ AC_ARG_WITH(locale, [  --with-locale=LOCALE    locale name you want to use ])
 AC_ARG_WITH(xinput, [  --with-xinput[=no/gxi/xfree] support XInput ])
 
 if test -n "$DEBUGFLAG"; then
-  CFLAGS="$DEBUGFLAG"
+  test "${CFLAGS+set}" = set || CFLAGS="$DEBUGFLAG"
 else
   CFLAGS="$CFLAGS -DNDEBUG"
 fi
@@ -48,16 +48,16 @@ AC_PROG_INSTALL
 AC_PROG_MAKE_SET
 
 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
@@ -197,7 +197,7 @@ AC_TRY_CPP([#include <wchar.h>], gtk_ok=yes, gtk_ok=no)
 if test $gtk_ok = no; then
    AC_TRY_CPP([#include <wcstr.h>], gtk_ok=yes, gtk_ok=no)
    if test $gtk_ok = no; then
-       gtk_cv_x_locale=yes
+       need_x_locale=yes
    fi
 fi
    
@@ -206,7 +206,7 @@ AC_MSG_RESULT($gtk_ok)
 # Check if X_LOCALE definition is necessary
 
 AC_MSG_CHECKING(need -DX_LOCALE)
-if test x$gtk_cv_x_locale = xyes; then
+if test x$need_x_locale = xyes; then
   AC_MSG_RESULT([yes (C library doesn't include wide string functions)])
 else
   AC_TRY_RUN([
@@ -218,11 +218,11 @@ else
   {
     return setlocale (LC_ALL, "${with_locale}") == NULL;
   }],
-  gtk_cv_x_locale=no,
-  gtk_cv_x_locale=yes)
-  AC_MSG_RESULT($gtk_cv_x_locale)
+  need_x_locale=no,
+  need_x_locale=yes)
+  AC_MSG_RESULT($need_x_locale)
 fi
-if test $gtk_cv_x_locale = yes; then
+if test $need_x_locale = yes; then
   CFLAGS="$CFLAGS -DX_LOCALE"
 fi