From: Gary V. Vaughan Date: Thu, 27 Nov 2003 13:32:33 +0000 (+0000) Subject: * libltdl/configure.ac: Removed. X-Git-Tag: release-1-9b~224 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=306033a153445aeaccef93c6f096060c25ae96fc;p=thirdparty%2Flibtool.git * 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. --- diff --git a/ChangeLog b/ChangeLog index bf67d1f80..8b8acd677 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,16 @@ +2003-11-27 Gary V. Vaughan + + * 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 * Makefile.am (vcl.tmp): Be careful of VPATH builds. diff --git a/NEWS b/NEWS index 67dc329ec..6b72c2d12 100644 --- a/NEWS +++ b/NEWS @@ -4,6 +4,8 @@ New in 1.5b: 2003-??-??; CVS version 1.5a, Libtool team: * 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 diff --git a/bootstrap b/bootstrap index bf9c6eea9..428cf6e25 100755 --- a/bootstrap +++ b/bootstrap @@ -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 diff --git a/config/config.guess b/config/config.guess index 193e32820..61f2e4c60 100755 --- a/config/config.guess +++ b/config/config.guess @@ -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 ;; @@ -1227,6 +1230,9 @@ EOF SEI:*:*:SEIUX) echo mips-sei-seiux${UNAME_RELEASE} exit 0 ;; + *:DRAGONFLY:*:*) + echo ${UNAME_MACHINE}-unknown-dragonfly${UNAME_RELEASE} + exit 0 ;; esac #echo '(No uname command or uname output not recognized.)' 1>&2 diff --git a/config/config.sub b/config/config.sub index e1e455b77..fac519512 100755 --- a/config/config.sub +++ b/config/config.sub @@ -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*) @@ -1215,6 +1215,9 @@ case $os in -atheos*) os=-atheos ;; + -syllable*) + os=-syllable + ;; -386bsd) os=-bsd ;; diff --git a/configure.ac b/configure.ac index e1366eea2..2fb281461 100644 --- a/configure.ac +++ b/configure.ac @@ -25,6 +25,7 @@ AC_PREREQ(2.58) ## We use AS_HELP_STRING ## Autoconf initialisation. ## ## ------------------------ ## AC_INIT([libtool], [1.5a], [bug-libtool@gnu.org]) +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" != xno]) ## 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 diff --git a/libltdl/Makefile.am b/libltdl/Makefile.am index 329958aec..4d28542f4 100644 --- a/libltdl/Makefile.am +++ b/libltdl/Makefile.am @@ -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. diff --git a/libltdl/configure.ac b/libltdl/configure.ac deleted file mode 100644 index d235f1d3e..000000000 --- a/libltdl/configure.ac +++ /dev/null @@ -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], [bug-libtool@gnu.org]) -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@&t@_LIBLTDL_INSTALLABLE or AC@&t@_LIBLTDL_CONVENIENCE.]) - 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