From 40e26a853095e0cb18bb9e06508ea900fc787b2f Mon Sep 17 00:00:00 2001
From: Pavel Roskin <proski@gnu.org>
Date: Fri, 11 Nov 2005 01:14:51 +0000
Subject: [PATCH] * configure.ac: Use gettext 0.14.3. * acinclude.m4
 (MC_ASM_LABELS): Remove, it's not needed with recent versions of gettext.

---
 ChangeLog    |  4 ++++
 acinclude.m4 | 29 -----------------------------
 configure.ac |  2 +-
 3 files changed, 5 insertions(+), 30 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 5cee770f9..d8fbe291d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 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
 	and move its definition above main().  That's closer to what
 	gettext is actually doing.
diff --git a/acinclude.m4 b/acinclude.m4
index 90feaeb22..866b885b1 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -925,32 +925,3 @@ if test "$mc_cv_g_module_supported" = yes; then
 	      [Define if gmodule functionality is supported])
 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
-])
diff --git a/configure.ac b/configure.ac
index 33abb6cd5..b5e6bfdbc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -103,7 +103,7 @@ dnl Internationalization
 dnl
 MC_ASM_LABELS
 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
     CPPFLAGS="$CPPFLAGS -I\$(top_builddir)/intl -I\$(top_srcdir)/intl"