Added gettext-10.35

[~andy/gtk] / configure.in

diff --git a/configure.in b/configure.in
index a2870a575f9d2d2167f0832846c8a58637eced06..a10471e40c11598202c62a7a0ef751946fd4f2ff 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -14,7 +14,7 @@ cflags_set=${CFLAGS+set}
 #
 GTK_MAJOR_VERSION=1
 GTK_MINOR_VERSION=1
-GTK_MICRO_VERSION=6
+GTK_MICRO_VERSION=7
 GTK_INTERFACE_AGE=0
 GTK_BINARY_AGE=0
 GTK_VERSION=$GTK_MAJOR_VERSION.$GTK_MINOR_VERSION.$GTK_MICRO_VERSION
@@ -63,7 +63,7 @@ AC_ARG_ENABLE(ansi, [  --enable-ansi           turn on strict ansi [default=no]]
                    , enable_ansi=no)
 AC_ARG_WITH(glib, [  --with-glib=DIR         Use uninstalled copy of glib])
 AC_ARG_ENABLE(xim, [  --enable-xim            support XIM [default=yes]],
-                       echo $enable_xim, enable_xim="yes")
+                       , enable_xim="yes")
 AC_ARG_WITH(locale, [  --with-locale=LOCALE    locale name you want to use ])
 
 AC_ARG_WITH(xinput, [  --with-xinput=[no/gxi/xfree] support XInput ])
@@ -129,6 +129,10 @@ if test -n "$PERL" && perl -v | grep 'version 5.' > /dev/null ; then
 fi
 AC_SUBST(REBUILD)
 
+# i18n stuff
+ALL_LINGUAS="de"
+AM_GNU_GETTEXT
+
 dnl The DU4 header files don't provide library prototypes unless 
 dnl -std1 is given to the native cc.
 AC_MSG_CHECKING([for extra flags to get ANSI library prototypes])
@@ -163,10 +167,6 @@ AC_TRY_COMPILE([#include <dirent.h>], [DIR *dir;],
     CFLAGS=$gtk_save_CFLAGS
     AC_MSG_WARN([Could not determine POSIX flag. (-posix didn't work.)])))
 
-if test "x$enable_xim" = "xyes"; then
-  GTK_XIM_FLAGS="-DUSE_XIM"
-fi
-
 if test x$with_glib = xyes ; then
   AC_MSG_ERROR([
 *** Directory must be specified for --with-glib])
@@ -177,7 +177,7 @@ if test x$with_glib = x ; then
 
   AM_PATH_GLIB(1.1.6,,
     AC_MSG_ERROR([
-*** GLIB 1.1.5 or better is required. The latest version of GLIB
+*** GLIB 1.1.6 or better is required. The latest version of GLIB
 *** is always available from ftp://ftp.gtk.org.]),
     gmodule)
 
@@ -273,6 +273,17 @@ AC_CHECK_LIB(X11, XConvertCase,
       ,
       $x_libs)
 
+# Check for XIM support.
+
+AC_CHECK_LIB(X11, XUnregisterIMInstantiateCallback,
+           : ,
+           enable_xim=no,
+           $x_libs)
+
+if test "x$enable_xim" = "xyes"; then
+  GTK_XIM_FLAGS="-DUSE_XIM"
+fi
+
 x_cflags="$X_CFLAGS"
 x_ldflags="$X_LDFLAGS $X_LIBS"
 
@@ -501,6 +512,8 @@ AC_SUBST(GTK_THREAD_FLAGS)
 AC_OUTPUT([
 Makefile
 gtk-config
+intl/Makefile
+po/Makefile.in
 docs/Makefile
 gdk/Makefile
 gtk/Makefile