Fix highlighting of selection wrt. to empty lines. (#90435, #90582)

[~andy/gtk] / configure.in

diff --git a/configure.in b/configure.in
index b80fe270e0bf6277fad7f810ba76c327d2080752..991cb57a10160757820546d88b123c947c4a5535 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -31,10 +31,10 @@ GLIB_AC_DIVERT_BEFORE_HELP([
 # set GTK_BINARY_AGE and GTK_INTERFACE_AGE to 0.
 #
 GTK_MAJOR_VERSION=2
-GTK_MINOR_VERSION=1
-GTK_MICRO_VERSION=4
-GTK_INTERFACE_AGE=1
-GTK_BINARY_AGE=104
+GTK_MINOR_VERSION=2
+GTK_MICRO_VERSION=0
+GTK_INTERFACE_AGE=0
+GTK_BINARY_AGE=200
 GTK_VERSION=$GTK_MAJOR_VERSION.$GTK_MINOR_VERSION.$GTK_MICRO_VERSION
 dnl This is the X.Y used in -lgtk-FOO-X.Y
 GTK_API_VERSION=2.0
@@ -71,7 +71,7 @@ AC_SUBST(LT_CURRENT_MINUS_AGE)
 # locations. (Should this be backwards-compat instead?)
 #
 #GTK_BINARY_VERSION=$GTK_MAJOR_VERSION.$GTK_MINOR_VERSION.$LT_CURRENT
-GTK_BINARY_VERSION=$GTK_MAJOR_VERSION.0.$LT_CURRENT
+GTK_BINARY_VERSION=2.2.0
 AC_SUBST(GTK_BINARY_VERSION)
 
 #
@@ -945,8 +945,10 @@ if test "x$gdktarget" = "xlinux-fb" || test "x$gdktarget" = "xx11" ; then
     FREETYPE_CFLAGS=`$FREETYPE_CONFIG --cflags`
     FREETYPE_LIBS=`$FREETYPE_CONFIG --libs`
 
-    AC_CHECK_LIB(freetype, FT_New_Face, have_freetype=true
-                ,:,$FREETYPE_LIBS)
+    gtk_save_LIBS="$LIBS"
+    LIBS="$FREETYPE_LIBS $LIBS"
+    AC_TRY_LINK_FUNC(FT_New_Face, have_freetype=true,:)
+    LIBS="$gtk_save_LIBS"
 
     if $have_freetype ; then
       gtk_save_cppflags="$CPPFLAGS"
@@ -1352,9 +1354,12 @@ CFLAGS="$CFLAGS $PANGO_CFLAGS"
 if $PKG_CONFIG --uninstalled $PANGO_PACKAGES; then
         :
 else
-        AC_CHECK_LIB(pango-1.0, pango_context_new, :, AC_MSG_ERROR([
+       gtk_save_LIBS="$LIBS"
+        LIBS="$PANGO_LIBS $LIBS"
+        AC_TRY_LINK_FUNC(pango_context_new, :, AC_MSG_ERROR([
 *** Can't link to Pango. Pango is required to build
-*** GTK+. For more information see http://www.pango.org]), $PANGO_LIBS)
+*** GTK+. For more information see http://www.pango.org]))
+        LIBS="$gtk_save_LIBS"
 fi
 
 CFLAGS="$saved_cflags"
@@ -1400,9 +1405,12 @@ fi
 if $PKG_CONFIG --uninstalled $ATK_PACKAGES; then
         :
 else
-        AC_CHECK_LIB(atk-1.0, atk_object_get_type, : , AC_MSG_ERROR([
+       gtk_save_LIBS="$LIBS"
+        LIBS="$ATK_LIBS $LIBS"
+        AC_TRY_LINK_FUNC(atk_object_get_type, : , AC_MSG_ERROR([
                 *** Cannot link to Accessibility Toolkit. Accessibility Toolkit is required
-                *** to build GTK+]), $ATK_LIBS $GLIB_LIBS)
+                *** to build GTK+]))
+        LIBS="$gtk_save_LIBS"
 fi
 
 GTK_PACKAGES=atk