Try and spell my own name right - Tony

[~andy/gtk] / configure.in

diff --git a/configure.in b/configure.in
index 871fe0cb0f7cd25fb5354a2a4453a18d54683650..589a55a9450ba305bcc55b6571e27edf96de17fc 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -14,8 +14,8 @@ cflags_set=${CFLAGS+set}
 #
 GTK_MAJOR_VERSION=1
 GTK_MINOR_VERSION=1
-GTK_MICRO_VERSION=12
-GTK_INTERFACE_AGE=1
+GTK_MICRO_VERSION=14
+GTK_INTERFACE_AGE=0
 GTK_BINARY_AGE=1
 GTK_VERSION=$GTK_MAJOR_VERSION.$GTK_MINOR_VERSION.$GTK_MICRO_VERSION
 AC_SUBST(GTK_MAJOR_VERSION)
@@ -64,6 +64,8 @@ AC_ARG_ENABLE(ansi, [  --enable-ansi           turn on strict ansi [default=no]]
 AC_ARG_WITH(glib, [  --with-glib=DIR         Use uninstalled copy of glib])
 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_WITH(locale, [  --with-locale=LOCALE    locale name you want to use ])
 
 AC_ARG_WITH(xinput, [  --with-xinput=[no/gxi/xfree] support XInput ])
@@ -130,12 +132,16 @@ fi
 AC_SUBST(REBUILD)
 
 # i18n stuff
-ALL_LINGUAS="de fr nl pt ja sv pl no ko it cs"
+ALL_LINGUAS="cs de es fr it ja ko nl no pl pt ru sv"
 AM_GTK_GNU_GETTEXT
 AC_CHECK_FUNC(gettext,
        ,
        AC_CHECK_LIB(intl, gettext)
 )
+# AM_GTK_GNU_GETTEXT above substs $DATADIRNAME
+# this is the directory where the *.{mo,gmo} files are installed
+gtklocaledir='${prefix}/${DATADIRNAME}/locale'
+AC_SUBST(gtklocaledir)
 
 dnl The DU4 header files don't provide library prototypes unless 
 dnl -std1 is given to the native cc.
@@ -179,9 +185,9 @@ fi
 if test x$with_glib = x ; then 
   # Look for separately installed glib
 
-  AM_PATH_GLIB(1.1.12,,
+  AM_PATH_GLIB(1.1.14,,
     AC_MSG_ERROR([
-*** GLIB 1.1.12 or better is required. The latest version of GLIB
+*** GLIB 1.1.14 or better is required. The latest version of GLIB
 *** is always available from ftp://ftp.gtk.org.]),
     gmodule gthread)
 
@@ -189,6 +195,7 @@ if test x$with_glib = x ; then
   glib_cflags=`$GLIB_CONFIG glib gmodule --cflags`
   glib_libs=`$GLIB_CONFIG glib gmodule --libs`
   GLIB_LIBS="$glib_libs"
+  GLIB_DEPLIBS="$glib_libs"
 else
   # Use uninstalled glib (assume they got the version right)
 
@@ -215,8 +222,9 @@ else
       ;;
   esac
 
-  GLIB_CFLAGS="-I$glib_dir"
-  GLIB_LIBS=$glib_dir/libglib-$glib_release.la
+  GLIB_CFLAGS="-I$glib_dir -I$glib_dir/gmodule"
+  GLIB_LIBS="$glib_dir/libglib.la $glib_dir/gmodule.la"
+  GLIB_DEPLIBS=
 
   AC_SUBST(GLIB_CFLAGS)
   AC_SUBST(GLIB_LIBS)
@@ -224,6 +232,7 @@ fi
 
 AC_SUBST(glib_cflags)
 AC_SUBST(glib_libs)
+AC_SUBST(GLIB_DEPLIBS)
 
 # Find the X11 include and library directories
 AC_PATH_X
@@ -283,11 +292,29 @@ AC_CHECK_LIB(X11, XConvertCase,
 
 AC_CHECK_LIB(X11, XUnregisterIMInstantiateCallback,
            : ,
-           enable_xim=no,
+           enable_xim_inst="no",
            $x_libs)
 
+# 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" = "xno"; then
+    AC_DEFINE(XIM_INST_IS_MISSING_OR_STRANGE)
+  fi
 fi
 
 x_cflags="$X_CFLAGS"