New directory structure.

diff --git a/gettext-runtime/m4/ChangeLog b/gettext-runtime/m4/ChangeLog
new file mode 100644 (file)
index 0000000..42f38f0
--- /dev/null
+++ b/gettext-runtime/m4/ChangeLog
@@ -0,0 +1,8 @@
+2003-02-12  Bruno Haible  <bruno@clisp.org>
+
+       Restructure gettext package.
+       * ansi-c++.m4: New file.
+       * gettext.m4 (AM_GNU_GETTEXT): Special case the packages
+       'gettext-runtime' and 'gettext-tools'.
+       * Makefile.am: New file.
+

diff --git a/gettext-runtime/m4/Makefile.am b/gettext-runtime/m4/Makefile.am
new file mode 100644 (file)
index 0000000..3df0a60
--- /dev/null
+++ b/gettext-runtime/m4/Makefile.am
@@ -0,0 +1,27 @@
+## Process this file with automake to produce Makefile.in -*-Makefile-*-
+
+# Generate this list with
+# find . -type f -name '*.m4' -printf '%f\n' | sort | tr '\012' @ | sed 's/@$/%/;s/@/ \\@/g' | tr @% '\012\012'
+EXTRA_DIST = README \
+ansi-c++.m4 \
+codeset.m4 \
+error.m4 \
+gettext.m4 \
+glibc21.m4 \
+iconv.m4 \
+intdiv0.m4 \
+intmax.m4 \
+inttypes-pri.m4 \
+inttypes.m4 \
+inttypes_h.m4 \
+isc-posix.m4 \
+lcmessage.m4 \
+longdouble.m4 \
+longlong.m4 \
+progtest.m4 \
+signed.m4 \
+stdint_h.m4 \
+uintmax_t.m4 \
+ulonglong.m4 \
+wchar_t.m4 \
+wint_t.m4

diff --git a/gettext-runtime/m4/gettext.m4 b/gettext-runtime/m4/gettext.m4
index 878df12ccb82e0de56f24135e1b811b3b9b46c64..2348d625356199db75c4ef68fe8476557ed7cb9c 100644 (file)
--- a/gettext-runtime/m4/gettext.m4
+++ b/gettext-runtime/m4/gettext.m4
@@ -1,5 +1,5 @@
 # gettext.m4 serial 18 (gettext-0.11.6)
-dnl Copyright (C) 1995-2002 Free Software Foundation, Inc.
+dnl Copyright (C) 1995-2003 Free Software Foundation, Inc.
 dnl This file is free software, distributed under the terms of the GNU
 dnl General Public License.  As a special exception to the GNU General
 dnl Public License, this file may be distributed as part of a program
@@ -216,7 +216,8 @@ return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("",
         dnl libintl.  (Cf. the install rule in intl/Makefile.in.)
         if test "$gt_cv_func_gnugettext_libc" = "yes" \
            || { test "$gt_cv_func_gnugettext_libintl" = "yes" \
-                && test "$PACKAGE" != gettext; }; then
+                && test "$PACKAGE" != gettext-runtime \
+                && test "$PACKAGE" != gettext-tools; }; then
           gt_use_preinstalled_gnugettext=yes
         else
           dnl Reset the values set by searching for libintl.
@@ -299,7 +300,7 @@ return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("",
   ifelse(gt_included_intl, yes, [
     dnl If this is used in GNU gettext we have to set BUILD_INCLUDED_LIBINTL
     dnl to 'yes' because some of the testsuite requires it.
-    if test "$PACKAGE" = gettext; then
+    if test "$PACKAGE" = gettext-runtime || test "$PACKAGE" = gettext-tools; then
       BUILD_INCLUDED_LIBINTL=yes
     fi