Updated Korean translation.

[~andy/gtk] / configure.in

diff --git a/configure.in b/configure.in
index c2ff0af9cf334c545effcceafec64f32f5828b03..4c09d185185e947a3c4efbea4af77f886bfc28e9 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -12,10 +12,10 @@ AC_PREREQ(2.54)
 
 m4_define([gtk_major_version], [2])
 m4_define([gtk_minor_version], [8])
-m4_define([gtk_micro_version], [0])
+m4_define([gtk_micro_version], [1])
 m4_define([gtk_version],
           [gtk_major_version.gtk_minor_version.gtk_micro_version])
-m4_define([gtk_interface_age], [0])
+m4_define([gtk_interface_age], [1])
 m4_define([gtk_binary_age],
           [m4_eval(100 * gtk_minor_version + gtk_micro_version)])
 # This is the X.Y used in -lgtk-FOO-X.Y
@@ -1023,8 +1023,8 @@ AC_SUBST(GDK_PIXBUF_DEP_CFLAGS)
 GDK_PIXBUF_XLIB_PACKAGES=
 GDK_PIXBUF_XLIB_EXTRA_CFLAGS=
 GDK_PIXBUF_XLIB_EXTRA_LIBS=
-
-X_PACKAGES=
+       
+X_PACKAGES=fontconfig
 GDK_EXTRA_LIBS="$GDK_WLIBS"
 GDK_EXTRA_CFLAGS=
        
@@ -1033,12 +1033,21 @@ GTK_DEP_PACKAGES_FOR_X=
 GTK_DEP_LIBS_FOR_X=
 
 if test "x$gdktarget" = "xx11"; then
+  #
+  # We use fontconfig very peripherally when decoding the default
+  # settings.
+  #
+  if $PKG_CONFIG --exists fontconfig; then : ; else
+    AC_MSG_ERROR([
+*** fontconfig (http://www.fontconfig.org) is required by the X11 backend.])
+  fi
+
   #
   # Check for basic X packages; we use pkg-config if available
   #
   if $PKG_CONFIG --exists x11 xext; then
     have_base_x_pc=true
-    X_PACKAGES="x11 xext"
+    X_PACKAGES="$X_PACKAGES x11 xext"
     x_libs="`pkg-config --libs x11 xext`"
     
     # Strip out any .la files that pkg-config might give us (this happens
@@ -1285,10 +1294,10 @@ if test "x$gdktarget" = "xx11"; then
     X_PACKAGES="$X_PACKAGES xfixes"
   fi
 
-  if $have_base_pc ; then
+  if $have_base_x_pc ; then
     GDK_EXTRA_LIBS="$x_extra_libs"
   else
-    GDK_EXTRA_LIBS="$X_LIBS $x_extra_libs -lX11 $GDK_EXTRA_LIBS"
+    GDK_EXTRA_LIBS="$X_LIBS $x_extra_libs -lXext -lX11 $GDK_EXTRA_LIBS"
   fi
 
   CPPFLAGS="$gtk_save_cppflags"