gettext: gnulib update; less automake warnings

[Ralf Wildenhues]

Hello there,

I found some minor nits in gettext.

1) In gettext-runtime/src/Makefile.am, per-target compilation flags are
used.  For better portability, you should either use AM_PROG_CC_C_O in
gettext-runtime/configure.ac, or replace the per-target flags with one
setting of AM_CPPFLAGS (defines do not belong in AM_CFLAGS).  The latter
is slightly more efficient.  For gettext-tools it seems the _C_O is the
way to go.  (`automake -Wall' warns about this.)

gettext-runtime:
2006-08-16  Ralf Wildenhues  <address@hidden>

        * src/Makefile.am (AM_CFLAGS): Use instead of per-target flags.
        (gettext_CFLAGS, ngettext_CFLAGS, envsubst_CFLAGS): Removed.

gettext-tools:
2006-08-16  Ralf Wildenhues  <address@hidden>

        * configure.ac: Use AM_PROG_CC_C_O.

Index: gettext-runtime/src/Makefile.am
===================================================================
RCS file: /cvsroot/gettext/gettext/gettext-runtime/src/Makefile.am,v
retrieving revision 1.18
diff -u -r1.18 Makefile.am
--- gettext-runtime/src/Makefile.am     3 Aug 2006 11:40:15 -0000       1.18
+++ gettext-runtime/src/Makefile.am     16 Aug 2006 18:06:04 -0000
@@ -42,9 +42,7 @@
 LDADD = ../gnulib-lib/libgrt.a @LTLIBINTL@ @LTLIBICONV@
 
 # Specify installation directory, for --enable-relocatable.
-gettext_CFLAGS = -DINSTALLDIR=\"$(bindir)\"
-ngettext_CFLAGS = -DINSTALLDIR=\"$(bindir)\"
-envsubst_CFLAGS = -DINSTALLDIR=\"$(bindir)\"
+AM_CPPFLAGS += -DINSTALLDIR=\"$(bindir)\"
 if RELOCATABLE_VIA_LD
 gettext_LDFLAGS = `$(RELOCATABLE_LDFLAGS) $(bindir)`
 ngettext_LDFLAGS = `$(RELOCATABLE_LDFLAGS) $(bindir)`
Index: gettext-tools/configure.ac
===================================================================
RCS file: /cvsroot/gettext/gettext/gettext-tools/configure.ac,v
retrieving revision 1.81
diff -u -r1.81 configure.ac
--- gettext-tools/configure.ac  2 Aug 2006 14:29:54 -0000       1.81
+++ gettext-tools/configure.ac  16 Aug 2006 18:21:34 -0000
@@ -30,6 +30,7 @@
 
 dnl Checks for programs.
 AC_PROG_CC
+AM_PROG_CC_C_O
 AC_PROG_INSTALL
 AC_PROG_YACC



2) With the following patches in place, I can bootstrap and build
current CVS gettext with current CVS autotools and gnulib (`dist'
fails for me, presumably due to missing third-party packages on my
system).

gnulib-local:
2006-08-16  Ralf Wildenhues  <address@hidden>

        * modules/gettext-tools-misc: Drop m4/restrict.m4.

gettext-tools/m4:
2006-08-16  Ralf Wildenhues  <address@hidden>

        * regex.m4 (gl_PREREQ_REGEX): Adjust to gnulib change: use
        AC_C_RESTRICT instead of gl_C_RESTRICT.
 
Index: gnulib-local/modules/gettext-tools-misc
===================================================================
RCS file: /cvsroot/gettext/gettext/gnulib-local/modules/gettext-tools-misc,v
retrieving revision 1.2
diff -u -r1.2 gettext-tools-misc
--- gnulib-local/modules/gettext-tools-misc     2 Aug 2006 15:14:26 -0000       
1.2
+++ gnulib-local/modules/gettext-tools-misc     16 Aug 2006 18:27:59 -0000
@@ -4,7 +4,6 @@
 m4/hard-locale.m4
 m4/mbrtowc.m4
 m4/memchr.m4
-m4/restrict.m4
 m4/strdup.m4
 
 Depends-on:
Index: gettext-tools/m4/regex.m4
===================================================================
RCS file: /cvsroot/gettext/gettext/gettext-tools/m4/regex.m4,v
retrieving revision 1.4
diff -u -r1.4 regex.m4
--- gettext-tools/m4/regex.m4   30 May 2006 20:13:53 -0000      1.4
+++ gettext-tools/m4/regex.m4   16 Aug 2006 18:21:34 -0000
@@ -118,7 +118,7 @@
   dnl Persuade glibc <string.h> to declare mempcpy().
   AC_REQUIRE([AC_GNU_SOURCE])
 
-  AC_REQUIRE([gl_C_RESTRICT])
+  AC_REQUIRE([AC_C_RESTRICT])
   AC_REQUIRE([AC_FUNC_ALLOCA])
   AC_REQUIRE([AC_HEADER_STDC])
   AC_CHECK_HEADERS_ONCE(wchar.h wctype.h)


Cheers,
Ralf