60-gary-remove-libltdl-subconfigury.patch [Was Re: configuring libltdl]

[Gary V. Vaughan]

Bob Friesenhahn wrote:
> The issues I mention are primarily philosophical and religious.
> There is a subversive element of open source society that is willing
> to use Autoconf and Libtool, but not Automake.  The FreeType and
> libJPEG projects come to mind.  If AM_INIT_AUTOMAKE is used, then
> Automake must be installed in order to maintain the package, even if
> the dependent package uses JAM, GNU make, BSD make, Imake, or
> hand-coded traditional make.

Okay, stage 1.  Lets make a start at this and resolve the issues as we find 
them.  As a bonus this shaves another 10% of the dist tarball size.  We are 
already not far off half the size of libtool-1.5.tar.gz! :-)

Okay to commit?

Cheers, 
        Gary.
--
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

Index: ChangeLog
from  Gary V. Vaughan  <address@hidden>
        * libltdl/configure.ac: Removed.
        * configure.ac (AC_CONFIG_HEADERS): Merged from
        libltdl/configure.ac.
        (AC_LIB_LTDL): Ditto.
        (AC_CONFIG_FILES): Add libltdl/Makefile.
        (AC_CONFIG_SUBDIRS): Removed.
        (AC_CONFIG_COMMANDS): Remove generation of libltdl/ltmain.sh.
        * libltdl/Makefile.am (libtool): Removed references, since we now
        share $(top_builddir)/libtool.
        * NEWS: Updated.

2003-11-26  Gary V. Vaughan  <address@hidden>

Index: NEWS
===================================================================
RCS file: /cvsroot/libtool/libtool/NEWS,v
retrieving revision 1.128
diff -u -p -u -r1.128 NEWS
--- NEWS 18 Nov 2003 22:39:34 -0000 1.128
+++ NEWS 26 Nov 2003 18:44:06 -0000
@@ -4,6 +4,8 @@ New in 1.5b: 2003-??-??; CVS version 1.5
 * libtool script is now created by config.status.  Instead of interrogating
   `./libtool' from configure.ac after calling AC_PROG_LIBTOOL, use the
   variable names directly.
+* libltdl is no longer a self-contained package, and shares configury with
+  the top level directory now.
 * --tag, --silent and --debug options are preserved and reused when libtool
   calls itself for relinking etc.
 * -no-suppress in compile mode shows compiler output for both PIC and non-PIC
Index: bootstrap
===================================================================
RCS file: /cvsroot/libtool/libtool/bootstrap,v
retrieving revision 1.34
diff -u -p -u -r1.34 bootstrap
--- bootstrap 25 Nov 2003 15:48:22 -0000 1.34
+++ bootstrap 26 Nov 2003 18:44:06 -0000
@@ -36,7 +36,7 @@ EOF
 
 rm -rf `find . \( -name autom4te.cache -o -name libtool \) -print`
 
-fakes="config/ltmain.sh config/libtoolize libltdl/ltmain.sh"
+fakes="config/ltmain.sh config/libtoolize"
 if test -z "$reconfdirs"; then
   reconfdirs=". `ls -1d tests/*demo tests/*demo[0-9]`"
 fi
Index: configure.ac
===================================================================
RCS file: /cvsroot/libtool/libtool/configure.ac,v
retrieving revision 1.27
diff -u -p -u -r1.27 configure.ac
--- configure.ac 26 Nov 2003 12:34:22 -0000 1.27
+++ configure.ac 26 Nov 2003 18:44:06 -0000
@@ -25,6 +25,7 @@ AC_PREREQ(2.58) ## We use AS_HELP_STRING
 ## Autoconf initialisation. ##
 ## ------------------------ ##
 AC_INIT([libtool], [1.5a], address@hidden)
+AC_CONFIG_HEADERS([libltdl/config.h:libltdl/config-h.in])
 AC_CONFIG_SRCDIR([ltmain.in])
 AC_CONFIG_AUX_DIR([config])
 
@@ -125,9 +126,7 @@ AC_ARG_ENABLE(ltdl-install,
     [AS_HELP_STRING([--disable-ltdl-install], [do not install libltdl])])
 if test x"${enable_ltdl_install+set}" != xset; then
   enable_ltdl_install=yes
-  ac_configure_args="$ac_configure_args --enable-ltdl-install"
 fi
-AC_CONFIG_SUBDIRS([libltdl])
 
 # All subdirectories that are configured on demand, but that must be
 # included in the distribution.  This substitution is for tests/Makefile.am,
@@ -179,16 +178,15 @@ AM_CONDITIONAL(HAVE_RC, [test "x$RC" != 
 ## Libtool initialisation. ##
 ## ----------------------- ##
 AC_CONFIG_FILES([config/ltmain.sh:./ltmain.in])
-AC_CONFIG_COMMANDS([libltdl/ltmain.sh],
-    [cp -f config/ltmain.sh libltdl/ltmain.sh])
 AC_LIBTOOL_DLOPEN
 AC_LIBTOOL_WIN32_DLL
 AC_PROG_LIBTOOL
+AC_LIB_LTDL
 
 
 
 ## -------- ##
 ## Outputs. ##
 ## -------- ##
-AC_CONFIG_FILES([Makefile doc/Makefile tests/Makefile])
+AC_CONFIG_FILES([Makefile libltdl/Makefile doc/Makefile tests/Makefile])
 AC_OUTPUT
Index: config/config.guess
===================================================================
RCS file: /cvsroot/libtool/libtool/config/config.guess,v
retrieving revision 1.7
diff -u -p -u -r1.7 config.guess
--- config/config.guess 12 Nov 2003 18:37:26 -0000 1.7
+++ config/config.guess 26 Nov 2003 18:44:06 -0000
@@ -3,7 +3,7 @@
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
 #   2000, 2001, 2002, 2003 Free Software Foundation, Inc.
 
-timestamp='2003-10-16'
+timestamp='2003-10-20'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -997,6 +997,9 @@ EOF
     i*86:atheos:*:*)
        echo ${UNAME_MACHINE}-unknown-atheos
        exit 0 ;;
+       i*86:syllable:*:*)
+       echo ${UNAME_MACHINE}-pc-syllable
+       exit 0 ;;
     i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
        echo i386-unknown-lynxos${UNAME_RELEASE}
        exit 0 ;;
@@ -1226,6 +1229,9 @@ EOF
        exit 0 ;;
     SEI:*:*:SEIUX)
         echo mips-sei-seiux${UNAME_RELEASE}
+       exit 0 ;;
+    *:DRAGONFLY:*:*)
+       echo ${UNAME_MACHINE}-unknown-dragonfly${UNAME_RELEASE}
        exit 0 ;;
 esac
 
Index: config/config.sub
===================================================================
RCS file: /cvsroot/libtool/libtool/config/config.sub,v
retrieving revision 1.7
diff -u -p -u -r1.7 config.sub
--- config/config.sub 12 Nov 2003 18:37:26 -0000 1.7
+++ config/config.sub 26 Nov 2003 18:44:06 -0000
@@ -3,7 +3,7 @@
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
 #   2000, 2001, 2002, 2003 Free Software Foundation, Inc.
 
-timestamp='2003-11-03'
+timestamp='2003-11-20'
 
 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
@@ -1152,7 +1152,7 @@ case $os in
              | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
              | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
              | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
-             | -powermax* | -dnix* | -nx6 | -nx7 | -sei*)
+             | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly*)
        # Remember, each alternative MUST END IN *, to match a version number.
                ;;
        -qnx*)
@@ -1214,6 +1214,9 @@ case $os in
                ;;
        -atheos*)
                os=-atheos
+               ;;
+       -syllable*)
+               os=-syllable
                ;;
        -386bsd)
                os=-bsd
Index: libltdl/Makefile.am
===================================================================
RCS file: /cvsroot/libtool/libtool/libltdl/Makefile.am,v
retrieving revision 1.43
diff -u -p -u -r1.43 Makefile.am
--- libltdl/Makefile.am 25 Sep 2003 11:22:28 -0000 1.43
+++ libltdl/Makefile.am 26 Nov 2003 18:44:06 -0000
@@ -28,10 +28,6 @@ libltdlc_la_LIBADD = $(LIBADD_DL)
 ## Because we do not have automatic dependency tracking:
 ltdl.lo: ltdl.h config.h
 
-$(libltdl_la_OBJECTS) $(libltdlc_la_OBJECTS): libtool
-libtool: $(LIBTOOL_DEPS)
-       $(SHELL) ./config.status --recheck
-
 ## This allows us to install libltdl without using ln and without creating
 ## a world writeable directory.
 ## FIXME:  Remove this rule once automake can do this properly by itself.
Index: libltdl/configure.ac
===================================================================
RCS file: libltdl/configure.ac
diff -N libltdl/configure.ac
--- libltdl/configure.ac 14 Nov 2003 17:28:28 -0000 1.11
+++ /dev/null   1 Jan 1970 00:00:00 -0000
@@ -1,78 +0,0 @@
-## Process this file with autoconf to create configure. -*- autoconf -*-
-# Copyright (C) 2001, 2003 Free Software Foundation, Inc.
-#
-# 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
-
-
-## FIXME: Is this really new enough? ##
-AC_PREREQ(2.50)
-
-
-## ------------------------ ##
-## Autoconf initialisation. ##
-## ------------------------ ##
-AC_INIT([libltdl], [1.3], address@hidden)
-AC_CONFIG_HEADERS([config.h:config-h.in])
-AC_CONFIG_SRCDIR([ltdl.c])
-
-
-## ------------------------------- ##
-## Libltdl specific configuration. ##
-## ------------------------------- ##
-
-if test -z "$enable_ltdl_install$enable_ltdl_convenience"; then
-  if test -f ltmain.sh; then
-    # if libltdl is libtoolized, it is assumed to be stand-alone and
-    # installed unless the command line overrides it (tested above)
-    enable_ltdl_install=yes
-  else
-    AC_MSG_WARN([*** The top-level configure must select either])
-    AC_MSG_WARN([*** AC@&address@hidden or AC@&address@hidden)
-    AC_MSG_ERROR([*** Maybe you want to --enable-ltdl-install?])
-  fi
-fi
-
-
-## ------------------------ ##
-## Automake Initialisation. ##
-## ------------------------ ##
-AM_INIT_AUTOMAKE
-
-
-## ------------------ ##
-## C compiler checks. ##
-## ------------------ ##
-AC_PROG_CC
-AC_C_CONST
-AC_C_INLINE
-
-
-## ----------------------- ##
-## Libtool initialisation. ##
-## ----------------------- ##
-AC_LIBTOOL_WIN32_DLL
-AC_LIBTOOL_TAGS([])
-AC_PROG_LIBTOOL
-AC_SUBST([LIBTOOL_DEPS])
-
-AC_LIB_LTDL
-
-
-## -------- ##
-## Outputs. ##
-## -------- ##
-AC_CONFIG_FILES([Makefile])
-AC_OUTPUT

pgp66ooZU3zaw.pgp
Description: PGP signature