8b9a1c
To: vim_dev@googlegroups.com
8b9a1c
Subject: Patch 7.4.094
8b9a1c
Fcc: outbox
8b9a1c
From: Bram Moolenaar <Bram@moolenaar.net>
8b9a1c
Mime-Version: 1.0
8b9a1c
Content-Type: text/plain; charset=UTF-8
8b9a1c
Content-Transfer-Encoding: 8bit
8b9a1c
------------
8b9a1c
8b9a1c
Patch 7.4.094
8b9a1c
Problem:    Configure may not find that -lint is needed for gettext().
8b9a1c
Solution:   Check for gettext() with empty $LIBS.  (Thomas De Schampheleire)
8b9a1c
Files:	    src/configure.in, src/auto/configure
8b9a1c
8b9a1c
8b9a1c
*** ../vim-7.4.093/src/configure.in	2013-11-17 20:17:05.000000000 +0100
8b9a1c
--- src/configure.in	2013-11-17 20:23:49.000000000 +0100
8b9a1c
***************
8b9a1c
*** 3725,3730 ****
8b9a1c
--- 3725,3733 ----
8b9a1c
  fi
8b9a1c
  
8b9a1c
  dnl Check if gettext() is working and if it needs -lintl
8b9a1c
+ dnl We take care to base this on an empty LIBS: on some systems libelf would be
8b9a1c
+ dnl in LIBS and implicitly take along libintl. The final LIBS would then not
8b9a1c
+ dnl contain libintl, and the link step would fail due to -Wl,--as-needed.
8b9a1c
  AC_MSG_CHECKING(--disable-nls argument)
8b9a1c
  AC_ARG_ENABLE(nls,
8b9a1c
  	[  --disable-nls           Don't support NLS (gettext()).], ,
8b9a1c
***************
8b9a1c
*** 3743,3758 ****
8b9a1c
    if test -f po/Makefile; then
8b9a1c
      have_gettext="no"
8b9a1c
      if test -n "$MSGFMT"; then
8b9a1c
        AC_TRY_LINK(
8b9a1c
  	[#include <libintl.h>],
8b9a1c
  	[gettext("Test");],
8b9a1c
! 	AC_MSG_RESULT([gettext() works]); have_gettext="yes",
8b9a1c
! 	  olibs=$LIBS
8b9a1c
! 	  LIBS="$LIBS -lintl"
8b9a1c
  	  AC_TRY_LINK(
8b9a1c
  	      [#include <libintl.h>],
8b9a1c
  	      [gettext("Test");],
8b9a1c
! 	      AC_MSG_RESULT([gettext() works with -lintl]); have_gettext="yes",
8b9a1c
  	      AC_MSG_RESULT([gettext() doesn't work]);
8b9a1c
  	      LIBS=$olibs))
8b9a1c
      else
8b9a1c
--- 3746,3763 ----
8b9a1c
    if test -f po/Makefile; then
8b9a1c
      have_gettext="no"
8b9a1c
      if test -n "$MSGFMT"; then
8b9a1c
+       olibs=$LIBS
8b9a1c
+       LIBS=""
8b9a1c
        AC_TRY_LINK(
8b9a1c
  	[#include <libintl.h>],
8b9a1c
  	[gettext("Test");],
8b9a1c
! 	AC_MSG_RESULT([gettext() works]); have_gettext="yes"; LIBS=$olibs,
8b9a1c
! 	  LIBS="-lintl"
8b9a1c
  	  AC_TRY_LINK(
8b9a1c
  	      [#include <libintl.h>],
8b9a1c
  	      [gettext("Test");],
8b9a1c
! 	      AC_MSG_RESULT([gettext() works with -lintl]); have_gettext="yes";
8b9a1c
! 	      LIBS="$olibs -lintl",
8b9a1c
  	      AC_MSG_RESULT([gettext() doesn't work]);
8b9a1c
  	      LIBS=$olibs))
8b9a1c
      else
8b9a1c
*** ../vim-7.4.093/src/auto/configure	2013-11-17 20:17:05.000000000 +0100
8b9a1c
--- src/auto/configure	2013-11-17 20:25:13.000000000 +0100
8b9a1c
***************
8b9a1c
*** 12690,12695 ****
8b9a1c
--- 12690,12697 ----
8b9a1c
    if test -f po/Makefile; then
8b9a1c
      have_gettext="no"
8b9a1c
      if test -n "$MSGFMT"; then
8b9a1c
+       olibs=$LIBS
8b9a1c
+       LIBS=""
8b9a1c
        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
8b9a1c
  /* end confdefs.h.  */
8b9a1c
  #include <libintl.h>
8b9a1c
***************
8b9a1c
*** 12703,12712 ****
8b9a1c
  _ACEOF
8b9a1c
  if ac_fn_c_try_link "$LINENO"; then :
8b9a1c
    { $as_echo "$as_me:${as_lineno-$LINENO}: result: gettext() works" >&5
8b9a1c
! $as_echo "gettext() works" >&6; }; have_gettext="yes"
8b9a1c
  else
8b9a1c
!   olibs=$LIBS
8b9a1c
! 	  LIBS="$LIBS -lintl"
8b9a1c
  	  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
8b9a1c
  /* end confdefs.h.  */
8b9a1c
  #include <libintl.h>
8b9a1c
--- 12705,12713 ----
8b9a1c
  _ACEOF
8b9a1c
  if ac_fn_c_try_link "$LINENO"; then :
8b9a1c
    { $as_echo "$as_me:${as_lineno-$LINENO}: result: gettext() works" >&5
8b9a1c
! $as_echo "gettext() works" >&6; }; have_gettext="yes"; LIBS=$olibs
8b9a1c
  else
8b9a1c
!   LIBS="-lintl"
8b9a1c
  	  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
8b9a1c
  /* end confdefs.h.  */
8b9a1c
  #include <libintl.h>
8b9a1c
***************
8b9a1c
*** 12720,12726 ****
8b9a1c
  _ACEOF
8b9a1c
  if ac_fn_c_try_link "$LINENO"; then :
8b9a1c
    { $as_echo "$as_me:${as_lineno-$LINENO}: result: gettext() works with -lintl" >&5
8b9a1c
! $as_echo "gettext() works with -lintl" >&6; }; have_gettext="yes"
8b9a1c
  else
8b9a1c
    { $as_echo "$as_me:${as_lineno-$LINENO}: result: gettext() doesn't work" >&5
8b9a1c
  $as_echo "gettext() doesn't work" >&6; };
8b9a1c
--- 12721,12728 ----
8b9a1c
  _ACEOF
8b9a1c
  if ac_fn_c_try_link "$LINENO"; then :
8b9a1c
    { $as_echo "$as_me:${as_lineno-$LINENO}: result: gettext() works with -lintl" >&5
8b9a1c
! $as_echo "gettext() works with -lintl" >&6; }; have_gettext="yes";
8b9a1c
! 	      LIBS="$olibs -lintl"
8b9a1c
  else
8b9a1c
    { $as_echo "$as_me:${as_lineno-$LINENO}: result: gettext() doesn't work" >&5
8b9a1c
  $as_echo "gettext() doesn't work" >&6; };
8b9a1c
*** ../vim-7.4.093/src/version.c	2013-11-17 20:17:05.000000000 +0100
8b9a1c
--- src/version.c	2013-11-17 20:27:43.000000000 +0100
8b9a1c
***************
8b9a1c
*** 740,741 ****
8b9a1c
--- 740,743 ----
8b9a1c
  {   /* Add new patch number below this line */
8b9a1c
+ /**/
8b9a1c
+     94,
8b9a1c
  /**/
8b9a1c
8b9a1c
-- 
8b9a1c
BLACK KNIGHT: The Black Knight always triumphs. Have at you!
8b9a1c
   ARTHUR takes his last leg off.  The BLACK KNIGHT's body lands upright.
8b9a1c
BLACK KNIGHT: All right, we'll call it a draw.
8b9a1c
                 "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD
8b9a1c
8b9a1c
 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
8b9a1c
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
8b9a1c
\\\  an exciting new programming language -- http://www.Zimbu.org        ///
8b9a1c
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///