* configure.ac: Use gettext 0.14.3.

* acinclude.m4 (MC_ASM_LABELS): Remove, it's not needed with
recent versions of gettext.
This commit is contained in:
Pavel Roskin 2005-11-11 01:14:51 +00:00
parent 685ec466c2
commit 40e26a8530
3 changed files with 5 additions and 30 deletions

View File

@ -1,5 +1,9 @@
2005-11-10 Pavel Roskin <proski@gnu.org> 2005-11-10 Pavel Roskin <proski@gnu.org>
* configure.ac: Use gettext 0.14.3.
* acinclude.m4 (MC_ASM_LABELS): Remove, it's not needed with
recent versions of gettext.
* acinclude.m4 (MC_ASM_LABELS): Make the test function global * acinclude.m4 (MC_ASM_LABELS): Make the test function global
and move its definition above main(). That's closer to what and move its definition above main(). That's closer to what
gettext is actually doing. gettext is actually doing.

View File

@ -925,32 +925,3 @@ if test "$mc_cv_g_module_supported" = yes; then
[Define if gmodule functionality is supported]) [Define if gmodule functionality is supported])
fi fi
]) ])
dnl
dnl Check if it's possible to use asm labels to rename functions.
dnl This macro is necessary because gettext wrongly assumes that gcc
dnl can do it regardless of the OS.
dnl
AC_DEFUN([MC_ASM_LABELS], [
AC_CACHE_CHECK([whether functions can be renamed by asm labels],
mc_cv_asm_labels,
[mc_cv_asm_labels=no
if test -n "$GCC"; then
AC_TRY_LINK([
int function1 (void) __asm__ ("function2");
int function1 (void)
{
return 0;
}
], [
return function2();
], [mc_cv_asm_labels=yes])
fi
])
if test "$mc_cv_asm_labels" != yes; then
AC_DEFINE(_INTL_REDIRECT_MACROS, 1,
[Define if functions cannot be renamed by asm labels])
fi
])

View File

@ -103,7 +103,7 @@ dnl Internationalization
dnl dnl
MC_ASM_LABELS MC_ASM_LABELS
AM_GNU_GETTEXT(no-libtool, need-ngettext) AM_GNU_GETTEXT(no-libtool, need-ngettext)
AM_GNU_GETTEXT_VERSION(0.11.5) AM_GNU_GETTEXT_VERSION(0.14.3)
if test "x$USE_INCLUDED_LIBINTL" = xyes; then if test "x$USE_INCLUDED_LIBINTL" = xyes; then
CPPFLAGS="$CPPFLAGS -I\$(top_builddir)/intl -I\$(top_srcdir)/intl" CPPFLAGS="$CPPFLAGS -I\$(top_builddir)/intl -I\$(top_srcdir)/intl"