patch 7.4.862

Problem:    Still problems with pango_shape_full() not available.
Solution:   Change AC_TRY_COMPILE to AC_TRY_LINK.

diff --git a/src/auto/configure b/src/auto/configure
index 3bd5685f588b1126e3f07183bc0847a963ee045e..f2f34d90c6b2e69cede8da657fb890afac518ed8 100755 (executable)
--- a/src/auto/configure
+++ b/src/auto/configure
@@ -12199,7 +12199,7 @@ main ()
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"; then :
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }; $as_echo "#define HAVE_PANGO_SHAPE_FULL 1" >>confdefs.h
 
@@ -12207,7 +12207,8 @@ else
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
   CFLAGS="$ac_save_CFLAGS"
   LIBS="$ac_save_LIBS"
 fi

diff --git a/src/configure.in b/src/configure.in
index f17fcb9aa4581f9e2be910c9f6ab25e8a9ac5174..e558186adf21ef97fc026090eacffdcd4e38d19b 100644 (file)
--- a/src/configure.in
+++ b/src/configure.in
@@ -3546,7 +3546,7 @@ if test "x$GTK_CFLAGS" != "x"; then
   ac_save_LIBS="$LIBS"
   CFLAGS="$CFLAGS $GTK_CFLAGS"
   LIBS="$LIBS $GTK_LIBS"
-  AC_TRY_COMPILE(
+  AC_TRY_LINK(
   [#include <gtk/gtk.h>],
   [ pango_shape_full(NULL, 0, NULL, 0, NULL, NULL); ],
          AC_MSG_RESULT(yes); AC_DEFINE(HAVE_PANGO_SHAPE_FULL),

diff --git a/src/version.c b/src/version.c
index 78d061c8dc065743166b0872d21d473298526081..9044ca22158ed0d0b4f17faadc9474f4b04f2e79 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -741,6 +741,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    862,
 /**/
     861,
 /**/