More fixes for warnings reported by David L. Cooper II

[~andy/gtk] / configure.in

diff --git a/configure.in b/configure.in
index ff0dcaca536dd7a8a437ec54b20a3403b16d0392..4dc3754e351334e3ac076d8c7134fccc6fc3bb26 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -180,8 +180,6 @@ AC_ARG_ENABLE(ansi, [  --enable-ansi           turn on strict ansi [default=no]]
                    , enable_ansi=no)
 AC_ARG_ENABLE(xim, [  --enable-xim            support XIM [default=yes]],
                        , enable_xim="yes")
-AC_ARG_ENABLE(xim_inst, [  --disable-xim-inst      does not use xim instantiate callback],
-                       , enable_xim_inst="maybe")
 AC_ARG_ENABLE(xkb, [  --enable-xkb            support XKB [default=maybe]],
                        , enable_xkb="maybe")
 AC_ARG_ENABLE(rebuilds, [  --disable-rebuilds      disable all source autogeneration rules],,enable_rebuilds=yes)
@@ -363,7 +361,7 @@ AC_SUBST(STRIP_BEGIN)
 AC_SUBST(STRIP_END)
 
 # i18n stuff
-ALL_LINGUAS="az ca cs cy da de el en_GB en@IPA es et eu fa fi fr ga gl he hr hu ia it ja ko lt ms nl nn no pl pt pt_BR ro ru sk sl sp sr sv tr uk vi wa zh_TW zh_CN"
+ALL_LINGUAS="az bg ca cs cy da de el en_GB en@IPA es et eu fa fi fr ga gl he hi hr hu ia it ja ko lt ms nl nn no pl pt pt_BR ro ru sk sl sp sr sv tr uk vi wa zh_TW zh_CN"
 AM_GLIB_GNU_GETTEXT
 LIBS="$LIBS $INTLLIBS"
 
@@ -791,7 +789,7 @@ INCLUDED_LOADER_DEFINE=
 
 IFS="${IFS=    }"; gtk_save_ifs="$IFS"; IFS=","
 for loader in $included_loaders; do
- if echo "$all_loaders" | grep "\(^\|\,\)$loader\(\$\|\,\)" > /dev/null; then
+ if echo "$all_loaders" | egrep "(^|,)$loader(\$|,)" > /dev/null; then
    :
  else
    AC_MSG_ERROR([the specified loader $loader does not exist])
@@ -814,13 +812,13 @@ AM_CONDITIONAL(HAVE_JPEG, test "x$LIBJPEG" != x)
 
 if $dynworks ; then
   STATIC_LIB_DEPS=
-  if echo "$included_loaders" | grep "\(^\|\,\)tiff\(\$\|\,\)" > /dev/null; then
+  if echo "$included_loaders" | egrep '(^|,)tiff($|,)' > /dev/null; then
     STATIC_LIB_DEPS="$STATIC_LIB_DEPS $LIBTIFF"
   fi
-  if echo "$included_loaders" | grep "\(^\|\,\)jpeg\(\$\|\,\)" > /dev/null; then
+  if echo "$included_loaders" | egrep '(^|,)jpeg($|,)' > /dev/null; then
     STATIC_LIB_DEPS="$STATIC_LIB_DEPS $LIBJPEG"
   fi
-  if echo "$included_loaders" | grep "\(^\|\,\)png\(\$\|\,\)" > /dev/null; then
+  if echo "$included_loaders" | egrep '(^|,)png($|,)' > /dev/null; then
     STATIC_LIB_DEPS="$STATIC_LIB_DEPS $LIBPNG"
   fi
 else
@@ -960,6 +958,10 @@ if test "x$gdktarget" = "xx11"; then
 
   AM_CONDITIONAL(HAVE_XFT, $have_xft)
 
+  if $PKG_CONFIG --exists xft ; then
+    AC_DEFINE(HAVE_XFT2, 1, [Define if we have Xft, version 2])
+  fi
+
   #
   # If Pango included the shared library dependencies from X11 in
   # the pkg-config output, then we use that (to avoid duplicates).
@@ -967,7 +969,7 @@ if test "x$gdktarget" = "xx11"; then
   # then we need to repeat the checks.
   #
   x_libs="`$PKG_CONFIG --libs $PANGO_PACKAGES`"
-  case x_libs in
+  case "$x_libs" in
     *-lX11*) pango_omitted_x_deps=no ;;
     *)       pango_omitted_x_deps=yes ;;
   esac
@@ -990,7 +992,7 @@ if test "x$gdktarget" = "xx11"; then
     if test $have_xft = true ; then
       have_xft=false
 
-      if $PKG_CONFIG --exists xft ; then
+      if pkg-config --exists pangoxft '>=' 1.1.0 ; then
         x_libs="`pkg-config --libs xft` -lX11 $FREETYPE_LIBS $X_EXTRA_LIBS"
         have_xft=true
       else
@@ -1110,31 +1112,8 @@ if test "x$gdktarget" = "xx11"; then
 
   # Check for XIM support.
 
-  AC_CHECK_LIB(X11, XUnregisterIMInstantiateCallback,
-           : ,
-           enable_xim_inst="no",
-           $x_libs_for_checks)
-
-  # On Solaris, calling XRegisterIMInstantiateCallback seems to
-  # cause an immediate segfault, so we disable it, unless
-  # the user specifically forces it to be on.
-
-  if test x$enable_xim_inst = xmaybe ; then
-    case host in
-         *-*-solaris*)
-            enable_xim_inst="no"
-            ;;
-         *)
-           enable_xim_inst="yes"
-           ;;
-    esac
-  fi
-
   if test "x$enable_xim" = "xyes"; then
     GTK_XIM_FLAGS="-DUSE_XIM"
-    if test "x$enable_xim_inst" = "xyes"; then
-      AC_DEFINE(USE_X11R6_XIM)
-    fi
   fi
 
   # Check for XKB support.
@@ -1244,7 +1223,7 @@ if test "x$gdktarget" = "xlinux-fb"; then
   fi
 
   ft2_libs="`$PKG_CONFIG --libs pangoft2`"
-  case ft2_libs in
+  case "$ft2_libs" in
     *-lfreetype*) pango_omitted_ft2_deps=no ;;
     *)            pango_omitted_ft2_deps=yes ;;
   esac