Inline AM_WITH_NLS macro.

diff --git a/m4/ChangeLog b/m4/ChangeLog
index b2a6ed64141b419160825fd313c942aac7c85c7a..e0180cb24d19dd4daeeeff3c2993353ff3ce2245 100644 (file)
--- a/m4/ChangeLog
+++ b/m4/ChangeLog
@@ -1,3 +1,8 @@
+2001-09-27  Bruno Haible  <haible@clisp.cons.org>
+
+       * gettext.m4 (AM_GNU_GETTEXT): Inline AM_WITH_NLS call.
+       (AM_WITH_NLS): Remove macro.
+
 2001-09-23  Bruno Haible  <haible@clisp.cons.org>
 
        * siginfo.m4: New file.

diff --git a/m4/gettext.m4 b/m4/gettext.m4
index 0513cdc41e97aab1ddb2fc61d7722290a3831429..ca22e40e2b8ebdb587c1eed24d08d11cbd46a7fb 100644 (file)
--- a/m4/gettext.m4
+++ b/m4/gettext.m4
@@ -64,28 +64,8 @@ strtoul tsearch __argz_count __argz_stringify __argz_next])
    AM_ICONV
    AM_LANGINFO_CODESET
    AM_LC_MESSAGES
-   AM_WITH_NLS([$1],[$2],[$3])
-
-   dnl If the AC_CONFIG_AUX_DIR macro for autoconf is used we possibly
-   dnl find the mkinstalldirs script in another subdir but $(top_srcdir).
-   dnl Try to locate is.
-   MKINSTALLDIRS=
-   if test -n "$ac_aux_dir"; then
-     MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs"
-   fi
-   if test -z "$MKINSTALLDIRS"; then
-     MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs"
-   fi
-   AC_SUBST(MKINSTALLDIRS)
-
-   dnl Enable libtool support if the surrounding package wishes it.
-   INTL_LIBTOOL_SUFFIX_PREFIX=ifelse([$1], use-libtool, [l], [])
-   AC_SUBST(INTL_LIBTOOL_SUFFIX_PREFIX)
-  ])
 
-dnl Usage: Just like AM_GNU_GETTEXT, which see.
-AC_DEFUN([AM_WITH_NLS],
-  [AC_MSG_CHECKING([whether NLS is requested])
+    AC_MSG_CHECKING([whether NLS is requested])
     dnl Default is enabled NLS
     AC_ARG_ENABLE(nls,
       [  --disable-nls           do not use Native Language Support],
@@ -385,4 +365,20 @@ changequote([,])dnl
     dnl For backward compatibility. Some Makefiles may be using this.
     GENCAT=gencat
     AC_SUBST(GENCAT)
+
+    dnl If the AC_CONFIG_AUX_DIR macro for autoconf is used we possibly
+    dnl find the mkinstalldirs script in another subdir but $(top_srcdir).
+    dnl Try to locate is.
+    MKINSTALLDIRS=
+    if test -n "$ac_aux_dir"; then
+      MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs"
+    fi
+    if test -z "$MKINSTALLDIRS"; then
+      MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs"
+    fi
+    AC_SUBST(MKINSTALLDIRS)
+
+    dnl Enable libtool support if the surrounding package wishes it.
+    INTL_LIBTOOL_SUFFIX_PREFIX=ifelse([$1], use-libtool, [l], [])
+    AC_SUBST(INTL_LIBTOOL_SUFFIX_PREFIX)
   ])