Fix configure bug with gettext

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@626 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/ChangeLog b/ChangeLog
index 471e5c0a85cb96fd9cf05cc8eb2626c05241f97a..6c3d712bfc26a95559bda9ca8894462744ace233 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2000-03-22  Jean-Marc Lasgouttes  <Jean-Marc.Lasgouttes@inria.fr>
+
+       * config/gettext.m4 (AM_WITH_NLS): fix a gettext bug where -lintl
+       would not be added to the link list when an installed gettext (not
+       part of libc) is found.
+
 2000-03-24  Juergen Vigna  <jug@sad.it>
 
        * src/insets/insetcollapsable.C (Edit): 

diff --git a/acinclude.m4 b/acinclude.m4
index 7c317dbd2385bbcd33c7564b024d0040cd1e9f8e..e7d8f225206639ccb4c412bbc072184bdcea150d 100644 (file)
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -1271,7 +1271,11 @@ AC_DEFUN(AM_WITH_NLS,
               [AC_CACHE_CHECK([for gettext in libintl],
                 gt_cv_func_gettext_libintl,
                 [AC_CHECK_LIB(intl, gettext,
-                 gt_cv_func_gettext_libintl=yes,
+dnl ============== A fix is here! ======================
+dnl -lintl was not added to the LIBS variable in this case
+                 [gt_cv_func_gettext_libintl=yes
+                  INTLLIBS="-lintl"],
+dnl ==== end of fix
                  gt_cv_func_gettext_libintl=no)],
                 gt_cv_func_gettext_libintl=no)])
           fi

diff --git a/config/gettext.m4 b/config/gettext.m4
index 078443463477ffa3ee574dac2868aaa71499ba2a..7ecae1d0b1eef102392e5efa75cd7fc9fff867f6 100644 (file)
--- a/config/gettext.m4
+++ b/config/gettext.m4
@@ -49,7 +49,11 @@ AC_DEFUN(AM_WITH_NLS,
               [AC_CACHE_CHECK([for gettext in libintl],
                 gt_cv_func_gettext_libintl,
                 [AC_CHECK_LIB(intl, gettext,
-                 gt_cv_func_gettext_libintl=yes,
+dnl ============== A fix is here! ======================
+dnl -lintl was not added to the LIBS variable in this case
+                 [gt_cv_func_gettext_libintl=yes
+                  INTLLIBS="-lintl"],
+dnl ==== end of fix
                  gt_cv_func_gettext_libintl=no)],
                 gt_cv_func_gettext_libintl=no)])
           fi

diff --git a/po/es.po b/po/es.po
index 8351f0225c6c437d99b1297127022a2fb06e2776..1a19e3e6042a2d7eec83260b130290157a06579c 100644 (file)
--- a/po/es.po
+++ b/po/es.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: lyx-1.0.0\n"
 "POT-Creation-Date: 2000-02-17 01:59+0100\n"
-"PO-Revision-Date: 2000-03-22 15:54+01:00\n"
+"PO-Revision-Date: 2000-03-22 16:32+01:00\n"
 "Last-Translator: David Suárez de lis <excalibor@iname.com>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -3272,7 +3272,7 @@ msgstr " Por defecto | Personalizado | CartaUS | LegalUS | EjecutivoUS | A3 | A4
 msgid ""
 " None | A4 small Margins (only portrait) | A4 very small Margins (only "
 "portrait) | A4 very wide margins (only portrait) "
-msgstr " Ninguno | A4 márgenes pequeños (sólo retrato) | A4 mágenes muy pequeños (sólo retrato) | A4 márgenes muy anchos (sólo retrato) "
+msgstr " Ninguno | A4 márgenes pequeños (sólo retrato) | A4 márgenes muy pequeños (sólo retrato) | A4 márgenes muy anchos (sólo retrato) "
 
 #: src/lyx_gui.C:524
 msgid " ``text'' | ''text'' | ,,text`` | ,,text'' | «text» | »text« "