diff options
| author | Bram Moolenaar <Bram@vim.org> | 2013-11-17 20:32:54 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2013-11-17 20:32:54 +0100 |
| commit | 49b6a57d19e46258c2b4c7fb71a5e78f6a7840d1 (patch) | |
| tree | 34c152deb08c513b3fc8f90969f0f19322eb0b2c | |
| parent | 9421bdc2cd7cdcd801bcde4d41ea0a2c60b66199 (diff) | |
updated for version 7.4.094v7.4.094
Problem: Configure may not find that -lint is needed for gettext().
Solution: Check for gettext() with empty $LIBS. (Thomas De Schampheleire)
| -rwxr-xr-x | src/auto/configure | 10 | ||||
| -rw-r--r-- | src/configure.in | 13 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 17 insertions, 8 deletions
diff --git a/src/auto/configure b/src/auto/configure index 5a205966e5..472afcb425 100755 --- a/src/auto/configure +++ b/src/auto/configure @@ -12690,6 +12690,8 @@ $as_echo_n "checking for NLS... " >&6; } if test -f po/Makefile; then have_gettext="no" if test -n "$MSGFMT"; then + olibs=$LIBS + LIBS="" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <libintl.h> @@ -12703,10 +12705,9 @@ gettext("Test"); _ACEOF if ac_fn_c_try_link "$LINENO"; then : { $as_echo "$as_me:${as_lineno-$LINENO}: result: gettext() works" >&5 -$as_echo "gettext() works" >&6; }; have_gettext="yes" +$as_echo "gettext() works" >&6; }; have_gettext="yes"; LIBS=$olibs else - olibs=$LIBS - LIBS="$LIBS -lintl" + LIBS="-lintl" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <libintl.h> @@ -12720,7 +12721,8 @@ gettext("Test"); _ACEOF if ac_fn_c_try_link "$LINENO"; then : { $as_echo "$as_me:${as_lineno-$LINENO}: result: gettext() works with -lintl" >&5 -$as_echo "gettext() works with -lintl" >&6; }; have_gettext="yes" +$as_echo "gettext() works with -lintl" >&6; }; have_gettext="yes"; + LIBS="$olibs -lintl" else { $as_echo "$as_me:${as_lineno-$LINENO}: result: gettext() doesn't work" >&5 $as_echo "gettext() doesn't work" >&6; }; diff --git a/src/configure.in b/src/configure.in index 83d0ea880e..9af3f2475d 100644 --- a/src/configure.in +++ b/src/configure.in @@ -3725,6 +3725,9 @@ if test "$MANDEF" = "man -s"; then fi dnl Check if gettext() is working and if it needs -lintl +dnl We take care to base this on an empty LIBS: on some systems libelf would be +dnl in LIBS and implicitly take along libintl. The final LIBS would then not +dnl contain libintl, and the link step would fail due to -Wl,--as-needed. AC_MSG_CHECKING(--disable-nls argument) AC_ARG_ENABLE(nls, [ --disable-nls Don't support NLS (gettext()).], , @@ -3743,16 +3746,18 @@ if test "$enable_nls" = "yes"; then if test -f po/Makefile; then have_gettext="no" if test -n "$MSGFMT"; then + olibs=$LIBS + LIBS="" AC_TRY_LINK( [#include <libintl.h>], [gettext("Test");], - AC_MSG_RESULT([gettext() works]); have_gettext="yes", - olibs=$LIBS - LIBS="$LIBS -lintl" + AC_MSG_RESULT([gettext() works]); have_gettext="yes"; LIBS=$olibs, + LIBS="-lintl" AC_TRY_LINK( [#include <libintl.h>], [gettext("Test");], - AC_MSG_RESULT([gettext() works with -lintl]); have_gettext="yes", + AC_MSG_RESULT([gettext() works with -lintl]); have_gettext="yes"; + LIBS="$olibs -lintl", AC_MSG_RESULT([gettext() doesn't work]); LIBS=$olibs)) else diff --git a/src/version.c b/src/version.c index 9552bba4e6..66496f8eb5 100644 --- a/src/version.c +++ b/src/version.c @@ -739,6 +739,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 94, +/**/ 93, /**/ 92, |