moparisthebest
/
wget
mirror of https://github.com/moparisthebest/wget
1
0
Fork 0
Code Issues Releases Wiki Activity

[svn] Prefer gettext with explicitly linked libintl, so non-standard libintl's 

get picked up along with their includes.
This commit is contained in:
hniksic 2003-10-10 06:02:56 -07:00
parent ffc2d0f653
commit 37e70109a4
2 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
2003-10-10 Hrvoje Niksic <hniksic@xemacs.org>
* aclocal.m4 (WGET_WITH_NLS): First check for gettext in libintl,
then use the libc version. That way systems that get libintl.h
from /usr/local/include will get the matching gettext.
2003-10-10 Hrvoje Niksic <hniksic@xemacs.org>
* po/tr.po: Ditto.

21
aclocal.m4 vendored
View File

@ -278,14 +278,19 @@ AC_DEFUN(WGET_WITH_NLS,
AC_CHECK_HEADERS(locale.h libintl.h)
AC_CHECK_FUNCS(gettext, [], [
AC_CHECK_LIB(intl, gettext, [
dnl gettext is in libintl; announce the fact manually.
LIBS="-lintl $LIBS"
AC_DEFINE(HAVE_GETTEXT)
], [
AC_MSG_RESULT(
[gettext not found; disabling NLS])
dnl Prefer gettext found in -lintl to the one in libc.
dnl Otherwise it can happen that we include libintl.h from
dnl /usr/local/lib, but fail to specify -lintl, which results in
dnl link or run-time failures. (Symptom: libintl_bindtextdomain
dnl not found at link-time.)
AC_CHECK_LIB(intl, gettext, [
dnl gettext is in libintl; announce the fact manually.
LIBS="-lintl $LIBS"
AC_DEFINE(HAVE_GETTEXT)
], [
AC_CHECK_FUNCS(gettext, [], [
AC_MSG_RESULT([gettext not found; disabling NLS])
HAVE_NLS=no
])
])