Import some gettext macros: take 2 [1/3]

[Kelley Cook <kcook at gcc dot gnu dot org>]

This is an updated patch to import the gettext 0.12.1 macros into the
config directory.

Per Josephs's request, I have updated the README to reflect the new
simpler method for creating aclocal.  In addition, I've duplicated the
--enable-maintainer-mode pieces from libcpp over to intl, so that option
will now work as expected.

Bootstrapped and regtested with --enable-maintainer-mode --enable-nls
--with-included-gettext on i686-pc-cygwin.

In addition this was bootstrapped on powerpc-apple-darwin6.8 which
requires intl.

Finally I ran a newlib enabled powerpc-apple-darwin6.8 ->
i686-unknown-elf cross on the src/ directory.  Then I verified via a
grep search throughout a combined src+gcc tree that the
ZW_GNU_GETTEXT_SISTER_DIR macro within config/gettext.m4 which is being
renamed to config/gettext-sister.m4 is only referenced in libcpp and gcc.

OK to install?

If so, what about its two followup patches:
http://gcc.gnu.org/ml/gcc-patches/2004-09/msg00384.html
and
http://gcc.gnu.org/ml/gcc-patches/2004-09/msg00385.html

KC

config/
2004-09-08  Kelley Cook  <kcook@gcc.gnu.org>

	* gettext-sister.m4: Renamed from gettext.m4
	* codeset.m4, gettext.m4, glibc21.m4, iconv.m4, intdiv0.m4, po.m4,
	inttypes.m4, inttypes-pri.m4, inttypes_h.m4, lcmessage.m4, lib-ld.m4,
	lib-link.m4, lib-prefix.m4, nls.m4, po.m4, progtest.m4, stdint_h.m4,
	uintmax_t.m4, ulonglong.m4: Import from gettext-0.12.1 sources.

gcc/
2004-09-08  Kelley Cook  <kcook@gcc.gnu.org>

	* aclocal.m4: Update for rename of gettext-sister.m4.

libcpp/
2004-09-08  Kelley Cook  <kcook@gcc.gnu.org>

	* Makefile.in (aclocal.m4): Update dependencies.
	* configure.ac (AC_CONFIG_MACRO_DIR): New.
	* aclocal.m4, configure: Regenerate.

intl/
2004-09-08  Kelley Cook  <kcook@gcc.gnu.org>

	* configure.ac (AC_CONFIG_MACRO_DIR): New.
	(ACLOCAL, AUTOCONF, AUTOHEADER, MAINT): Substitute.
	* Makefile.in: Update with maintainer mode rules.
	* README: Update aclocal regeneration instructions.
	* aclocal.m4, configure: Regenerate.

diff -Nprud gcc-orig/gcc/aclocal.m4 gcc-snapshot/gcc/aclocal.m4
--- gcc-orig/gcc/aclocal.m4	2004-08-03 16:33:23.000000000 -0400
+++ gcc-snapshot/gcc/aclocal.m4	2004-09-02 16:42:11.104627400 -0400
@@ -1,6 +1,6 @@
 sinclude(../config/acx.m4)
 sinclude(../config/accross.m4)
-sinclude(../config/gettext.m4)
+sinclude(../config/gettext-sister.m4)
 sinclude(../config/progtest.m4)
 
 dnl See whether we need a declaration for a function.
diff -Nprud gcc-orig/libcpp/Makefile.in gcc-snapshot/libcpp/Makefile.in
--- gcc-orig/libcpp/Makefile.in	2004-08-29 13:48:59.000000000 -0400
+++ gcc-snapshot/libcpp/Makefile.in	2004-09-02 14:40:58.481725600 -0400
@@ -100,7 +100,10 @@ $(srcdir)/configure: @MAINT@ $(srcdir)/a
 	cd $(srcdir) && $(AUTOCONF)
 
 $(srcdir)/aclocal.m4: @MAINT@ $(srcdir)/../config/acx.m4 \
-	$(srcdir)/../config/gettext.m4 $(srcdir)/configure.ac
+	$(srcdir)/../config/gettext-sister.m4 $(srcdir)/../config/iconv.m4 \
+	$(srcdir)/../config/codeset.m4 $(srcdir)/../config/lib-ld.m4 \
+	$(srcdir)/../config/lib-link.m4 $(srcdir)/../config/lib-prefix.m4 \
+	$(srcdir)/configure.ac
 	cd $(srcdir) && $(ACLOCAL) -I ../config
 
 config.h: stamp-h1
diff -Nprud gcc-orig/libcpp/configure.ac gcc-snapshot/libcpp/configure.ac
--- gcc-orig/libcpp/configure.ac	2004-08-28 14:04:17.000000000 -0400
+++ gcc-snapshot/libcpp/configure.ac	2004-09-02 13:53:52.532747900 -0400
@@ -4,6 +4,7 @@
 AC_PREREQ(2.59)
 AC_INIT(cpplib, [ ], gcc-bugs@gcc.gnu.org, cpplib)
 AC_CONFIG_SRCDIR(ucnid.h)
+AC_CONFIG_MACRO_DIR(../config)
 AC_CANONICAL_SYSTEM
 AC_PROG_MAKE_SET
 AC_PROG_INSTALL
diff -prud gcc-orig/intl/Makefile.in gcc-snapshot/intl/Makefile.in
--- gcc-orig/intl/Makefile.in	2003-07-08 01:55:11.000000000 -0400
+++ gcc-snapshot/intl/Makefile.in	2004-09-08 11:08:28.899279300 -0400
@@ -21,10 +21,7 @@
 # we do not need nor want), the ability to build a shared library
 # (likewise), and a large number of heinous kludges.
 
-PACKAGE = @PACKAGE@
-VERSION = @VERSION@
-
-SHELL = /bin/sh
+SHELL = @SHELL@
 
 srcdir = @srcdir@
 VPATH = $(srcdir)
@@ -39,6 +36,9 @@ localedir = $(datadir)/locale
 aliaspath = $(localedir)
 
 AR = ar
+ACLOCAL = @ACLOCAL@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
 CC = @CC@
 RANLIB = @RANLIB@
 YACC = @INTLBISON@ -y -d
@@ -191,19 +191,43 @@ maintainer-clean: distclean
 dist:
 distdir:
 
-Makefile: Makefile.in config.status
-	CONFIG_HEADERS= CONFIG_FILES=Makefile $(SHELL) ./config.status
+# Rules to rebuild the configuration
+
+Makefile: $(srcdir)/Makefile.in config.status
+	$(SHELL) ./config.status Makefile
 
 config.intl: config.intl.in config.status
-	CONFIG_HEADERS= CONFIG_FILES=config.intl $(SHELL) ./config.status
+	$(SHELL) ./config.status config.intl
+	
+config.status: $(srcdir)/configure
+	$(SHELL) ./config.status --recheck
 
-config.h: cstamp-h; @:
-cstamp-h: config.h.in config.status
-	CONFIG_HEADERS=config.h CONFIG_FILES= $(SHELL) config.status
-	echo timestamp > cstamp-h
+$(srcdir)/configure: @MAINT@ $(srcdir)/aclocal.m4 $(srcdir)/configure.ac
+	cd $(srcdir) && $(AUTOCONF)
 
-config.status: configure
-	$(SHELL) config.status --recheck
+$(srcdir)/aclocal.m4: @MAINT@ $(srcdir)/configure.ac \
+	$(srcdir)/../config/codeset.m4 $(srcdir)/../config/gettext.m4 \
+	$(srcdir)/../config/glibc21.m4 $(srcdir)/../config/iconv.m4 \
+	$(srcdir)/../config/intdiv0.m4 $(srcdir)/../config/inttypes-pri.m4 \
+	$(srcdir)/../config/inttypes.m4 $(srcdir)/../config/inttypes_h.m4 \
+	$(srcdir)/../config/lcmessage.m4 $(srcdir)/../config/lib-ld.m4 \
+	$(srcdir)/../config/lib-link.m4 $(srcdir)/../config/lib-prefix.m4 \
+	$(srcdir)/../config/nls.m4 $(srcdir)/../config/po.m4 \
+	$(srcdir)/../config/progtest.m4 $(srcdir)/../config/stdint_h.m4 \
+	$(srcdir)/../config/uintmax_t.m4 $(srcdir)/../config/ulonglong.m4
+	cd $(srcdir) && $(ACLOCAL) -I ../config
+
+config.h: stamp-h1
+	test -f config.h || (rm -f stamp-h1 && $(MAKE) stamp-h1)
+
+stamp-h1: $(srcdir)/config.in config.status
+	-rm -f stamp-h1
+	$(SHELL) ./config.status config.h
+
+$(srcdir)/config.in: @MAINT@ $(srcdir)/configure
+	cd $(srcdir) && $(AUTOHEADER)
+	-rm -f stamp-h1
+	
 
 # Tell versions [3.59,3.63) of GNU make not to export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
diff -prud gcc-orig/intl/README gcc-snapshot/intl/README
--- gcc-orig/intl/README	2004-02-29 15:22:40.000000000 -0500
+++ gcc-snapshot/intl/README	2004-09-08 10:06:28.518049400 -0400
@@ -14,9 +14,7 @@ gettext developers first.  However, note
   and os2compat.h are not used in this setup and have therefore been 
   removed.
 
-* aclocal.m4 was constructed following the instructions printed by
-  "gettextize" from the files that gettext 0.12.1 installs in
-  $(prefix)/share/aclocal.
+* aclocal.m4 was constructed using automake's "aclocal -I ../config".
 
 * configure.ac, config.intl.in, and Makefile.in were written for this
   directory layout, by Zack Weinberg <zack@codesourcery.com>.  Please
diff -prud gcc-orig/intl/configure.ac gcc-snapshot/intl/configure.ac
--- gcc-orig/intl/configure.ac	2004-05-25 16:16:56.000000000 -0400
+++ gcc-snapshot/intl/configure.ac	2004-09-08 11:06:14.567604000 -0400
@@ -2,6 +2,7 @@ AC_PREREQ(2.59)
 AC_INIT
 AC_CONFIG_SRCDIR(gettext.c)
 AC_CONFIG_HEADER(config.h)
+AC_CONFIG_MACRO_DIR(../config)
 AM_GNU_GETTEXT_VERSION(0.12.1)
 AM_GNU_GETTEXT
 
@@ -16,6 +17,21 @@ AC_DEFINE(set_relocation_prefix, libintl
 AC_DEFINE(relocate, libintl_relocate,
 [Define this entry point correctly.])
 
+MISSING=`cd $ac_aux_dir && ${PWDCMD-pwd}`/missing
+AC_CHECK_PROGS([ACLOCAL], [aclocal], [$MISSING aclocal])
+AC_CHECK_PROGS([AUTOCONF], [autoconf], [$MISSING autoconf])
+AC_CHECK_PROGS([AUTOHEADER], [autoheader], [$MISSING autoheader])
+
+AC_ARG_ENABLE(maintainer-mode,
+[  --enable-maintainer-mode enable rules only needed by maintainers],,
+enable_maintainer_mode=no)
+if test "x$enable_maintainer_mode" = xno; then
+  MAINT='#'
+else
+  MAINT=
+fi
+AC_SUBST(MAINT)
+
 # Additional info for config.intl.
 AC_SUBST(LIBINTL_DEP)
 AC_SUBST(INCINTL)