Bug#353435: Patch for gettext.m4 to remove superfluous operations (fwd)

[Santiago Vila]

Hello.

Received this from the Debian bug system:

---------- Forwarded message ----------
From: Ron <address@hidden>
To: Debian Bug Tracking System <address@hidden>
Date: Sat, 18 Feb 2006 22:11:38 +1030
Subject: Bug#353435: Patch for gettext.m4 to remove superfluous operations

Package: gettext
Version: 0.14.5-2
Severity: normal
Tags: patch

Hi,

Please apply the following patch.

The first hunk avoids calling AM_NLS twice.  It could possibly
even be simply removed there, as it is already AC_REQUIRED by
AM_PO_SUBDIRS, which itself is required in the lines just before
the first hunk starts.  I'll leave that as an upstream call,
this patch fixes the immediate problem.

The second hunk is just an extension of the first, removing
excess output from the configure run.  All the information
given there is already reported by code above in the same
macro.  It only sets the gt_source variable, which is not used
anywhere else.

Collectively they turn:

--> checking whether NLS is requested... yes
    checking for msgfmt... /usr/bin/msgfmt
    checking for gmsgfmt... /usr/bin/msgfmt
    checking for xgettext... /usr/bin/xgettext
    checking for msgmerge... /usr/bin/msgmerge
    checking for CFPreferencesCopyAppValue... no
    checking for CFLocaleCopyCurrent... no
--> checking whether NLS is requested... yes
++> checking for GNU gettext in libc... yes
--> checking whether to use NLS... yes
++> checking where the gettext function comes from... libc

into:

    checking whether NLS is requested... yes
    checking for msgfmt... /usr/bin/msgfmt
    checking for gmsgfmt... /usr/bin/msgfmt
    checking for xgettext... /usr/bin/xgettext
    checking for msgmerge... /usr/bin/msgmerge
    checking for CFPreferencesCopyAppValue... no
    checking for CFLocaleCopyCurrent... no
    checking for GNU gettext in libc... yes

or:

    checking whether NLS is requested... yes
    checking for msgfmt... /usr/bin/msgfmt
    checking for gmsgfmt... /usr/bin/msgfmt
    checking for xgettext... /usr/bin/xgettext
    checking for msgmerge... /usr/bin/msgmerge
    checking for CFPreferencesCopyAppValue... no
    checking for CFLocaleCopyCurrent... no
    checking for GNU gettext in libc... no
    checking for iconv... (cached) yes
    checking how to link with libiconv... -liconv
    checking for GNU gettext in libintl... yes
    checking how to link with libintl... -lintl

Without actually removing any functional part of the macro
or any of the information reported to the user.

Thanks!
Ron


--- gettext.orig.m4     2006-02-18 21:47:42.000000000 +1030
+++ gettext.m4          2006-02-18 21:48:24.000000000 +1030
@@ -94,7 +94,7 @@
   gt_INTL_MACOSX
 
   dnl Set USE_NLS.
-  AM_NLS
+  AC_REQUIRE([AM_NLS])
 
   ifelse(gt_included_intl, yes, [
     BUILD_INCLUDED_LIBINTL=no
@@ -266,22 +266,6 @@
     fi
   fi
 
-  AC_MSG_CHECKING([whether to use NLS])
-  AC_MSG_RESULT([$USE_NLS])
-  if test "$USE_NLS" = "yes"; then
-    AC_MSG_CHECKING([where the gettext function comes from])
-    if test "$gt_use_preinstalled_gnugettext" = "yes"; then
-      if test "$gt_cv_func_gnugettext_libintl" = "yes"; then
-        gt_source="external libintl"
-      else
-        gt_source="libc"
-      fi
-    else
-      gt_source="included intl directory"
-    fi
-    AC_MSG_RESULT([$gt_source])
-  fi
-
   if test "$USE_NLS" = "yes"; then
 
     if test "$gt_use_preinstalled_gnugettext" = "yes"; then