Mercurial > vim
comparison src/configure.in @ 6282:0446fa17bd95 v7.4.475
updated for version 7.4.475
Problem: Can't compile on a system where Xutf8SetWMProperties() is not in
the X11 library. Issue 265.
Solution: Add a configure check.
author | Bram Moolenaar <bram@vim.org> |
---|---|
date | Sat, 11 Oct 2014 14:47:26 +0200 |
parents | de35e123e63c |
children | 3421b24e419c |
comparison
equal
deleted
inserted
replaced
6281:85a681178c6d | 6282:0446fa17bd95 |
---|---|
3728 | 3728 |
3729 | 3729 |
3730 dnl Check for multibyte locale functions | 3730 dnl Check for multibyte locale functions |
3731 dnl Find out if _Xsetlocale() is supported by libX11. | 3731 dnl Find out if _Xsetlocale() is supported by libX11. |
3732 dnl Check if X_LOCALE should be defined. | 3732 dnl Check if X_LOCALE should be defined. |
3733 | 3733 if test "x$with_x" = "xyes"; then |
3734 if test "$enable_multibyte" = "yes"; then | |
3735 cflags_save=$CFLAGS | 3734 cflags_save=$CFLAGS |
3736 ldflags_save=$LDFLAGS | 3735 libs_save=$LIBS |
3737 if test "x$x_includes" != "xNONE" ; then | 3736 LIBS="$LIBS $X_LIBS $GUI_LIB_LOC $GUI_X_LIBS $X_PRE_LIBS $X_LIB $X_EXTRA_LIBS" |
3738 CFLAGS="$CFLAGS -I$x_includes" | 3737 CFLAGS="$CFLAGS $X_CFLAGS" |
3739 LDFLAGS="$X_LIBS $LDFLAGS -lX11" | 3738 |
3740 AC_MSG_CHECKING(whether X_LOCALE needed) | 3739 AC_MSG_CHECKING(whether X_LOCALE needed) |
3741 AC_TRY_COMPILE([#include <X11/Xlocale.h>],, | 3740 AC_TRY_COMPILE([#include <X11/Xlocale.h>],, |
3742 AC_TRY_LINK_FUNC([_Xsetlocale], [AC_MSG_RESULT(yes) | 3741 AC_TRY_LINK_FUNC([_Xsetlocale], [AC_MSG_RESULT(yes) |
3743 AC_DEFINE(X_LOCALE)], AC_MSG_RESULT(no)), | 3742 AC_DEFINE(X_LOCALE)], AC_MSG_RESULT(no)), |
3744 AC_MSG_RESULT(no)) | 3743 AC_MSG_RESULT(no)) |
3745 fi | 3744 |
3745 AC_MSG_CHECKING(whether Xutf8SetWMProperties() can be used) | |
3746 AC_TRY_LINK_FUNC([Xutf8SetWMProperties], [AC_MSG_RESULT(yes) | |
3747 AC_DEFINE(HAVE_XUTF8SETWMPROPERTIES)], AC_MSG_RESULT(no)) | |
3748 | |
3746 CFLAGS=$cflags_save | 3749 CFLAGS=$cflags_save |
3747 LDFLAGS=$ldflags_save | 3750 LIBS=$libs_save |
3748 fi | 3751 fi |
3749 | 3752 |
3750 dnl Link with xpg4, it is said to make Korean locale working | 3753 dnl Link with xpg4, it is said to make Korean locale working |
3751 AC_CHECK_LIB(xpg4, _xpg4_setrunelocale, [LIBS="$LIBS -lxpg4"],,) | 3754 AC_CHECK_LIB(xpg4, _xpg4_setrunelocale, [LIBS="$LIBS -lxpg4"],,) |
3752 | 3755 |