# HG changeset patch # User Christian Brabandt # Date 1441823405 -7200 # Node ID 793ca14b5654f8938fd2c4ac4628844669c7202e # Parent f717d96a39b36d3090ed370d5be41013cff757ae commit https://github.com/vim/vim/commit/5325b9bbae8a717510ef7248f3ce8b50281bd33f Author: Bram Moolenaar Date: Wed Sep 9 20:27:02 2015 +0200 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 --- 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 --- 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 ], [ 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 --- 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,