diff options
| author | Bram Moolenaar <Bram@vim.org> | 2015-09-09 20:27:02 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2015-09-09 20:27:02 +0200 |
| commit | 5325b9bbae8a717510ef7248f3ce8b50281bd33f (patch) | |
| tree | 73fd8884559ed579187ea0f6519a064795f4365f | |
| parent | 12969c04fe7bd27dc0cbf37709eb40a86d4a27f9 (diff) | |
patch 7.4.862v7.4.862
Problem: Still problems with pango_shape_full() not available.
Solution: Change AC_TRY_COMPILE to AC_TRY_LINK.
| -rwxr-xr-x | src/auto/configure | 5 | ||||
| -rw-r--r-- | src/configure.in | 2 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 6 insertions, 3 deletions
diff --git a/src/auto/configure b/src/auto/configure index 3bd5685f58..f2f34d90c6 100755 --- 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 f17fcb9aa4..e558186adf 100644 --- 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 78d061c8dc..9044ca2215 100644 --- a/src/version.c +++ b/src/version.c @@ -742,6 +742,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 862, +/**/ 861, /**/ 860, |