Update to changelog, to cover fix that previously slipped in.

[~andy/gtk] / configure.in

diff --git a/configure.in b/configure.in
index 608af04c6169912b858047bed9dc983c2be3390d..98c7e4edd22f9e9a3794f94cf2bd2c4973278456 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=7
+GTK_MICRO_VERSION=9
 GTK_INTERFACE_AGE=0
 GTK_BINARY_AGE=0
 GTK_VERSION=$GTK_MAJOR_VERSION.$GTK_MINOR_VERSION.$GTK_MICRO_VERSION
@@ -67,7 +67,6 @@ AC_ARG_ENABLE(xim, [  --enable-xim            support XIM [default=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 ])
-AC_ARG_WITH(threads, [  --with-threads=[posix] support threading ])
 
 if test "x$enable_debug" = "xyes"; then
   test "$cflags_set" = set || CFLAGS="$CFLAGS -g"
@@ -131,8 +130,8 @@ fi
 AC_SUBST(REBUILD)
 
 # i18n stuff
-ALL_LINGUAS="de pt"
-AM_GNU_GETTEXT
+ALL_LINGUAS="de fr nl pt ja sv pl"
+AM_GTK_GNU_GETTEXT
 AC_CHECK_FUNC(gettext,
        ,
        AC_CHECK_LIB(intl, gettext)
@@ -180,14 +179,16 @@ fi
 if test x$with_glib = x ; then 
   # Look for separately installed glib
 
-  AM_PATH_GLIB(1.1.6,,
+  AM_PATH_GLIB(1.1.9,,
     AC_MSG_ERROR([
-*** GLIB 1.1.6 or better is required. The latest version of GLIB
+*** GLIB 1.1.9 or better is required. The latest version of GLIB
 *** is always available from ftp://ftp.gtk.org.]),
     gmodule gthread)
 
-  glib_cflags=$GLIB_CFLAGS
-  glib_libs=$GLIB_LIBS
+  # we do not want to make all gtk progs to link to thread libraries.
+  glib_cflags=`$GLIB_CONFIG glib gmodule --cflags`
+  glib_libs=`$GLIB_CONFIG glib gmodule --libs`
+  GLIB_LIBS="$glib_libs"
 else
   # Use uninstalled glib (assume they got the version right)
 
@@ -199,8 +200,8 @@ else
   fi
 
   # For use in gtk-config
-  glib_cflags=`$GLIB_CONFIG --cflags`
-  glib_libs=`$GLIB_CONFIG --libs`
+  glib_cflags=`$GLIB_CONFIG --cflags gmodule`
+  glib_libs=`$GLIB_CONFIG --libs gmodule`
 
   glib_release=`$GLIB_CONFIG --version | sed 's%\\.[[0-9]]*$%%'`
 
@@ -445,12 +446,10 @@ AC_SUBST(GDK_WLIBS)
 AC_SUBST(GTK_DEBUG_FLAGS)
 AC_SUBST(GTK_XIM_FLAGS)
 AC_SUBST(GTK_LOCALE_FLAGS)
-AC_SUBST(GTK_THREAD_FLAGS)
 
 AC_OUTPUT([
 Makefile
 gtk-config
-intl/Makefile
 po/Makefile.in
 docs/Makefile
 gdk/Makefile