FYI: 83-gary-use-automake-1.8-SOURCE-defaults.patch

[Gary V. Vaughan]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Applied to HEAD.
- --
Gary V. Vaughan      ())_.  address@hidden,gnu.org}
Research Scientist   ( '/   http://www.oranda.demon.co.uk
GNU Hacker           / )=   http://www.gnu.org/software/libtool
Technical Author   `(_~)_   http://sources.redhat.com/autobook
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.2 (GNU/Linux)
Comment: Using GnuPG with Thunderbird - http://enigmail.mozdev.org

iD8DBQE/y1jsFRMICSmD1gYRAj/aAKDKtMVoJMRBUfc/C3QM2EwWlwz6zwCcDy3i
H0nwTClajkpJ7rFBzKDwicY=
=OTG+
-----END PGP SIGNATURE-----

Index: ChangeLog
from  Gary V. Vaughan  <address@hidden>

        * configure.ac (AM_INIT_AUTOMAKE): Require 1.7g...
        * modules/Makefile.am (gnu_la_SOURCES, load_la_SOURCES,
        m4_la_SOURCES, traditional_la_SOURCES, modtest_la_SOURCES,
        shadow_la_SOURCES, import_la_SOURCES, stdlib_la_SOURCES,
        time_la_SOURCES): ...so that these are defaulted correctly, and
        can be removed from this file.
        (AM_LDFLAGS): Add -module...
        (gnu_la_LDFLAGS, load_la_LDFLAGS, m4_la_LDFLAGS,
        traditional_la_LDFLAGS, modtest_la_LDFLAGS, shadow_la_LDFLAGS,
        import_la_LDFLAGS, stdlib_la_LDFLAGS, time_la_LDFLAGS): ...so that
        the individual settings can be removed.
        * m4/Makefile.am (libm4_la_LIBADD): Add $(LTLIBINTL) here once...
        * module/Makefile.am (gnu_la_LIBADD, load_la_LIBADD,
        m4_la_LIBADD, traditional_la_LIBADD, modtest_la_LIBADD,
        shadow_la_LIBADD, import_la_LIBADD, stdlib_la_LIBADD,
        time_la_LIBADD): ...so that these are picked up as a deplib of
        libm4 and don't need to be set explicitly.

Index: configure.ac
===================================================================
RCS file: /cvsroot/m4/m4/configure.ac,v
retrieving revision 1.30
diff -u -p -u -r1.30 configure.ac
--- configure.ac 13 Nov 2003 12:57:29 -0000 1.30
+++ configure.ac 1 Dec 2003 15:00:15 -0000
@@ -87,7 +87,7 @@ AC_SUBST(DLPREOPEN)
 ## ------------------------ ##
 ## Automake Initialisation. ##
 ## ------------------------ ##
-AM_INIT_AUTOMAKE([1.7a dist-bzip2])
+AM_INIT_AUTOMAKE([1.7g dist-bzip2])
 
 
 
Index: m4/Makefile.am
===================================================================
RCS file: /cvsroot/m4/m4/m4/Makefile.am,v
retrieving revision 1.25
diff -u -p -u -r1.25 Makefile.am
--- m4/Makefile.am 12 Sep 2003 13:47:48 -0000 1.25
+++ m4/Makefile.am 1 Dec 2003 15:00:15 -0000
@@ -16,15 +16,16 @@
 ## the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 ## Boston, MA 02111-1307, USA.
 
-AM_LDFLAGS     = -no-undefined -export-dynamic
 AM_CPPFLAGS    = -I$(top_builddir)/gnulib -I$(top_srcdir)/gnulib \
                  -I$(top_builddir) -I$(top_srcdir) $(INTLINCL)
+AM_LDFLAGS     = -no-undefined -export-dynamic
 
 lib_LTLIBRARIES                = libm4.la
 libm4_la_SOURCES       = builtin.c debug.c hash.c input.c \
                          ltdl.c m4.c m4private.h macro.c module.c output.c \
                          path.c symtab.c syntax.c utility.c
-libm4_la_LIBADD                = $(top_builddir)/gnulib/m4/libgnu.la 
$(LIBADD_DL)
+libm4_la_LIBADD                = $(top_builddir)/gnulib/m4/libgnu.la \
+                         $(LTLIBINTL) $(LIBADD_DL)
 
 module.o module.lo: module.c pathconf.h
 pathconf.h: Makefile
Index: modules/Makefile.am
===================================================================
RCS file: /cvsroot/m4/m4/modules/Makefile.am,v
retrieving revision 1.26
diff -u -p -u -r1.26 Makefile.am
--- modules/Makefile.am 18 Nov 2003 17:14:45 -0000 1.26
+++ modules/Makefile.am 1 Dec 2003 15:00:15 -0000
@@ -18,7 +18,6 @@
 ##
 ## Written by Gary V. Vaughan <address@hidden>
 
-DISTCLEANFILES = perlxsi.c
 MAINTAINERCLEANFILES = Makefile.in
 
 testsubdir             = testSubDir
@@ -32,8 +31,8 @@ EXTRA_DIST = modtest.m4 shadow.m4 time.m
 AM_CPPFLAGS    = -I$(top_builddir) -I$(top_srcdir) \
                  -I$(top_builddir)/gnulib -I$(top_srcdir)/gnulib \
                  -I$(top_builddir)/m4 -I$(top_srcdir)/m4 $(INTLINCL)
-LIBS = $(top_builddir)/m4/libm4.la
-AM_LDFLAGS = -no-undefined
+AM_LDFLAGS     = -no-undefined -module
+LIBS           = $(top_builddir)/m4/libm4.la
 
 pkgmodinclude_HEADERS  = m4.h
 pkglibexec_LTLIBRARIES = gnu.la load.la m4.la traditional.la \
@@ -41,56 +40,19 @@ pkglibexec_LTLIBRARIES      = gnu.la load.la 
 
 if USE_GMP
 pkglibexec_LTLIBRARIES += mpeval.la
+EXTRA_mpeval_la_SOURCES        = evalparse.c
+mpeval_la_LIBADD       = $(LIBADD_GMP)
 endif
 
-gnu_la_SOURCES         = gnu.c
 EXTRA_gnu_la_SOURCES   = format.c
-gnu_la_LDFLAGS         = -module
-gnu_la_LIBADD          = $(LTLIBINTL)
-
-load_la_SOURCES        = load.c
-load_la_LDFLAGS        = -module
-load_la_LIBADD = $(LTLIBINTL)
-
-m4_la_SOURCES          = m4.c
 EXTRA_m4_la_SOURCES    = evalparse.c
-m4_la_LDFLAGS          = -module
-m4_la_LIBADD           = $(LTLIBINTL)
 
-mpeval_la_SOURCES      = mpeval.c
-EXTRA_mpeval_la_SOURCES        = evalparse.c
-mpeval_la_LDFLAGS      = -module
-mpeval_la_LIBADD       = $(LIBADD_GMP) $(LTLIBINTL)
 
-traditional_la_SOURCES = traditional.c
-traditional_la_LDFLAGS = -module
-traditional_la_LIBADD  = $(LTLIBINTL)
-
-modtest_la_SOURCES     = modtest.c
-modtest_la_LDFLAGS     = -module
-modtest_la_LIBADD      = $(LTLIBINTL)
-
-import_la_SOURCES      = import.c
-import_la_LDFLAGS      = -module
-import_la_LIBADD       = $(LTLIBINTL)
-
-perl_la_SOURCES        = perl.c
-perl_la_CFLAGS = `perl -MExtUtils::Embed -e ccopts`
-perl_la_LDFLAGS        = -module `perl -MExtUtils::Embed -e ldopts`
-perl_la_LIBADDD        = $(LTLIBINTL)
-
-shadow_la_SOURCES      = shadow.c
-shadow_la_LDFLAGS      = -module
-shadow_la_LIBADD       = $(LTLIBINTL)
-
-stdlib_la_SOURCES      = stdlib.c
-stdlib_la_LDFLAGS      = -module
-stdlib_la_LIBADD       = $(LTLIBINTL)
-
-time_la_SOURCES        = time.c
-time_la_LDFLAGS        = -module
-time_la_LIBADD = $(LTLIBINTL)
-
-BUILT_SOURCES = perlxsi.c
-perlxsi.c:
-       perl -MExtUtils::Embed -e xsinit -- -o perlxsi.c
+## Disabled for now.  It is too fragile to be useful.
+## pkglibexec_LTLIBRARIES += perl.la
+##perl_la_CFLAGS               = `perl -MExtUtils::Embed -e ccopts`
+##perl_la_LDFLAGS              = `perl -MExtUtils::Embed -e ldopts`
+##BUILT_SOURCES                = perlxsi.c
+##DISTCLEANFILES               = $(BUILT_SOURCES)
+##perlxsi.c:
+##     perl -MExtUtils::Embed -e xsinit -- -o perlxsi.c