Updated Bulgarian translation by Alexander Shopov <ash@contact.bg>

[~andy/gtk] / configure.in

diff --git a/configure.in b/configure.in
index fa65ed34c5d6b9bd59ccacc59ffb420d8578e62f..d8308f09f73599e37fea3837a06dc08f06e477d5 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], [10])
-m4_define([gtk_micro_version], [1])
+m4_define([gtk_micro_version], [2])
 m4_define([gtk_version],
           [gtk_major_version.gtk_minor_version.gtk_micro_version])
-m4_define([gtk_interface_age], [1])
+m4_define([gtk_interface_age], [2])
 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
@@ -32,7 +32,7 @@ m4_define([gtk_binary_version], [2.10.0])
 
 # required versions of other packages
 m4_define([glib_required_version], [2.12.0])
-m4_define([pango_required_version], [1.13.0])
+m4_define([pango_required_version], [1.12.0])
 m4_define([atk_required_version], [1.9.0])
 m4_define([cairo_required_version], [1.2.0])
 
@@ -1092,8 +1092,8 @@ if test "x$gdktarget" = "xx11"; then
   if $PKG_CONFIG --exists x11 xext xrender; then
     have_base_x_pc=true
     X_PACKAGES="$X_PACKAGES x11 xext xrender"
-    x_libs="`pkg-config --libs x11 xext xrender`"
-    X_CFLAGS="`pkg-config --cflags x11 xext xrender`"
+    x_libs="`$PKG_CONFIG --libs x11 xext xrender`"
+    X_CFLAGS="`$PKG_CONFIG --cflags x11 xext xrender`"
     
     # Strip out any .la files that pkg-config might give us (this happens
     # with -uninstalled.pc files)
@@ -1192,12 +1192,16 @@ if test "x$gdktarget" = "xx11"; then
       AC_DEFINE(HAVE_SHAPE_EXT))
 
   # X SYNC check
+  gtk_save_CFLAGS="$CFLAGS"
+  CFLAGS="$CFLAGS $x_cflags"
   
   AC_CHECK_FUNC(XSyncQueryExtension,
       [AC_CHECK_HEADER(X11/extensions/sync.h,
          AC_DEFINE(HAVE_XSYNC, 1, Have the SYNC extension library),
          :, [#include <X11/Xlib.h>])])
 
+  CFLAGS="$gtk_save_CFLAGS"
+
   # Xshm checks
 
   if test "x$enable_shm" = "xyes"; then
@@ -1411,8 +1415,8 @@ if test "x$gdktarget" = "xdirectfb"; then
 
   if $PKG_CONFIG --atleast-version $DIRECTFB_REQUIRED_VERSION directfb ; then
       AC_MSG_RESULT(found)
-      GDK_EXTRA_CFLAGS="`$PKG_CONFIG --cflags directfb` $GDK_EXTRA_CFLAGS"
-      GDK_EXTRA_LIBS="`$PKG_CONFIG --libs directfb` $GDK_EXTRA_LIBS"
+      GDK_EXTRA_CFLAGS="`$PKG_CONFIG --cflags cairo-directfb` $GDK_EXTRA_CFLAGS"
+      GDK_EXTRA_LIBS="`$PKG_CONFIG --libs cairo-directfb` $GDK_EXTRA_LIBS"
   else
       AC_MSG_ERROR([
 *** DirectFB $DIRECTFB_REQUIRED_VERSION or newer is required. The latest