updated for version 7.4.094

Problem:    Configure may not find that -lint is needed for gettext().
Solution:   Check for gettext() with empty $LIBS.  (Thomas De Schampheleire)

diff --git a/src/auto/configure b/src/auto/configure
index 5a205966e5b8beaed8a39b5e1f8d30eb1e13a7b4..472afcb425f16d226ded7d40f1d317a7472b03bf 100755 (executable)
--- 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 83d0ea880e1be8ec93218b0014bbd58a60fb0bb0..9af3f2475d32a7c0c8c4af1fd8d54a086044b6d2 100644 (file)
--- 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 9552bba4e6b467c5b4c8ab949e076d52c54aac9d..66496f8eb5e47fa371153f424ad9a9ffb7bf70f8 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -738,6 +738,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    94,
 /**/
     93,
 /**/