* m4/lt~obsolete.m4: Add a file containing aclocal-fooling

macro definitions which stop the contents of an installed
libtool.m4 ending up in our aclocal.m4 when we bootstrap.
* Makefile.am (pkgmacro_DATA): Note that we don't need to add
lt~obsolete.m4 to this list.

* m4/libtool.m4 (_LT_COPYING): Factor out copyright message so it

diff --git a/ChangeLog b/ChangeLog
index 5116cecf5b1965cc10d6d207f5275e422cc3d6fb..c7ba936fd2b0580a178f9d6da304ea7ad40c4c2d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,14 @@
+2004-01-15  Scott James Remnant  <scott@netsplit.com>
+
+       * m4/lt~obsolete.m4: Add a file containing aclocal-fooling
+       macro definitions which stop the contents of an installed
+       libtool.m4 ending up in our aclocal.m4 when we bootstrap.
+       * Makefile.am (pkgmacro_DATA): Note that we don't need to add
+       lt~obsolete.m4 to this list.
+
 2004-01-12  Gary V. Vaughan  <gary@gnu.org>
 
-        * m4/libtool.m4 (_LT_COPYING): Factor out copyright message so it
+       * m4/libtool.m4 (_LT_COPYING): Factor out copyright message so it
        only needs to be updated in one place.
        (AC_LIBTOOL_CONFIG): Refactor to be more readable.  Only add
        tags if a compiler was found; ie if you have no gcj compiler,

diff --git a/Makefile.am b/Makefile.am
index f2ab94d546b6d22bce53efaf5099d687acd7b7df..2aab205d8d9509b50a8eb61f789300d1f399b2b1 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -33,6 +33,7 @@ pkgdata_SCRIPTS = config/config.guess config/config.sub
 pkgdata_DATA = config/ltmain.sh
 
 # Me maintain our own macros to provent problems with ancient definitions.
+# lt~obsolete.m4 doesn't belong here, it's for bootstrapping us only
 pkgmacrodir = $(pkgdatadir)/m4
 pkgmacro_DATA = m4/libtool.m4 m4/ltdl.m4 m4/ltsugar.m4
 

diff --git a/m4/lt~obsolete.m4 b/m4/lt~obsolete.m4
new file mode 100644 (file)
index 0000000..5b46491
--- /dev/null
+++ b/m4/lt~obsolete.m4
@@ -0,0 +1,56 @@
+# lt~obsolete.m4 -- aclocal satisfying obsolete definitions.    -*-Autoconf-*-
+# 
+# Copyright (C) 2004 Free Software Foundation, Inc.
+# Written by Scott James Remnant.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+#
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+# serial 1
+
+# These exist entirely to fool aclocal when bootstrapping libtool.
+#
+# In the past libtool.m4 has provided macros via AC_DEFUN (or AU_DEFUN)
+# which have later been changed to m4_define as they aren't part of the
+# exported API, or moved to Autoconf or Automake where they belong.
+#
+# The trouble is, aclocal is a bit thick.  It'll see the old AC_DEFUN
+# in /usr/share/aclocal/libtool.m4 and remember it, then when it sees us
+# using a macro with the same name in our local m4/libtool.m4 it'll
+# pull the old libtool.m4 in (it doesn't see our shiny new m4_define
+# and doesn't know about Autoconf macros at all.)
+# 
+# So we provide this file, which has a silly filename so it's always
+# included after everything else.  This provides aclocal with the
+# AU_DEFUNs it wants, but when m4 processes it, it doesn't do anything
+# because those macros already exist.
+# 
+# Anytime we withdraw an AC_DEFUN or AU_DEFUN, but still refer to it,
+# remember to add it here.
+
+m4_ifdef([AC_LIBTOOL_CONFIG], [], [AU_DEFUN([AC_LIBTOOL_CONFIG])])dnl
+m4_ifdef([AC_LIBTOOL_LINKER_OPTION], [], [AU_DEFUN([AC_LIBTOOL_LINKER_OPTION])])dnl
+m4_ifdef([AC_PROG_EGREP], [], [AU_DEFUN([AC_PROG_EGREP])])dnl
+m4_ifdef([_LT_AC_LANG_C_CONFIG], [], [AU_DEFUN([_LT_AC_LANG_C_CONFIG])])dnl
+m4_ifdef([_LT_AC_LANG_GCJ_CONFIG], [], [AU_DEFUN([_LT_AC_LANG_GCJ_CONFIG])])dnl
+m4_ifdef([_LT_AC_LANG_RC_CONFIG], [], [AU_DEFUN([_LT_AC_LANG_RC_CONFIG])])dnl
+m4_ifdef([_LT_AC_PROG_ECHO_BACKSLASH], [], [AU_DEFUN([_LT_AC_PROG_ECHO_BACKSLASH])])dnl
+m4_ifdef([_LT_AC_SHELL_INIT], [], [AU_DEFUN([_LT_AC_SHELL_INIT])])dnl
+m4_ifdef([_LT_AC_SYS_LIBPATH_AIX], [], [AU_DEFUN([_LT_AC_SYS_LIBPATH_AIX])])dnl
+m4_ifdef([_LT_AC_TAGVAR], [], [AU_DEFUN([_LT_AC_TAGVAR])])dnl