Commit 68269a3f authored by Owen Taylor's avatar Owen Taylor

Configure changes:

  Change test ! `...` to test -z `...`
    (Harald Meland <Harald.Meland@usit.uio.no>)
  Change $gtk_cv_x_locale to $need_x_locale so it isn't cached.
  With --enable_debug, don't touch CFLAGS if they're already set.

                              - owt (OK, which platform does this break?)
--------------------------------------------------------------------
parent 244e4fe4
Tue Dec 9 Owen Taylor <owt1@cornell.edu>
* configure changes: (configure.in, glib/configure.in)
Change test ! `...` to test -z `...`
(Harald Meland <Harald.Meland@usit.uio.no>)
Change $gtk_cv_x_locale to $need_x_locale so it isn't cached.
With --enable_debug, don't touch CFLAGS if they're already set.
Tue Dec 9 Owen Taylor <owt1@cornell.edu>
* gdk/gdkpixmap.c: don't use gdk_black/white for pixmap mask.
From Patrice Fortier <Patrice.Fortier@aquarel.fr>
Mon Dec 8 Owen Taylor <owt1@cornell.edu>
* gtk/testselection.c (selection_received): foreward -> forward.
* gtk/gtktext.c (gtk_text_forward_delete): Renamed; changed all
......
Tue Dec 9 Owen Taylor <owt1@cornell.edu>
* configure changes: (configure.in, glib/configure.in)
Change test ! `...` to test -z `...`
(Harald Meland <Harald.Meland@usit.uio.no>)
Change $gtk_cv_x_locale to $need_x_locale so it isn't cached.
With --enable_debug, don't touch CFLAGS if they're already set.
Tue Dec 9 Owen Taylor <owt1@cornell.edu>
* gdk/gdkpixmap.c: don't use gdk_black/white for pixmap mask.
From Patrice Fortier <Patrice.Fortier@aquarel.fr>
Mon Dec 8 Owen Taylor <owt1@cornell.edu>
* gtk/testselection.c (selection_received): foreward -> forward.
* gtk/gtktext.c (gtk_text_forward_delete): Renamed; changed all
......
Tue Dec 9 Owen Taylor <owt1@cornell.edu>
* configure changes: (configure.in, glib/configure.in)
Change test ! `...` to test -z `...`
(Harald Meland <Harald.Meland@usit.uio.no>)
Change $gtk_cv_x_locale to $need_x_locale so it isn't cached.
With --enable_debug, don't touch CFLAGS if they're already set.
Tue Dec 9 Owen Taylor <owt1@cornell.edu>
* gdk/gdkpixmap.c: don't use gdk_black/white for pixmap mask.
From Patrice Fortier <Patrice.Fortier@aquarel.fr>
Mon Dec 8 Owen Taylor <owt1@cornell.edu>
* gtk/testselection.c (selection_received): foreward -> forward.
* gtk/gtktext.c (gtk_text_forward_delete): Renamed; changed all
......
Tue Dec 9 Owen Taylor <owt1@cornell.edu>
* configure changes: (configure.in, glib/configure.in)
Change test ! `...` to test -z `...`
(Harald Meland <Harald.Meland@usit.uio.no>)
Change $gtk_cv_x_locale to $need_x_locale so it isn't cached.
With --enable_debug, don't touch CFLAGS if they're already set.
Tue Dec 9 Owen Taylor <owt1@cornell.edu>
* gdk/gdkpixmap.c: don't use gdk_black/white for pixmap mask.
From Patrice Fortier <Patrice.Fortier@aquarel.fr>
Mon Dec 8 Owen Taylor <owt1@cornell.edu>
* gtk/testselection.c (selection_received): foreward -> forward.
* gtk/gtktext.c (gtk_text_forward_delete): Renamed; changed all
......
Tue Dec 9 Owen Taylor <owt1@cornell.edu>
* configure changes: (configure.in, glib/configure.in)
Change test ! `...` to test -z `...`
(Harald Meland <Harald.Meland@usit.uio.no>)
Change $gtk_cv_x_locale to $need_x_locale so it isn't cached.
With --enable_debug, don't touch CFLAGS if they're already set.
Tue Dec 9 Owen Taylor <owt1@cornell.edu>
* gdk/gdkpixmap.c: don't use gdk_black/white for pixmap mask.
From Patrice Fortier <Patrice.Fortier@aquarel.fr>
Mon Dec 8 Owen Taylor <owt1@cornell.edu>
* gtk/testselection.c (selection_received): foreward -> forward.
* gtk/gtktext.c (gtk_text_forward_delete): Renamed; changed all
......
Tue Dec 9 Owen Taylor <owt1@cornell.edu>
* configure changes: (configure.in, glib/configure.in)
Change test ! `...` to test -z `...`
(Harald Meland <Harald.Meland@usit.uio.no>)
Change $gtk_cv_x_locale to $need_x_locale so it isn't cached.
With --enable_debug, don't touch CFLAGS if they're already set.
Tue Dec 9 Owen Taylor <owt1@cornell.edu>
* gdk/gdkpixmap.c: don't use gdk_black/white for pixmap mask.
From Patrice Fortier <Patrice.Fortier@aquarel.fr>
Mon Dec 8 Owen Taylor <owt1@cornell.edu>
* gtk/testselection.c (selection_received): foreward -> forward.
* gtk/gtktext.c (gtk_text_forward_delete): Renamed; changed all
......
Tue Dec 9 Owen Taylor <owt1@cornell.edu>
* configure changes: (configure.in, glib/configure.in)
Change test ! `...` to test -z `...`
(Harald Meland <Harald.Meland@usit.uio.no>)
Change $gtk_cv_x_locale to $need_x_locale so it isn't cached.
With --enable_debug, don't touch CFLAGS if they're already set.
Tue Dec 9 Owen Taylor <owt1@cornell.edu>
* gdk/gdkpixmap.c: don't use gdk_black/white for pixmap mask.
From Patrice Fortier <Patrice.Fortier@aquarel.fr>
Mon Dec 8 Owen Taylor <owt1@cornell.edu>
* gtk/testselection.c (selection_received): foreward -> forward.
* gtk/gtktext.c (gtk_text_forward_delete): Renamed; changed all
......
......@@ -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
......
......@@ -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
......
......@@ -1297,7 +1297,7 @@ fi
if test -n "$DEBUGFLAG"; then
CFLAGS="$DEBUGFLAG"
test "${CFLAGS+set}" = set || CFLAGS="$DEBUGFLAG"
fi
# Checks for programs.
......@@ -1594,16 +1594,16 @@ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
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
......
......@@ -24,7 +24,7 @@ AC_ARG_ENABLE(ansi, [ --enable-ansi turn on strict ansi [default=no]]
, enable_ansi=no)
if test -n "$DEBUGFLAG"; then
CFLAGS="$DEBUGFLAG"
test "${CFLAGS+set}" = set || CFLAGS="$DEBUGFLAG"
fi
# Checks for programs.
......@@ -33,16 +33,16 @@ AM_PROG_CC_STDC
AC_PROG_INSTALL
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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment