aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-23 03:43:49 -04:00
Code Activity

patch 7.4.862

Browse Source 
Problem:    Still problems with pango_shape_full() not available.
Solution:   Change AC_TRY_COMPILE to AC_TRY_LINK.
This commit is contained in:
Bram Moolenaar
2015-09-09 20:27:02 +02:00
parent 12969c04fe
commit 5325b9bbae
3 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/auto/configure vendored
View File

@@ -12199,7 +12199,7 @@ main ()
return 0; return 0;
} }
_ACEOF _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 "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }; $as_echo "#define HAVE_PANGO_SHAPE_FULL 1" >>confdefs.h $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 "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; } $as_echo "no" >&6; }
fi 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" CFLAGS="$ac_save_CFLAGS"
LIBS="$ac_save_LIBS" LIBS="$ac_save_LIBS"
fi fi

2
src/configure.in
View File

@@ -3546,7 +3546,7 @@ if test "x$GTK_CFLAGS" != "x"; then
ac_save_LIBS="$LIBS" ac_save_LIBS="$LIBS"
CFLAGS="$CFLAGS $GTK_CFLAGS" CFLAGS="$CFLAGS $GTK_CFLAGS"
LIBS="$LIBS $GTK_LIBS" LIBS="$LIBS $GTK_LIBS"
AC_TRY_COMPILE( AC_TRY_LINK(
[#include <gtk/gtk.h>], [#include <gtk/gtk.h>],
[ pango_shape_full(NULL, 0, NULL, 0, NULL, NULL); ], [ pango_shape_full(NULL, 0, NULL, 0, NULL, NULL); ],
AC_MSG_RESULT(yes); AC_DEFINE(HAVE_PANGO_SHAPE_FULL), AC_MSG_RESULT(yes); AC_DEFINE(HAVE_PANGO_SHAPE_FULL),

2
src/version.c
View File

@@ -741,6 +741,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
862,
/**/ /**/
861, 861,
/**/ /**/