[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: support standalone libltdl [libtool--gary--1.0--patch-23]
|
From: |
Gary V. Vaughan |
|
Subject: |
Re: support standalone libltdl [libtool--gary--1.0--patch-23] |
|
Date: |
Mon, 22 Aug 2005 17:26:23 +0100 |
|
User-agent: |
Mozilla Thunderbird 1.0 (X11/20050305) |
Hallo Ralf,
Ralf Wildenhues wrote:
* Gary V. Vaughan wrote on Mon, Aug 22, 2005 at 09:28:59AM CEST:
Okay, addressed below and attached new version of the full patch.
You forgot to
- kill all use of `#' except within comments from Makefile.am
(from your patch)
D'oh! Wrong patch, but I'd missed the other occurence anyway. Fixed.
- change "sed '...{ };d'" to "sed -n '...{ }'" in all cases
D'oh! Wrong patch, but I'd missed the other occurence anyway. Fixed.
(hmm, is there an echo in here? ;-))
| -install-data-local:
| +install-data-local: libltdl/Makefile.in
| ## Don't install over the top of an old pkgdatadir
| -rm -rf $(DESTDIR)$(pkgdatadir)
*snip*
| - chown -R root $(DESTDIR)$(ltdldatadir) && \
| - chgrp -R root $(DESTDIR)$(ltdldatadir) || :
This install-data-local rule needs to be killed. I mean it. Read my
proposed patch to that extent
http://lists.gnu.org/archive/html/libtool/2005-08/msg00084.html
and the thread that led to it, no need to iterate the arguments yet
again.
The only reason I have not applied my proposed patch yet is that I
know it conflicts with your patch.
Agreed. But that is orthogonal. If you want to commit yours first,
I'll merge before my commit... and vice versa.
OK. Since mine works better when libltdl/configure is actually created,
I'll leave you to commit first, when your patch is ready. I definitely
want this story over as soon as possible.
Ah, yes. I see what you mean now. Unfortunately, I don't think your
patch will always work -- because of timestamp dependencies between
$prefix/share/aclocal, $prefix/share/libtool/libltdl,
$prefix/share/libtool/libltdl/libltdl,
$prefix/share/libtool/libltdl/loaders and
$prefix/share/libtool/libltdl/config :-(
I think we need a giant nobase_libtool_DATA that lists all these files
in the right order, and then some directory shuffling in install-hook to
put everything in the right place in the install tree. And maybe some
libtoolize twiddling to find everything correctly...
[[snip]]
No. All you need to do is specify all files in the correct order,
and then have them installed and uninstalled by Automaken rules
(something like `aclocal_DATA = $(aclocalfiles)' should suffice).
We might have to forbid parallel "make install". I don't mind.
Oh, well. If you don't fix this, then I'll just have to put this in
my patch as well, I guess.
I'll leave it for your patch, both to keep mine from getting any bigger,
and because of my thoughts above...
| .PHONY: web-manual
| web-manual:
| - @$(LN_S) $(top_srcdir)/doc/libtool.texi doc/manual.texi
| + @$(LN_S) $(srcdir)/doc/libtool.texi doc/manual.texi
Now that I see it: This rule is broken, the target may not have a
directory component. Do like this:
+ @cd doc && $(LN_S) $(srcdir)/doc/libtool.texi manual.texi
Why? As long as the first argument is an absolute path it works fine.
I don't know of any host that doesn't support this use.
The first argument is _not_ an absolute path in general. And now that
I see it, my replacement is broken as well, of course. This really is
orthogonal to your patch, though, so you might leave that as-is.
Okay.
| +* Support for libltdl in non-autotooled projects.
Erm, this used to work with branch-1-5.
So, it's not a new feature, it's fixing a regression.
Ah yes, good call :-) Removed.
Oh, it'd still be good news to a lot of people that HEAD is finally a
bit less broken, so you might want to mention _that_. :))
Ooh! Cheeky monkey! :-p Fixed.
The attached now passes distcheck.
Does it pass `make install'?
Yes. This one too. Also distcheck and installcheck still pass.
Can you libtoolize and libtoolize --ltdl
a client package from the installed?
Yes. I've added writing a test for this to my TODO:
http://tkd.kicks-ass.net/WebWiki/GnuLibtoolProject/ToDo/LibtoolizeTest
| DEFS = -DHAVE_CONFIG_H="<$(CONFIG_H)>" -DLTDL
| -AM_CPPFLAGS = -I. -I$(srcdir) -I$(srcdir)/libltdl
| +AM_CPPFLAGS = -I. -Ilibltdl -I$(srcdir)/libltdl \
| + -I$(srcdir)/libltdl
You won't believe it, but I put that -I$(srcdir) in there for a reason:
The libltdl user might build libltdl with a sub-Automake but not as a
subpackage and use the nostdinc Automake option.
Well spotted. Bad merge I guess. Fixed.
another small nit: This
| +$(srcdir)/libltdl/Makefile.in: libltdl/Makefile.am
| + @echo ' cd $(srcdir)/libltdl && $(AUTOMAKE) Makefile'; \
| + cd $(srcdir)/libltdl && $(AUTOMAKE) Makefile
is shorter written like this:
+$(srcdir)/libltdl/Makefile.in: libltdl/Makefile.am
+ cd $(srcdir)/libltdl && $(AUTOMAKE) Makefile
Err... maybe I was unrolling a loop, and then optimised to just
one case? Yes, that must be it. *blush*
My idea of reviewing is: if I don't allow through a patch with known
regressions, things will eventually have to get better. So I don't
approve of this patch, because it introduces regressions.
Works for me :-D
Cheers,
Gary.
--
Gary V. Vaughan ())_. address@hidden,gnu.org}
Research Scientist ( '/ http://tkd.kicks-ass.net
GNU Hacker / )= http://www.gnu.org/software/libtool
Technical Author `(_~)_ http://sources.redhat.com/autobook
? +build
? +dest
? +inst
? .cvslog-tlasync
? libltdl/INSTALL
? libltdl/Makefile.am.undo
? libltdl/config
? libltdl/m4
? tests/Makefile.am.new
? tests/functests.at
? tests/libtoolize.at.new
? tests/testsuite.at.new
? tests/testsuite.log
Index: ChangeLog
===================================================================
RCS file: /cvsroot/libtool/libtool/ChangeLog,v
retrieving revision 1.2021
diff -u -p -r1.2021 ChangeLog
--- ChangeLog 21 Aug 2005 18:53:14 -0000 1.2021
+++ ChangeLog 22 Aug 2005 16:14:14 -0000
@@ -1,3 +1,74 @@
+2005-08-19 Gary V. Vaughan <address@hidden>
+
+ Reorganise the libtool tree to create a bootstrapped libltdl for
+ installation to the libtoolize master tree, so that libltdl is
+ useable even in the extreme case of when automake and autoconf are
+ not installed on the developers machine. Part of this change
+ requires some duplication of rules between Makefile.am (which
+ builds libltdl for this distribution) and libltdl/Makefile.am
+ (which is used by projects that libltoolize --ltdl --copy), so
+ libtool now really does use a single toplevel Makefile.am, and we
+ generate libltdl/Makefile.am from that:
+
+ * m4, config: Moved from here...
+ * libltdl/m4, libltdl/config: ...to here, to reduce the amount of
+ kludging needed in bootstrap for autoreconf to run.
+ * tests/cdemo/Makefile.am, tests/demo/Makefile.am,
+ tests/depdemo/Makefile.am, tests/f77demo/Makefile.am,
+ tests/fcdemo/Makefile.am, tests/mdemo/Makefile.am,
+ tests/mdemo2/Makefile.am, tests/pdemo/Makefile.am,
+ tests/tagdemo/Makefile.am (ACLOCAL_AMFLAGS): Adjust to
+ compensate.
+ * tests/cdemo/configure.ac, tests/demo/configure.ac,
+ tests/depdemo/configure.ac, tests/f77demo/configure.ac,
+ tests/fcdemo/configure.ac, tests/mdemo/configure.ac,
+ tests/mdemo2/configure.ac, tests/pdemo/configure.ac,
+ tests/tagdemo/configure.ac (AC_CONFIG_AUX_DIR): Ditto.
+ * libltdl/m4/ltdl.m4: Increment serial number.
+ (LTDL_INIT): Accept an optional directory argument to prefix each
+ of the LD_DLLOADERS locations. Default to empty for backwards
+ compatibility.
+ * Makefile.maint: Adjust to compensate.
+ * configure.ac (AC_CONFIG_AUX_DIR, AC_CONFIG_MACRO_DIR): Adjust.
+ (AC_CONFIG_LIBOBJ_DIR): Set here so that we can build LTLIBOBJS
+ from in a subdirectory from the amalgamated Makefile.am.
+ (AM_PROG_CC_C_O, AM_INIT_AUTOMAKE): Use subdir-objects.
+ (AC_CONFIG_FILES): Remove libltdl/Makefile.am.
+ * libltdl/Makefile.am: Removed from repository, and merged into
+ Makefile.am as we now generate it...
+ * Makefile.am (libltdl/Makefile.am): ...from here, by extracting
+ the merged rules, and tweaking paths to accomodate the difference
+ in directory from Makefile.am to libltdl/Makefile.am.
+ (nobase_dist_pkgdata_DATA): Automake generated installation rules
+ change timestamps of installed files, so renamed this...
+ (configauxfiles): ...to this...
+ (libtoolize): ...substitute it...
+ (install-data-local): ...install manually, preserving
+ timestamps...
+ (install-data-hook): ...and set execute bit as appropriate.
+ (uninstall-hook): Not forgetting to remove them at uninstall.
+ (libltdl/Makefile.in): New rule. Called from...
+ * bootstrap: ...here to avoid relying on config.status at
+ bootstrap time.
+ (auxdir, m4dir): Extract from configure.ac for ease of future
+ maintenance. Adjust all references.
+ (reconfdirs): Call autoreconf for libltdl too -- even
+ though we don't use it for the build, libltdl/configure and
+ friends are installed with `libtoolize --ltdl --copy'.
+ * libtoolize.m4sh: Add files from the installed config master tree
+ to libtoolize --ltdl project subdirectory.
+ Diagnose duplicated files when --ltdl is used in an autotooled
+ project.
+ It's perfectly fine to run `libtoolize --ltdl --copy' in a tree
+ that has no configure.ac or configure.in; we want libltdl to be
+ useful even to projects that don't use autotools themselves.
+ (libtoolize_flags): Removed. Changed all callers.
+ (func_massage_pkgconfig_files): New function.
+ * tests/standalone.at: New tests for using libltdl without
+ supporting configury in the parent project.
+ * tests/testsuite.at: Run them!
+ * NEWS: Updated.
+
2005-08-21 Gary V. Vaughan <address@hidden>
* libltdl/Makefile.am: revert mistaken commit.
@@ -105,10 +176,12 @@
_LT_SYS_HIDDEN_LIBDEPS): Adjusted.
* tests/fcdemo-conf.test, tests/fcdemo-exec.test,
tests/fcdemo-make.test, tests/fcdemo-shared.test,
- tests/fcdemo-static.test, tests/fcdemo/Makefile.am, tests/fcdemo/README,
- tests/fcdemo/configure.ac, tests/fcdemo/cprogram.c, tests/fcdemo/foo.h,
- tests/fcdemo/fooc.c, tests/fcdemo/foof.f90, tests/fcdemo/foof2.f90,
- tests/fcdemo/foof3.f90, tests/fcdemo/fprogram.f90: New tests for
Fortran.
+ tests/fcdemo-static.test, tests/fcdemo/Makefile.am,
+ tests/fcdemo/README, tests/fcdemo/configure.ac,
+ tests/fcdemo/cprogram.c, tests/fcdemo/foo.h, tests/fcdemo/fooc.c,
+ tests/fcdemo/foof.f90, tests/fcdemo/foof2.f90,
+ tests/fcdemo/foof3.f90, tests/fcdemo/fprogram.f90: New tests for
+ Fortran.
* tests/convenience.at: Extended.
* Makefile.am, configure.ac: Adjusted.
* NEWS: Updated.
@@ -125,8 +198,8 @@
* config/ltmain.m4sh (func_mode_link) <cwrappersource>: Add
missing bit from Christoph's patch.
- * m4/libtool.m4 (_LT_LINKER_HARDCODE_LIBPATH, _LT_LINKER_SHLIBS,
- _LT_LANG_CXX_CONFIG): Comment typos.
+ * m4/libtool.m4 (_LT_LINKER_HARDCODE_LIBPATH, _LT_LINKER_SHLIBS)
+ (_LT_LANG_CXX_CONFIG): Comment typos.
2005-08-04 Christoph Egger <address@hidden>
Index: Makefile.am
===================================================================
RCS file: /cvsroot/libtool/libtool/Makefile.am,v
retrieving revision 1.156
diff -u -p -r1.156 Makefile.am
--- Makefile.am 18 Aug 2005 17:07:17 -0000 1.156
+++ Makefile.am 22 Aug 2005 16:14:14 -0000
@@ -22,12 +22,28 @@
## the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
## Boston, MA 02110-1301, USA.
-ACLOCAL_AMFLAGS = -I m4
+ACLOCAL_AMFLAGS = -I libltdl/m4
-BUILD_SUBDIRS = . libltdl
-SUBDIRS = $(BUILD_SUBDIRS)
-DIST_SUBDIRS = $(BUILD_SUBDIRS)
-EXTRA_DIST =
+DIST_SUBDIRS = .
+
+BUILT_SOURCES = libtool
+
+CLEANFILES =
+MOSTLYCLEANFILES =
+DISTCLEANFILES =
+
+EXTRA_DIST = libltdl/COPYING.LIB \
+ libltdl/Makefile.am \
+ libltdl/Makefile.in \
+ libltdl/README \
+ libltdl/config-h.in \
+ libltdl/configure \
+ libltdl/configure.ac \
+ libltdl/aclocal.m4 \
+ libltdl/m4/lt~obsolete.m4
+
+auxdir = libltdl/config
+m4dir = libltdl/m4
# Using `cd' in backquotes may print the directory name, use this instead:
lt__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
@@ -47,6 +63,7 @@ libtoolize: $(srcdir)/libtoolize.in
$(edit) -e "s,@TIMESTAMP\@,$$TIMESTAMP,g" \
-e 's,@aclocal_DATA\@,$(aclocalfiles),g' \
-e "s,@pkgltdl_files\@,$(ltdldatafiles),g" \
+ -e "s,@pkgconfig_files\@,$(auxfiles),g" \
$(srcdir)/libtoolize.in > libtoolize.tmp
chmod a+x libtoolize.tmp
chmod a-w libtoolize.tmp
@@ -58,9 +75,9 @@ EXTRA_DIST += libtoolize.m4sh
$(srcdir)/libtoolize.in: $(sh_files) libtoolize.m4sh Makefile.am
cd $(srcdir); \
rm -f libtoolize.in; \
- $(M4SH) -B ./config libtoolize.m4sh > libtoolize.in
+ $(M4SH) -B $(auxdir) libtoolize.m4sh > libtoolize.in
-libtool: $(top_builddir)/config.status $(srcdir)/config/ltmain.sh \
+libtool: $(top_builddir)/config.status $(srcdir)/$(auxdir)/ltmain.sh \
$(srcdir)/stamp-vcl
cd $(top_builddir) && $(SHELL) ./config.status $@
@@ -104,32 +121,21 @@ timestamp = set dummy `$(MKSTAMP) < $(sr
*) TIMESTAMP="" ;; \
esac
-sh_files = config/general.m4sh config/getopt.m4sh
-EXTRA_DIST += bootstrap libtoolize.in config/ltmain.m4sh config/mkstamp \
- $(sh_files) stamp-vcl ChangeLog.1996 ChangeLog.1997 \
- ChangeLog.1998 ChangeLog.1999 ChangeLog.2000 ChangeLog.2001 \
- ChangeLog.2002 ChangeLog.2003
-CLEANFILES = libtool libtoolize \
- libtoolize.tmp config/ltmain.tmp m4/ltversion.tmp
-DISTCLEANFILES =
-
-# These are required by libtoolize and must be executable when installed.
-# Since _SCRIPTS gets the program transform applied we make them
-# executable by hand
-nobase_dist_pkgdata_DATA = config/config.guess config/config.sub \
- config/ltmain.sh config/install-sh
-
-# Everything that gets picked up by aclocal is automatically distributed,
-# this is the list of macro files we install on the user's system.
-aclocalfiles = m4/argz.m4 m4/libtool.m4 m4/ltdl.m4 \
- m4/ltoptions.m4 m4/ltsugar.m4 m4/ltversion.m4
+sh_files = $(auxdir)/general.m4sh $(auxdir)/getopt.m4sh
+EXTRA_DIST += bootstrap libtoolize.in $(auxdir)/ltmain.m4sh \
+ $(auxdir)/mkstamp $(sh_files) stamp-vcl \
+ ChangeLog.1996 ChangeLog.1997 ChangeLog.1998 \
+ ChangeLog.1999 ChangeLog.2000 ChangeLog.2001 \
+ ChangeLog.2002 ChangeLog.2003 ChangeLog.2004
+CLEANFILES += libtool libtoolize libtoolize.tmp \
+ $(auxdir)/ltmain.tmp $(m4dir)/ltversion.tmp
## We know that $(srcdir)/ChangeLog has been edited if stamp-vcl
## needs updating, so we assume we have write access to $(srcdir).
## If we try to maintain ./stamp-vcl to avoid writing to a possibly
## read-only $(srcdir), then when the two stamp-vcls differ, distcheck
## will try to update the one in the read-only source tree it makes.
-MKSTAMP = $(SHELL) $(srcdir)/config/mkstamp
+MKSTAMP = $(SHELL) $(srcdir)/$(auxdir)/mkstamp
$(srcdir)/stamp-vcl: vcl-tmp clean-ltmain-sh ChangeLog
vcl-tmp:
@set dummy `$(MKSTAMP) < $(srcdir)/ChangeLog`; shift; \
@@ -144,7 +150,7 @@ vcl-tmp:
## source tree version in current builds.
clean-ltmain-sh:
@-test "$(srcdir)" = "$(top_builddir)" || \
- rm -f "$(top_builddir)/config/ltmain.sh"
+ rm -f "$(top_builddir)/$(auxdir)/ltmain.sh"
# We build ltversion.m4 here, instead of from config.status,
# because config.status is rerun each time one of configure's
@@ -153,40 +159,181 @@ clean-ltmain-sh:
# a loop otherwise.
# Use `$(srcdir)/m4' for the benefit of non-GNU makes: this is
# how ltversion.m4 appears in our dependencies.
-EXTRA_DIST += m4/ltversion.in m4/ltversion.m4
-$(srcdir)/m4/ltversion.m4: m4/ltversion.in configure.ac $(srcdir)/stamp-vcl
+EXTRA_DIST += $(m4dir)/ltversion.in $(m4dir)/ltversion.m4
+$(srcdir)/$(m4dir)/ltversion.m4: $(m4dir)/ltversion.in configure.ac
$(srcdir)/stamp-vcl
set dummy `$(MKSTAMP) < $(srcdir)/ChangeLog`; shift; \
cd $(srcdir); \
- rm -f m4/ltversion.tmp; \
+ rm -f $(m4dir)/ltversion.tmp; \
serial=`echo $$1 | sed 's,^1[.],,g'`; \
input="ltversion.in"; \
$(edit) -e "s,@MACRO_REVISION\@,$$1,g" \
-e "s,@MACRO_SERIAL\@,$$serial,g" \
- m4/ltversion.in > m4/ltversion.tmp; \
- chmod a-w m4/ltversion.tmp; \
- mv -f m4/ltversion.tmp m4/ltversion.m4
+ $(m4dir)/ltversion.in > $(m4dir)/ltversion.tmp; \
+ chmod a-w $(m4dir)/ltversion.tmp; \
+ mv -f $(m4dir)/ltversion.tmp $(m4dir)/ltversion.m4
## And for similar reasons, ltmain.sh can't be built from config.status.
## !WARNING! If you edit this rule to change the contents of ltmain.sh,
-## you must `touch $(srcdir)/config/ltmain.in' from the
+## you must `touch $(srcdir)/$(auxdir)/ltmain.in' from the
## shell if you need ltmain.sh to be regenerated. Ideally, we
## should make this rule depend on Makefile but that will break
## distcheck (at least) by rebuilding ltmain.sh in the source
## tree whenever config.status regenerates the Makefile.
-EXTRA_DIST += config/ltmain.sh
-$(srcdir)/config/ltmain.sh: $(sh_files) config/ltmain.m4sh configure.ac \
+EXTRA_DIST += $(auxdir)/ltmain.sh
+$(srcdir)/$(auxdir)/ltmain.sh: $(sh_files) $(auxdir)/ltmain.m4sh configure.ac \
$(srcdir)/stamp-vcl
$(timestamp); \
cd $(srcdir); \
- rm -f config/ltmain.in config/ltmain.tmp config/ltmain.sh; \
- $(M4SH) -B ./config config/ltmain.m4sh > config/ltmain.in; \
+ rm -f $(auxdir)/ltmain.in $(auxdir)/ltmain.tmp \
+ $(auxdir)/ltmain.sh; \
+ $(M4SH) -B $(auxdir) $(auxdir)/ltmain.m4sh \
+ > $(auxdir)/ltmain.in; \
input="ltmain.m4sh"; \
$(edit) -e "s,@TIMESTAMP\@,$$TIMESTAMP,g" \
-e "s,@package_revision\@,$$1,g" \
- config/ltmain.in > config/ltmain.tmp; \
- rm -f config/ltmain.in; \
- chmod a-w config/ltmain.tmp; \
- mv -f config/ltmain.tmp config/ltmain.sh
+ $(auxdir)/ltmain.in > $(auxdir)/ltmain.tmp; \
+ rm -f $(auxdir)/ltmain.in; \
+ chmod a-w $(auxdir)/ltmain.tmp; \
+ mv -f $(auxdir)/ltmain.tmp $(auxdir)/ltmain.sh
+
+$(srcdir)/libltdl/Makefile.am: Makefile.am
+ cd $(srcdir); \
+ in=Makefile.am; out=libltdl/Makefile.am; \
+ rm -f $$out; \
+ $(SED) -n '/^.. Makefile.am -- /,/^.. Boston, MA/p' $$in > $$out; \
+ { echo 'ACLOCAL_AMFLAGS = -I m4'; \
+ echo 'AUTOMAKE_OPTIONS = foreign'; \
+ echo 'BUILT_SOURCES ='; \
+ echo 'EXTRA_DIST ='; \
+ echo 'CLEANFILES ='; \
+ echo 'MOSTLYCLEANFILES ='; \
+ } >> $$out; \
+ $(SED) -n '/^. %%% BEGIN /,/^. %%% END / \
+ { s,libltdl_,,; s,libltdl/,,; s,: libltdl/,: ,; \
+ s,\$$(libltdl_,$$(,; p; }' $$in >> $$out;
+ chmod a-w $(srcdir)/libltdl/Makefile.am
+
+$(srcdir)/libltdl/Makefile.in: libltdl/Makefile.am
+ cd $(srcdir)/libltdl && $(AUTOMAKE) Makefile
+
+
+## -------- ##
+## Libltdl. ##
+## -------- ##
+
+# %%% BEGIN libltdl/Makefile.am
+
+DEFS = -DHAVE_CONFIG_H="<$(CONFIG_H)>" -DLTDL
+
+# -I$(srcdir) is needed for user that built libltdl with a sub-Automake
+# (not as a sub-package!) using 'nostdinc':
+AM_CPPFLAGS = -I. -I$(srcdir) -Ilibltdl -I$(srcdir)/libltdl \
+ -I$(srcdir)/libltdl/libltdl
+AM_LDFLAGS = -no-undefined
+VERSION_INFO = -version-info 6:0:0
+
+noinst_LTLIBRARIES = $(LT_DLLOADERS)
+
+if INSTALL_LTDL
+ltdlincludedir = $(includedir)/libltdl
+ltdlinclude_HEADERS = libltdl/libltdl/lt_system.h \
+ libltdl/libltdl/lt_error.h \
+ libltdl/libltdl/lt_dlloader.h
+include_HEADERS = libltdl/ltdl.h
+lib_LTLIBRARIES = libltdl/libltdl.la
+endif
+
+if CONVENIENCE_LTDL
+noinst_LTLIBRARIES += libltdl/libltdlc.la
+endif
+
+libltdl_libltdl_la_SOURCES = libltdl/libltdl/lt__alloc.h \
+ libltdl/libltdl/lt__dirent.h \
+ libltdl/libltdl/lt__glibc.h \
+ libltdl/libltdl/lt__private.h \
+ libltdl/libltdl/lt__strl.h \
+ libltdl/libltdl/lt_dlloader.h \
+ libltdl/libltdl/lt_error.h \
+ libltdl/libltdl/lt_system.h \
+ libltdl/libltdl/slist.h \
+ libltdl/loaders/preopen.c \
+ libltdl/lt__alloc.c \
+ libltdl/lt_dlloader.c \
+ libltdl/lt_error.c \
+ libltdl/ltdl.c \
+ libltdl/ltdl.h \
+ libltdl/slist.c
+
+libltdl_libltdl_la_CPPFLAGS = -DLTDLOPEN=$(LTDLOPEN) $(AM_CPPFLAGS)
+libltdl_libltdl_la_LDFLAGS = $(AM_LDFLAGS) $(VERSION_INFO) $(LT_DLPREOPEN)
+libltdl_libltdl_la_LIBADD = $(LTLIBOBJS)
+libltdl_libltdl_la_DEPENDENCIES = $(LT_DLLOADERS) $(LTLIBOBJS)
+
+libltdl_libltdlc_la_SOURCES = $(libltdl_libltdl_la_SOURCES)
+libltdl_libltdlc_la_CPPFLAGS = -DLTDLOPEN=$(LTDLOPEN)c $(AM_CPPFLAGS)
+libltdl_libltdlc_la_LDFLAGS = $(AM_LDFLAGS) $(LT_DLPREOPEN)
+libltdl_libltdlc_la_LIBADD = $(libltdl_libltdl_la_LIBADD)
+libltdl_libltdlc_la_DEPENDENCIES= $(libltdl_libltdl_la_DEPENDENCIES)
+
+## The loaders are preopened by libltdl, itself always built from
+## pic-objects (either as a shared library, or a convenience library),
+## so the loaders themselves must be made from pic-objects too. We
+## use convenience libraries for that purpose:
+EXTRA_LTLIBRARIES = libltdl/dlopen.la \
+ libltdl/dld_link.la \
+ libltdl/dyld.la \
+ libltdl/load_add_on.la \
+ libltdl/loadlibrary.la \
+ libltdl/shl_load.la
+
+libltdl_dlopen_la_SOURCES = libltdl/loaders/dlopen.c
+libltdl_dlopen_la_LDFLAGS = -module -avoid-version
+libltdl_dlopen_la_LIBADD = $(LIBADD_DLOPEN)
+
+libltdl_dld_link_la_SOURCES = libltdl/loaders/dld_link.c
+libltdl_dld_link_la_LDFLAGS = -module -avoid-version
+libltdl_dld_link_la_LIBADD = -ldld
+
+libltdl_dyld_la_SOURCES = libltdl/loaders/dyld.c
+libltdl_dyld_la_LDFLAGS = -module -avoid-version
+
+libltdl_load_add_on_la_SOURCES = libltdl/loaders/load_add_on.c
+libltdl_load_add_on_la_LDFLAGS = -module -avoid-version
+
+libltdl_loadlibrary_la_SOURCES = libltdl/loaders/loadlibrary.c
+libltdl_loadlibrary_la_LDFLAGS = -module -avoid-version
+
+libltdl_shl_load_la_SOURCES = libltdl/loaders/shl_load.c
+libltdl_shl_load_la_LDFLAGS = -module -avoid-version
+libltdl_shl_load_la_LIBADD = $(LIBADD_SHL_LOAD)
+
+## Make sure these will be cleaned even when they're not built by default:
+CLEANFILES += libltdl/libltdl.la \
+ libltdl/libltdlc.la \
+ libltdl/libdlloader.la
+
+## Automake-1.9.6 doesn't clean subdir AC_LIBOBJ compiled objects
+## automatically:
+CLEANFILES += $(LIBOBJS) $(LTLIBOBJS)
+
+
+## --------------------------- ##
+## Gnulib Makefile.am snippets ##
+## --------------------------- ##
+
+BUILT_SOURCES += libltdl/$(ARGZ_H)
+EXTRA_DIST += libltdl/argz_.h
+
+# We need the following in order to create an <argz.h> when the system
+# doesn't have one that works with the given compiler.
+all-local $(lib_OBJECTS): libltdl/$(ARGZ_H)
+libltdl/argz.h: libltdl/argz_.h
+ cp $(srcdir)/libltdl/argz_.h address@hidden
+ mv address@hidden $@
+MOSTLYCLEANFILES += libltdl/argz.h \
+ libltdl/argz.h-t
+
+# %%% END libltdl/Makefile.am
## -------------- ##
@@ -208,59 +355,66 @@ $(srcdir)/doc/notes.txt: $(srcdir)/doc/n
## Installation. ##
## ------------- ##
+# These are required by libtoolize and must be executable when installed.
+# The timestamps on these files must be preserved carefully so we install,
+# uninstall and set executable with custom rules here.
+auxexefiles = config/compile config/config.guess config/config.sub \
+ config/depcomp config/install-sh config/missing
+auxfiles = $(auxexefiles) config/ltmain.sh
+
+# Everything that gets picked up by aclocal is automatically distributed,
+# this is the list of macro files we install on the user's system.
+aclocalfiles = m4/argz.m4 m4/libtool.m4 m4/ltdl.m4 m4/ltoptions.m4 \
+ m4/ltsugar.m4 m4/ltversion.m4
+
## These are installed as a subdirectory of pkgdatadir so that
## libtoolize --ltdl can find them later:
-ltdldatadir = $(pkgdatadir)/libltdl
-ltdldatafiles = COPYING.LIB README \
- Makefile.am Makefile.in \
- argz_.h argz.c \
- configure.ac configure \
- libltdl/lt__alloc.h \
- libltdl/lt__dirent.h \
- libltdl/lt__glibc.h \
- libltdl/lt__private.h \
- libltdl/lt__strl.h \
- libltdl/lt_dlloader.h \
- libltdl/lt_error.h \
- libltdl/lt_system.h \
- libltdl/slist.h \
- loaders/dld_link.c \
- loaders/dlopen.c \
- loaders/dyld.c \
- loaders/load_add_on.c \
- loaders/loadlibrary.c \
- loaders/preopen.c \
- loaders/shl_load.c \
- lt__alloc.c \
- lt__dirent.c \
- lt__strl.c \
- lt_dlloader.c \
- lt_error.c \
- ltdl.c ltdl.h \
- slist.c
+ltdldatafiles = libltdl/COPYING.LIB \
+ libltdl/README \
+ libltdl/Makefile.am \
+ libltdl/Makefile.in \
+ libltdl/aclocal.m4 \
+ libltdl/config-h.in \
+ libltdl/configure.ac \
+ libltdl/configure \
+ libltdl/argz_.h \
+ libltdl/argz.c \
+ libltdl/loaders/dld_link.c \
+ libltdl/loaders/dlopen.c \
+ libltdl/loaders/dyld.c \
+ libltdl/loaders/load_add_on.c \
+ libltdl/loaders/loadlibrary.c \
+ libltdl/loaders/shl_load.c \
+ libltdl/lt__dirent.c \
+ libltdl/lt__strl.c \
+ $(libltdl_libltdl_la_SOURCES)
-install-data-local:
+install-data-local: libltdl/Makefile.in
## Don't install over the top of an old pkgdatadir
-rm -rf $(DESTDIR)$(pkgdatadir)
## To avoid spurious reconfiguration when the user installs these files
## with libtoolize, we have to preserve their timestamps carefully:
- $(mkinstalldirs) $(DESTDIR)$(ltdldatadir)
- ( cd $(srcdir)/libltdl && $(AMTAR) chf - $(ltdldatafiles); ) \
- | ( umask 0 && cd $(DESTDIR)$(ltdldatadir) && $(AMTAR) xf -; )
+ $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)
+ ( cd $(srcdir) && $(AMTAR) chf - $(ltdldatafiles); ) \
+ | ( umask 0 && cd $(DESTDIR)$(pkgdatadir) && $(AMTAR) xf -; )
+## And similarly copy the config auxilliary files into the master tree
+ ( cd $(srcdir)/libltdl && $(AMTAR) chf - $(auxfiles); ) \
+ | ( umask 0 && cd $(DESTDIR)$(pkgdatadir) && $(AMTAR) xf -; )
+ @for f in : $(auxexefiles); do \
+ test "X$$f" = X: && continue; \
+ echo "chmod +x '$(DESTDIR)$(pkgdatadir)/$$f'"; \
+ chmod +x "$(DESTDIR)$(pkgdatadir)/$$f"; \
+ done
+## Put a copy of the libtool m4 macros in the aclocal dir
$(mkinstalldirs) $(DESTDIR)$(aclocaldir)
@for p in $(aclocalfiles); do \
f=`echo "$$p" | sed 's|^.*/||'`; \
aclocalfiles="$$aclocalfiles $$f"; \
done; \
- ( cd $(srcdir)/m4 && $(AMTAR) chf - $$aclocalfiles; ) \
+ ( cd $(srcdir)/$(m4dir) && $(AMTAR) chf - $$aclocalfiles; ) \
| ( umask 0 && cd $(DESTDIR)$(aclocaldir) && $(AMTAR) xf -; )
- chown -R root $(DESTDIR)$(ltdldatadir) && \
- chgrp -R root $(DESTDIR)$(ltdldatadir) || :
-
-install-data-hook:
- chmod +x $(DESTDIR)$(pkgdatadir)/config/config.guess
- chmod +x $(DESTDIR)$(pkgdatadir)/config/config.sub
- chmod +x $(DESTDIR)$(pkgdatadir)/config/install-sh
+ chown -R root $(DESTDIR)$(pkgdatadir) && \
+ chgrp -R root $(DESTDIR)$(pkgdatadir) || :
## ------------- ##
@@ -276,11 +430,17 @@ uninstall-hook:
f=`echo "$$p" | sed 's|^.*/||'`; \
echo " rm -rf '$(DESTDIR)$(aclocaldir)/$$f'"; \
rm -f "$(DESTDIR)$(aclocaldir)/$$f"; \
- done;
+ done
+## Uninstall files from install-data-local rule above:
+ @for f in $(ltdldatafiles) $(auxfiles); do \
+ test -f $(DESTDIR)$(pkgdatadir)/$$f || continue; \
+ echo "rm -f $(DESTDIR)$(pkgdatadir)/$$f"; \
+ rm -f $(DESTDIR)$(pkgdatadir)/$$f; \
+ done
-## Ship README.alpha only in alpha release, but renamed to README
dist-hook:
+## Ship README.alpha only in alpha release, but renamed to README
address@hidden -f $(distdir)/README.alpha && \
case $(VERSION) in \
*[a-z]) mv $(distdir)/README.alpha $(distdir)/README ;; \
@@ -298,6 +458,7 @@ TESTSUITE_AT = tests/testsuite.at \
tests/duplicate_members.at \
tests/inherited_flags.at \
tests/libtoolize.at \
+ tests/standalone.at \
tests/stresstest.at \
tests/link-order.at \
tests/convenience.at \
@@ -336,6 +497,7 @@ $(srcdir)/tests/package.m4: $(srcdir)/co
tests/atconfig: config.status
$(SHELL) ./config.status tests/atconfig
+
DISTCLEANFILES += tests/atconfig
CD_TESTDIR = abs_srcdir=`$(lt__cd) $(srcdir) && pwd`; cd tests
@@ -457,10 +619,10 @@ tests/defs: $(srcdir)/tests/defs.in
# Use `$(srcdir)/tests' for the benefit of non-GNU makes: this is
# how defs.in appears in our dependencies.
-$(srcdir)/tests/defs.in: config/general.m4sh tests/defs.m4sh Makefile.am
+$(srcdir)/tests/defs.in: $(auxdir)/general.m4sh tests/defs.m4sh Makefile.am
cd $(srcdir); \
rm -f tests/defs.in; \
- $(M4SH) -B ./config tests/defs.m4sh > tests/defs.in
+ $(M4SH) -B $(auxdir) tests/defs.m4sh > tests/defs.in
# We need to remove any files that the above tests created.
clean-local-legacy:
Index: Makefile.maint
===================================================================
RCS file: /cvsroot/libtool/libtool/Makefile.maint,v
retrieving revision 1.11
diff -u -p -r1.11 Makefile.maint
--- Makefile.maint 22 Apr 2005 10:10:29 -0000 1.11
+++ Makefile.maint 22 Aug 2005 16:14:14 -0000
@@ -1,6 +1,6 @@
## Makefile.maint -- Makefile rules for libtool maintainers -*-Makefile-*-
##
-## Copyright (C) 2004 Free Software Foundation
+## Copyright (C) 2004, 2005 Free Software Foundation
##
## 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
@@ -31,11 +31,11 @@ Makefile:
TEXI2HTML = texi2html
-$(top_srcdir)/commit: $(top_srcdir)/config/mailnotify clcommit.m4sh
+$(srcdir)/commit: $(srcdir)/$(auxdir)/mailnotify clcommit.m4sh
$(timestamp); \
- cd $(top_srcdir); \
+ cd $(srcdir); \
rm -f commit commit.in commit.tmp; \
- $(M4SH) -B ./config clcommit.m4sh > commit.in; \
+ $(M4SH) -B $(auxdir) clcommit.m4sh > commit.in; \
input="clcommit.m4sh"; \
$(edit) -e "s,@TIMESTAMP\@,$$TIMESTAMP,g" commit.in > commit.tmp; \
chmod a+x commit.tmp; \
@@ -43,9 +43,9 @@ $(top_srcdir)/commit: $(top_srcdir)/conf
mv -f commit.tmp commit; \
rm -f commit.in
-$(top_srcdir)/config/mailnotify: config/mailnotify.m4sh
+$(srcdir)/$(auxdir)/mailnotify: $(auxdir)/mailnotify.m4sh
$(timestamp); \
- cd $(top_srcdir)/config; \
+ cd $(srcdir)/$(auxdir); \
rm -f mailnotify mailnotify.in mailnotify.tmp; \
$(M4SH) -B . mailnotify.m4sh > mailnotify.in; \
input="mailnotify.m4sh"; \
@@ -119,10 +119,10 @@ WGETSGO = $(WGET) http://savannah.gnu.or
## FIXME should be a lot more here
FETCHFILES = \
./INSTALL \
-config/install-sh \
-config/config.guess \
-config/config.sub \
-config/texinfo.tex
+$(auxdir)/install-sh \
+$(auxdir)/config.guess \
+$(auxdir)/config.sub \
+$(auxdir)/texinfo.tex
## Fetch the latest versions of files we care about.
.PHONY: fetch
@@ -238,7 +238,7 @@ delta-xdelta: prev-tarball new-tarball g
.PHONY: web-manual
web-manual:
- @$(LN_S) $(top_srcdir)/doc/libtool.texi doc/manual.texi
+ @$(LN_S) $(srcdir)/doc/libtool.texi doc/manual.texi
$(TEXI2HTML) -I doc -monolithic -number -verbose doc/manual.texi
@mv doc/manual.html manual.html
@rm -f doc/manual.texi
Index: NEWS
===================================================================
RCS file: /cvsroot/libtool/libtool/NEWS,v
retrieving revision 1.182
diff -u -p -r1.182 NEWS
--- NEWS 8 Aug 2005 09:23:57 -0000 1.182
+++ NEWS 22 Aug 2005 16:14:18 -0000
@@ -12,6 +12,7 @@ New in 2.1b: 2005-??-??; CVS version 2.1
in object names, to enhance GCJ support.
* Detection of compiler wrappers like distcc/ccache and $host_alias prefix.
* Initial Support for FC (modern Fortran).
+* Fixed a regression that prevented use of libltdl without autotools.
New in 1.9h: 2004-??-??; CVS version 1.9g, Libtool team:
* Bug fixes.
Index: bootstrap
===================================================================
RCS file: /cvsroot/libtool/libtool/bootstrap,v
retrieving revision 1.63
diff -u -p -r1.63 bootstrap
--- bootstrap 22 Apr 2005 10:10:29 -0000 1.63
+++ bootstrap 22 Aug 2005 16:14:18 -0000
@@ -39,6 +39,19 @@ test -f ./configure.ac || {
exit 1
}
+
+# Extract auxdir and m4dir from configure.ac:
+my_sed_traces='s,#.*$,,; s,^dnl .*$,,; s, dnl .*$,,;
+ /AC_CONFIG_AUX_DIR[^_]/ {
+ s,^.*AC_CONFIG_AUX_DIR([[ ]*\([^])]*\).*$,auxdir=\1,; p;
+ };
+ /AC_CONFIG_MACRO_DIR/ {
+ s,^.*AC_CONFIG_MACRO_DIR([[ ]*\([^])]*\).*$,m4dir=\1,; p;
+ };
+ d;'
+eval `cat configure.ac 2>/dev/null | $SED "$my_sed_traces"`
+
+
# Upgrade caveat:
cat <<'EOF'
WARNING: If bootstrapping with this script fails, it may be due to an
@@ -52,10 +65,10 @@ EOF
rm -rf `find . -path './{arch}' -prune -o \( -name autom4te.cache -o -name
libtool \) -print`
# Delete stale files from previous libtool versions.
-rm -f acinclude.m4 config/ltmain.sh libltdl/config.h
+rm -f acinclude.m4 libltdl/config.h
if test -z "$reconfdirs"; then
- reconfdirs=". `ls -1d tests/*demo tests/*demo[0-9]`"
+ reconfdirs=". libltdl `ls -1d tests/*demo tests/*demo[0-9]`"
fi
# Extract the package name and version number from configure.ac:
@@ -71,13 +84,14 @@ test -f Makefile \
# We don't have all the substitution values to build ltmain.sh from this
# script yet, but we need config/ltmain.sh for the libtool commands in
# configure, and ltversion.m4 to generate configure in the first place:
-rm -f ./config/ltmain.sh ./m4/ltversion.m4
+rm -f $auxdir/ltmain.sh $m4dir/ltversion.m4
-$MAKE ./config/ltmain.sh ./doc/notes.txt ./m4/ltversion.m4 ./libtoolize.in \
- ./tests/defs.in ./tests/package.m4 ./tests/testsuite \
+$MAKE $auxdir/ltmain.sh $m4dir/ltversion.m4 ./doc/notes.txt \
+ ./libtoolize.in ./tests/defs.in ./tests/package.m4 \
+ ./tests/testsuite ./libltdl/Makefile.am \
srcdir=. top_srcdir=. PACKAGE="$2" VERSION="$3" \
PACKAGE_BUGREPORT="address@hidden" M4SH="$AUTOM4TE --language=m4sh" \
- AUTOTEST="$AUTOM4TE --language=autotest" MAKEINFO="$MAKEINFO"
+ AUTOTEST="$AUTOM4TE --language=autotest" SED="$SED" MAKEINFO="$MAKEINFO"
test -f clcommit.m4sh && $MAKE -f Makefile.maint commit \
srcdir=. top_srcdir=. PACKAGE="$2" VERSION="$3" M4SH="$AUTOM4TE -l m4sh" \
@@ -86,25 +100,33 @@ test -f clcommit.m4sh && $MAKE -f Makefi
rm -f Makefile
# Make a dummy libtoolize script for autoreconf:
-test -f clcommit.m4sh && cat > ./config/libtoolize <<'EOF'
+test -f clcommit.m4sh && cat > $auxdir/libtoolize <<'EOF'
#! /bin/sh
# This is a dummy file for bootstrapping CVS libtool.
echo "$0: Bootstrap detected, no files installed." | sed 's,^.*/,,g'
exit 0
EOF
-chmod 755 ./config/libtoolize
+chmod 755 $auxdir/libtoolize
# Running the installed `libtoolize' will trash the local (newer) libtool.m4
# among others. Call the dummy script we made earlier.
-LIBTOOLIZE=`pwd`/config/libtoolize
+LIBTOOLIZE=`pwd`/$auxdir/libtoolize
export LIBTOOLIZE
for sub in $reconfdirs; do
$AUTORECONF --force --verbose --install $sub
done
+# Autoheader valiantly tries to prevent needless reconfigurations by
+# not changing the timestamp of config-h.in unless the file contents
+# are updated. Unfortunately config-h.in depends on aclocal.m4 which
+# *is* updated, so running 'libtoolize --ltdl=. && configure && make'
+# causes autoheader to be called... undesireable for users that do not
+# have it! Fudge the timestamp to prevent that:
+sleep 2 && touch libltdl/config-h.in
+
# Remove our dummy libtoolize
-rm -f ./config/libtoolize
+rm -f $auxdir/libtoolize
# These files can cause an infinite configure loop if left behind.
rm -f Makefile libltdl/Makefile libtool vcl.tmp
@@ -112,7 +134,7 @@ rm -f Makefile libltdl/Makefile libtool
# This file is misgenerated earlier in bootstrap to satisfy automake 1.9.1
# and earlier, but has a new enough timestamp to not be updated. Force it
# to be regenerated at make-time with proper substitutions in place:
-touch config/ltmain.in
+touch $auxdir/ltmain.in
# Commit script caveat:
cat <<'EOF'
@@ -120,7 +142,7 @@ WARNING: You might want to regenerate `c
WARNING: after you have run `configure' to discover the real whereabouts
WARNING: of `sed', `grep' etc. like this:
WARNING:
-WARNING: rm -f config/mailnotify; make -f Makefile.maint commit
+WARNING: rm -f $auxdir/mailnotify; make -f Makefile.maint commit
EOF
exit 0
Index: configure.ac
===================================================================
RCS file: /cvsroot/libtool/libtool/configure.ac,v
retrieving revision 1.70
diff -u -p -r1.70 configure.ac
--- configure.ac 8 Aug 2005 09:23:57 -0000 1.70
+++ configure.ac 22 Aug 2005 16:14:18 -0000
@@ -27,7 +27,9 @@ dnl Oldest automake required for bootstr
AC_INIT([libtool], [2.1a], address@hidden)
AC_CONFIG_HEADERS([config.h:config-h.in])
AC_CONFIG_SRCDIR([libtoolize.in])
-AC_CONFIG_AUX_DIR([config])
+AC_CONFIG_AUX_DIR([libltdl/config])
+AC_CONFIG_MACRO_DIR([libltdl/m4])
+AC_CONFIG_LIBOBJ_DIR([libltdl])
## ------------------------ ##
@@ -113,7 +115,7 @@ AC_SUBST([package_revision])
dnl These are bootstrap requirements, once built, libtool may work with
dnl much older releases of autoconf and automake. See release notes.
-AM_INIT_AUTOMAKE([1.8 gnits dist-bzip2])dnl We use auto-m4_including
+AM_INIT_AUTOMAKE([1.9 gnits subdir-objects dist-bzip2])
dnl We use m4sh to generate libtool's portable shell scripts
AC_SUBST([M4SH], ['$(AUTOM4TE) --language=m4sh'])
@@ -155,13 +157,14 @@ AC_SUBST([DIST_MAKEFILE_LIST])
# a good C compiler: if the following C++ tests fail, the whole libtool
# build fails!
AC_PROG_CC
+AM_PROG_CC_C_O
AC_PROG_CPP
## ----------------------- ##
## Libtool initialisation. ##
## ----------------------- ##
LT_INIT([dlopen win32-dll])
-LTDL_INIT
+LTDL_INIT([libltdl])
# Enable all the language support we can
LT_LANG(C++)
@@ -184,5 +187,5 @@ AM_CONDITIONAL(HAVE_RC, [test -n "[$]_LT
## -------- ##
## Outputs. ##
## -------- ##
-AC_CONFIG_FILES([Makefile libltdl/Makefile])
+AC_CONFIG_FILES([Makefile])
AC_OUTPUT
Index: libtoolize.m4sh
===================================================================
RCS file: /cvsroot/libtool/libtool/libtoolize.m4sh,v
retrieving revision 1.30
diff -u -p -r1.30 libtoolize.m4sh
--- libtoolize.m4sh 30 Apr 2005 09:30:13 -0000 1.30
+++ libtoolize.m4sh 22 Aug 2005 16:14:18 -0000
@@ -73,16 +73,15 @@ opt_install=false
opt_link=:
opt_debug=:
+seen_autoconf=false
seen_libtool=false
seen_ltdl=false
-# Collect flags to pass into libltdl libtoolize
-libtoolize_flags=
-
# Locations for important files:
address@hidden@
address@hidden@
address@hidden@
address@hidden@
address@hidden@
auxdir=
m4dir=
@@ -103,12 +102,9 @@ configure_ac=configure.in
opt="$1"
shift
case $opt in
- --copy|-c) opt_link=false
- libtoolize_flags="$libtoolize_flags --copy"
- ;;
+ --copy|-c) opt_link=false ;;
--debug) func_echo "enabling shell trace mode"
- libtoolize_flags="$libtoolize_flags --debug"
opt_debug='set -x'
$opt_debug
;;
@@ -121,16 +117,11 @@ configure_ac=configure.in
MKDIR="$ECHO $MKDIR"
TAR="$ECHO $TAR"
fi
- libtoolize_flags="${libtoolize_flags} --dry-run"
;;
- --force|-f) opt_force=:
- libtoolize_flags="${libtoolize_flags} --force"
- ;;
+ --force|-f) opt_force=: ;;
- --install|-i) opt_install=:
- libtoolize_flags="${libtoolize_flags} --install"
- ;;
+ --install|-i) opt_install=: ;;
--ltdl) ltdldir=libltdl
if test "$#" -gt 0; then
@@ -143,12 +134,9 @@ configure_ac=configure.in
--quiet|--automake|-q) # --automake is for 1.5 compatibility
opt_quiet=:
- libtoolize_flags="${libtoolize_flags} --quiet"
;;
- --verbose|-v) opt_verbose=:
- libtoolize_flags="${libtoolize_flags} --verbose"
- ;;
+ --verbose|-v) opt_verbose=: ;;
# Separate optargs to long options:
--*=*)
@@ -226,18 +214,22 @@ func_copy_cb ()
test -f "$my_srcdir/$my_file" || \
{ func_error "\`$my_file' not found in \`$my_srcdir'"; return; }
- func_mkdir_p "$my_destdir"
+ case $opt_verbose in
+ false) my_copy_msg="file \`$my_destdir/$my_file'" ;;
+ *) my_copy_msg="file from \`$my_srcdir/$my_file'" ;;
+ esac
+ func_mkdir_p `$ECHO "X$my_destdir/$my_file" | $Xsed -e "$dirname"`
$RM "$my_destdir/$my_file"
if $opt_link && $LN_S "$my_srcdir/$my_file" "$my_destdir/$my_file"; then
- $opt_quiet || func_echo "copying file \`$my_destdir/$my_file'"
+ $opt_quiet || func_echo "linking $my_copy_msg"
copy_return_status=0
elif { ( cd "$my_srcdir" 2>/dev/null && $TAR chf - "$my_file" 2>/dev/null;
) \
| ( umask 0 && cd "$my_destdir" 2>/dev/null && "$TAR" xf - >/dev/null
2>&1; ); } ; then
- $opt_quiet || func_echo "copying file \`$my_destdir/$my_file'"
+ $opt_quiet || func_echo "copying $my_copy_msg"
copy_return_status=0
elif $CP -p "$my_srcdir/$my_file" "$my_destdir/$my_file"; then
- $opt_quiet || func_echo "copying file \`$my_destdir/$my_file'"
+ $opt_quiet || func_echo "copying $my_copy_msg"
copy_return_status=0
else
func_error "can not copy \`$my_srcdir/$my_file' to \`$my_destdir/'"
@@ -349,18 +341,19 @@ func_scan_files ()
$opt_debug
# Prefer configure.ac to configure.in
test -f configure.ac && configure_ac=configure.ac
- test -f "$configure_ac" \
- || func_fatal_help "\`$configure_ac' does not exist"
+ test -f "$configure_ac" || configure_ac=
# Set local variables to reflect contents of configure.ac
- my_uses_autoconf=false
my_sed_scan_configure_ac='s,#.*$,,; s,^dnl .*$,,; s, dnl .*$,,;
- /AC_INIT/ { s,^.*$,my_uses_autoconf=:,; p; };
+ /AC_INIT/ { s,^.*$,seen_autoconf=:,; p; };
d'
- eval `$SED "$my_sed_scan_configure_ac" "$configure_ac"`
+ test -z "$configure_ac" \
+ || eval `$SED "$my_sed_scan_configure_ac" "$configure_ac"`
- $my_uses_autoconf || {
- func_verbose "$configure_ac: not using Autoconf"
+ $seen_autoconf || {
+ my_configure_ac=
+ test -n "$configure_ac" && my_configure_ac="$configure_ac: "
+ func_verbose "${my_configure_ac}not using Autoconf"
return
}
@@ -751,6 +744,10 @@ func_install_update ()
func_check_macros ()
{
$opt_debug
+
+ $seen_autoconf \
+ || return
+
# Don't trace for this, we're just checking the user didn't invoke it
# directly from configure.ac.
$SED 's,[d]nl .*$,,; s,# .*$,,' "$configure_ac" | grep AC_PROG_RANLIB \
@@ -801,6 +798,9 @@ func_massage_pkgltdl_files ()
# Massage a value for pkgltdl_files from the value used in Makefile.am
for my_filename in @pkgltdl_files@; do
+ # Strip surplus leading 'libltdl/':
+ my_filename=`expr "X$my_filename" : 'Xlibltdl/\(.*\)'`
+
# ignore excluded filenames
if test -n "$my_glob_exclude"; then
eval 'case $my_filename in '$my_glob_exclude') continue ;; esac'
@@ -818,6 +818,35 @@ func_massage_pkgltdl_files ()
}
+# func_massage_pkgconfig_files [glob_exclude]
+# @pkgconfig_files\@ is substituted as per its value in Makefile.am; this
+# function massages it into a suitable format for func_copy_some_files.
+func_massage_pkgconfig_files ()
+{
+ pkgconfig_files= # GLOBAL VAR
+
+ my_glob_exclude="$1"
+
+ # Massage a value for pkgconfig_files from the value used in Makefile.am
+ for my_filename in @pkgconfig_files@; do
+
+ # ignore excluded filenames
+ if test -n "$my_glob_exclude"; then
+ eval 'case $my_filename in '$my_glob_exclude') continue ;; esac'
+ fi
+
+ # ignore duplicates
+ case :$pkgconfig_files: in
+ *:$my_filename:*) ;;
+ *) pkgconfig_files="$pkgconfig_files:$my_filename" ;;
+ esac
+ done
+
+ # strip spurious leading `:'
+ pkgconfig_files=`$ECHO "X$pkgconfig_files" | $Xsed -e 's,^:*,,'`
+}
+
+
# func_nonemptydir_p dirvar
# DIRVAR is the name of a variable to evaluate. Unless DIRVAR names
# a directory that exists and is non-empty abort with a diagnostic.
@@ -846,13 +875,16 @@ func_nonemptydir_p ()
# Allow the user to override the master libtoolize repository:
if test -n "$_lt_pkgdatadir"; then
- pkgdatadir="$_lt_pkgdatadir"
- aclocaldir="$_lt_pkgdatadir/m4"
+ pkgltdldir="$_lt_pkgdatadir"
+ pkgdatadir="$_lt_pkgdatadir/libltdl"
+ aclocaldir="$_lt_pkgdatadir/libltdl/m4"
fi
+ func_nonemptydir_p pkgltdldir
func_nonemptydir_p pkgdatadir
func_nonemptydir_p aclocaldir
func_massage_pkgltdl_files
+ func_massage_pkgconfig_files
# libtool.m4 and ltdl.m4 are handled specially below
func_massage_aclocal_DATA 'libtool.m4|ltdl.m4'
@@ -865,24 +897,38 @@ func_nonemptydir_p ()
# Copy all the files from installed libltdl to this project, if the
# user specified `--ltdl'.
if test -n "$ltdldir"; then
- func_copy_some_files "$pkgltdl_files" "$pkgdatadir/libltdl" "$ltdldir"
+ func_copy_some_files "$pkgltdl_files" "$pkgltdldir/libltdl" "$ltdldir"
- # libtoolize the newly copied libltdl tree
- ( cd "$ltdldir" && eval "$progpath" $libtoolize_flags ) \
- || exit $EXIT_FAILURE
- fi
+ # Unless we share CONFIG_MACRO_DIR with our parent project,
+ # copy macros here.
+ if test "$ltdldir/m4" != "$m4dir"; then
+ func_copy_some_files "$pkgmacro_files:libtool.m4:ltdl.m4" \
+ "$aclocaldir" "$ltdldir/m4"
+ fi
- # Copy all the installed utility files to the auxiliary directory if
- # `--install' was passed, or else copy just ltmain.sh.
- $opt_quiet || if test "$auxdir" != .; then
- func_echo "putting files in AC_CONFIG_AUX_DIR, \`$auxdir'."
+ # Unless we share CONFIG_AUX_DIR with our parent project,
+ # copy config aux files into libltdl.
+ if test "$ltdldir/config" != "$auxdir"; then
+ func_copy_some_files "$pkgconfig_files" "$pkgdatadir" "$ltdldir"
+ fi
fi
- if $opt_install; then
- func_config_update config.guess "$pkgdatadir/config" "$auxdir"
- func_config_update config.sub "$pkgdatadir/config" "$auxdir"
- func_install_update install-sh "$pkgdatadir/config" "$auxdir"
+
+ # If they are newer, copy all the installed utility files to the
+ # auxiliary directory if `--install' was passed, or else copy just
+ # ltmain.sh.
+ if test -n "$auxdir"; then
+ $opt_quiet || if test "$auxdir" != .; then
+ func_echo "putting files in AC_CONFIG_AUX_DIR, \`$auxdir'."
+ fi
+ if $opt_install; then
+ func_config_update config.guess "$pkgdatadir/config" "$auxdir"
+ func_config_update config.sub "$pkgdatadir/config" "$auxdir"
+ func_install_update install-sh "$pkgdatadir/config" "$auxdir"
+ fi
+ func_ltmain_update ltmain.sh "$pkgdatadir/config" "$auxdir"
+ else
+ func_verbose "AC_CONFIG_AUX_DIR not defined, not copying libtool
auxilliary files."
fi
- func_ltmain_update ltmain.sh "$pkgdatadir/config" "$auxdir"
# Copy libtool's m4 macros to the macro directory, if they are newer.
if test -n "$m4dir"; then
@@ -901,6 +947,15 @@ func_nonemptydir_p ()
"$m4dir" func_serial_update
else
func_verbose "AC_CONFIG_MACRO_DIR not defined, not copying libtool macro
files."
+ fi
+
+ # Offer some suggestions for avoiding duplicate files in a project
+ # that uses libltdl:
+ if test -n "$ltdldir" && $seen_autoconf; then
+ $opt_quiet || test "$ltdldir/config" = "$auxdir" || \
+ func_echo "consider using \`AC_CONFIG_AUX_DIR([[$ltdldir/config]])' in
$configure_ac"
+ $opt_quiet || test "$ltdldir/m4" = "$m4dir" || \
+ func_echo "consider using \`AC_CONFIG_MACRO_DIR([[$ltdldir/m4]])' in
$configure_ac"
fi
}
Index: libltdl/Makefile.am
===================================================================
RCS file: /cvsroot/libtool/libtool/libltdl/Makefile.am,v
retrieving revision 1.84
diff -u -p -r1.84 Makefile.am
--- libltdl/Makefile.am 21 Aug 2005 18:53:15 -0000 1.84
+++ libltdl/Makefile.am 22 Aug 2005 16:14:18 -0000
@@ -1,13 +1,17 @@
-## Process this file with automake to produce Makefile.in
+## Makefile.am -- Process this file with automake to produce Makefile.in
##
-## Copyright (C) 1998, 1999, 2000, 2001, 2003, 2004, 2005
-## Free Software Foundation, Inc.
+## Copyright (C) 2003, 2004, 2005 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.
##
+## As a special exception to the GNU Lesser General Public License,
+## if you distribute this file as part of a program or library that
+## is built using GNU libtool, you may include it under the same
+## distribution terms that you use for the rest of that program.
+##
## 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
@@ -17,25 +21,31 @@
## along with this program; see the file COPYING. If not, write to
## the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
## Boston, MA 02110-1301, USA.
-
-BUILT_SOURCES =
-MOSTLYCLEANFILES =
-EXTRA_DIST = configure.ac
-
-AUTOMAKE_OPTIONS = foreign
-ACLOCAL_AMFLAGS = -I m4
+ACLOCAL_AMFLAGS = -I m4
+AUTOMAKE_OPTIONS = foreign
+BUILT_SOURCES =
+EXTRA_DIST =
+CLEANFILES =
+MOSTLYCLEANFILES =
+# %%% BEGIN Makefile.am
DEFS = -DHAVE_CONFIG_H="<$(CONFIG_H)>" -DLTDL
-AM_CPPFLAGS = -I. -I$(srcdir) -I$(srcdir)/libltdl
+
+# -I$(srcdir) is needed for user that built libltdl with a sub-Automake
+# (not as a sub-package!) using 'nostdinc':
+AM_CPPFLAGS = -I. -I$(srcdir) -Ilibltdl -I$(srcdir)/libltdl \
+ -I$(srcdir)/libltdl
AM_LDFLAGS = -no-undefined
VERSION_INFO = -version-info 6:0:0
noinst_LTLIBRARIES = $(LT_DLLOADERS)
if INSTALL_LTDL
-nobase_include_HEADERS = ltdl.h \
- libltdl/lt_system.h libltdl/lt_error.h \
+ltdlincludedir = $(includedir)/libltdl
+ltdlinclude_HEADERS = libltdl/lt_system.h \
+ libltdl/lt_error.h \
libltdl/lt_dlloader.h
+include_HEADERS = ltdl.h
lib_LTLIBRARIES = libltdl.la
endif
@@ -43,27 +53,27 @@ if CONVENIENCE_LTDL
noinst_LTLIBRARIES += libltdlc.la
endif
-## !!NOTE!! Be sure to update ../Makefile.am:ltdldatafiles if you
-## make any changes here:
-libltdl_la_SOURCES = libltdl/lt__alloc.h \
+libltdl_la_SOURCES = libltdl/lt__alloc.h \
libltdl/lt__dirent.h \
libltdl/lt__glibc.h \
libltdl/lt__private.h \
- libltdl/lt__strl.h \
+ libltdl/lt__strl.h \
libltdl/lt_dlloader.h \
libltdl/lt_error.h \
- libltdl/lt_system.h \
+ libltdl/lt_system.h \
libltdl/slist.h \
loaders/preopen.c \
lt__alloc.c \
lt_dlloader.c \
lt_error.c \
- ltdl.c ltdl.h \
+ ltdl.c \
+ ltdl.h \
slist.c
+
libltdl_la_CPPFLAGS = -DLTDLOPEN=$(LTDLOPEN) $(AM_CPPFLAGS)
libltdl_la_LDFLAGS = $(AM_LDFLAGS) $(VERSION_INFO) $(LT_DLPREOPEN)
libltdl_la_LIBADD = $(LTLIBOBJS)
-libltdl_la_DEPENDENCIES = $(LT_DLLOADERS) $(LTLIBOBJS) $(BUILT_SOURCES)
+libltdl_la_DEPENDENCIES = $(LT_DLLOADERS) $(LTLIBOBJS)
libltdlc_la_SOURCES = $(libltdl_la_SOURCES)
libltdlc_la_CPPFLAGS = -DLTDLOPEN=$(LTDLOPEN)c $(AM_CPPFLAGS)
@@ -75,8 +85,12 @@ libltdlc_la_DEPENDENCIES= $(libltdl_la_D
## pic-objects (either as a shared library, or a convenience library),
## so the loaders themselves must be made from pic-objects too. We
## use convenience libraries for that purpose:
-EXTRA_LTLIBRARIES = dlopen.la dld_link.la dyld.la load_add_on.la \
- loadlibrary.la shl_load.la
+EXTRA_LTLIBRARIES = dlopen.la \
+ dld_link.la \
+ dyld.la \
+ load_add_on.la \
+ loadlibrary.la \
+ shl_load.la
dlopen_la_SOURCES = loaders/dlopen.c
dlopen_la_LDFLAGS = -module -avoid-version
@@ -100,16 +114,21 @@ shl_load_la_LDFLAGS = -module -avoid-ver
shl_load_la_LIBADD = $(LIBADD_SHL_LOAD)
## Make sure these will be cleaned even when they're not built by default:
-CLEANFILES = libltdl.la libltdlc.la libdlloader.la
+CLEANFILES += libltdl.la \
+ libltdlc.la \
+ libdlloader.la
+
+## Automake-1.9.6 doesn't clean subdir AC_LIBOBJ compiled objects
+## automatically:
+CLEANFILES += $(LIBOBJS) $(LTLIBOBJS)
## --------------------------- ##
## Gnulib Makefile.am snippets ##
## --------------------------- ##
-## ((( gnulib module argz
-BUILT_SOURCES += $(ARGZ_H)
-EXTRA_DIST += argz_.h
+BUILT_SOURCES += $(ARGZ_H)
+EXTRA_DIST += argz_.h
# We need the following in order to create an <argz.h> when the system
# doesn't have one that works with the given compiler.
@@ -117,5 +136,7 @@ all-local $(lib_OBJECTS): $(ARGZ_H)
argz.h: argz_.h
cp $(srcdir)/argz_.h address@hidden
mv address@hidden $@
-MOSTLYCLEANFILES += argz.h argz.h-t
-## ))) gnulib module argz
+MOSTLYCLEANFILES += argz.h \
+ argz.h-t
+
+# %%% END Makefile.am
Index: tests/standalone.at
===================================================================
RCS file: tests/standalone.at
diff -N tests/standalone.at
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ tests/standalone.at 22 Aug 2005 16:14:18 -0000
@@ -0,0 +1,157 @@
+# Hand crafted tests for GNU Libtool. -*- Autotest -*-
+# Copyright 2005 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, 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.
+
+
+AT_BANNER([Standalone Libltdl.])
+
+## ------------------------ ##
+## Softlinked libltdl tree. ##
+## ------------------------ ##
+
+AT_SETUP([compiling softlinked libltdl])
+
+LT_AT_LIBTOOLIZE([--ltdl=.])
+./configure
+${MAKE-make}
+
+AT_CHECK([test -f libltdlc.la])
+
+AT_CLEANUP
+
+
+## -------------------- ##
+## Copied libltdl tree. ##
+## -------------------- ##
+
+AT_SETUP([compiling copied libltdl])
+
+LT_AT_LIBTOOLIZE([--copy --ltdl=.])
+./configure
+${MAKE-make}
+
+AT_CHECK([test -f libltdlc.la])
+
+AT_CLEANUP
+
+
+## ------------------------- ##
+## Installable libltdl tree. ##
+## ------------------------- ##
+
+AT_SETUP([installable libltdl])
+
+prefix=`pwd`/_inst
+
+LT_AT_LIBTOOLIZE([--copy --ltdl=.])
+./configure --enable-ltdl-install --prefix=$prefix
+${MAKE-make} all install
+
+AT_CHECK([test -f $prefix/lib/libltdl.la])
+AT_CHECK([test -f $prefix/include/ltdl.h])
+
+AT_CLEANUP
+
+
+## ----------------------------------------------- ##
+## libltdl is usable without Autoconf or Automake. ##
+## ----------------------------------------------- ##
+
+AT_SETUP([linking libltdl without autotools])
+
+AT_DATA([module.c],
+[[char *
+hello (void)
+{
+ return "Hello!";
+}
+]])
+
+AT_DATA([main.c],
+[[#include <stdio.h>
+#include "ltdl.h"
+
+int
+main (int argc, char **argv)
+{
+ lt_dlhandle handle;
+ char *(*func) (void) = 0;
+ int status = 1;
+
+ LTDL_SET_PRELOADED_SYMBOLS();
+ if (lt_dlinit() != 0) {
+ fprintf (stderr, "error during initialisation: %s\n", lt_dlerror());
+ return 1;
+ }
+
+ handle = lt_dlopen("module.la");
+ if (!handle) {
+ fprintf (stderr, "error dlopening module.la: %s\n", lt_dlerror());
+ goto finish;
+ }
+
+ func = (char *(*)(void)) lt_dlsym (handle, "hello");
+ if (!func) {
+ fprintf (stderr, "error fetching func: %s\n", lt_dlerror());
+ goto finish;
+ }
+
+ printf ("%s\n", (*func) ());
+ status = 0;
+
+finish:
+ lt_dlexit();
+
+ return status;
+}
+]])
+
+AT_DATA([Makefile],
+[[LIBTOOL = ./libltdl/libtool
+INCLUDES = -I./libltdl
+MODFLAGS = -module -avoid-version
+
+LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(CPPFLAGS) $(INCLUDES)
+LTLINK = $(LIBTOOL) --mode=link $(CC) $(CPPFLAGS) $(INCLUDES) $(LDFLAGS)
+
+TARGETS = libltdl/libltdlc.la module.la ltdldemo
+
+all: $(TARGETS)
+
+$(LIBTOOL) libltdl/libltdlc.la:
+ cd libltdl && ./configure && $(MAKE)
+
+ltdldemo: $(LIBTOOL) module.la libltdl/libltdlc.la main.c
+ $(LTLINK) -o ltdldemo main.c -dlopen module.la ./libltdl/libltdlc.la
+
+module.la: $(LIBTOOL) module.lo
+ $(LTLINK) -o module.la module.lo $(MODFLAGS) -rpath /dev/null
+
+module.lo: $(LIBTOOL) module.c
+ $(LTCOMPILE) -c module.c
+]])
+
+LT_AT_LIBTOOLIZE([--copy --ltdl])
+${MAKE-make} CC="$CC" CPPFLAGS="$CPPFLAGS" CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS"
+
+AT_DATA([expout],
+[[Hello!
+]])
+
+AT_CHECK([./ltdldemo], 0, expout)
+
+AT_CLEANUP
Index: tests/testsuite.at
===================================================================
RCS file: /cvsroot/libtool/libtool/tests/testsuite.at,v
retrieving revision 1.16
diff -u -p -r1.16 testsuite.at
--- tests/testsuite.at 18 Aug 2005 17:07:17 -0000 1.16
+++ tests/testsuite.at 22 Aug 2005 16:14:18 -0000
@@ -97,6 +97,8 @@ m4_include([convenience.at])
m4_include([link-order.at])
# Torturing subdir-objects builds
m4_include([am-subdir.at])
+# standalone libltdl compilation
+m4_include([standalone.at])
# C++ templates tests
m4_include([template.at])
# Behaviour of LT_OUTPUT
Index: tests/cdemo/Makefile.am
===================================================================
RCS file: /cvsroot/libtool/libtool/tests/cdemo/Makefile.am,v
retrieving revision 1.6
diff -u -p -r1.6 Makefile.am
--- tests/cdemo/Makefile.am 22 Apr 2005 10:10:30 -0000 1.6
+++ tests/cdemo/Makefile.am 22 Aug 2005 16:14:18 -0000
@@ -1,6 +1,6 @@
## Makefile.am -- Process this file with automake to produce Makefile.in
##
-## Copyright (C) 2003, 2004 Free Software Foundation
+## Copyright (C) 2003, 2004, 2005 Free Software Foundation
##
## 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
@@ -18,7 +18,7 @@
## Boston, MA 02110-1301, USA.
AUTOMAKE_OPTIONS = no-dependencies foreign
-ACLOCAL_AMFLAGS = -I ../../m4
+ACLOCAL_AMFLAGS = -I ../../libltdl/m4
AM_CPPFLAGS = -I$(top_srcdir)/../..
noinst_LTLIBRARIES = libfoo.la
Index: tests/cdemo/configure.ac
===================================================================
RCS file: /cvsroot/libtool/libtool/tests/cdemo/configure.ac,v
retrieving revision 1.14
diff -u -p -r1.14 configure.ac
--- tests/cdemo/configure.ac 22 Apr 2005 10:10:30 -0000 1.14
+++ tests/cdemo/configure.ac 22 Aug 2005 16:14:18 -0000
@@ -1,5 +1,5 @@
## Process this file with autoconf to create configure. -*- autoconf -*-
-# Copyright (C) 2001, 2003, 2004 Free Software Foundation, Inc.
+# Copyright (C) 2001, 2003, 2004, 2005 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
@@ -23,7 +23,7 @@ AC_PREREQ(2.54)
## ------------------------ ##
AC_INIT([cdemo], [1.0], address@hidden)
AC_CONFIG_SRCDIR([main.c])
-AC_CONFIG_AUX_DIR([../../config])
+AC_CONFIG_AUX_DIR([../../libltdl/config])
## ------------------------ ##
Index: tests/demo/Makefile.am
===================================================================
RCS file: /cvsroot/libtool/libtool/tests/demo/Makefile.am,v
retrieving revision 1.7
diff -u -p -r1.7 Makefile.am
--- tests/demo/Makefile.am 22 Apr 2005 10:10:30 -0000 1.7
+++ tests/demo/Makefile.am 22 Aug 2005 16:14:18 -0000
@@ -1,6 +1,6 @@
## Makefile.am -- Process this file with automake to produce Makefile.in
##
-## Copyright (C) 2003, 2004 Free Software Foundation
+## Copyright (C) 2003, 2004, 2005 Free Software Foundation
##
## 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
@@ -18,7 +18,7 @@
## Boston, MA 02110-1301, USA.
AUTOMAKE_OPTIONS = no-dependencies foreign
-ACLOCAL_AMFLAGS = -I ../../m4
+ACLOCAL_AMFLAGS = -I ../../libltdl/m4
AM_CPPFLAGS = -I$(top_srcdir)/../..
# Build a libtool library, libhello.la for installation in libdir.
Index: tests/demo/configure.ac
===================================================================
RCS file: /cvsroot/libtool/libtool/tests/demo/configure.ac,v
retrieving revision 1.12
diff -u -p -r1.12 configure.ac
--- tests/demo/configure.ac 22 Apr 2005 10:10:31 -0000 1.12
+++ tests/demo/configure.ac 22 Aug 2005 16:14:18 -0000
@@ -1,5 +1,5 @@
## Process this file with autoconf to create configure. -*- autoconf -*-
-# Copyright (C) 2001, 2003, 2004 Free Software Foundation, Inc.
+# Copyright (C) 2001, 2003, 2004, 2005 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
@@ -24,7 +24,7 @@ AC_PREREQ(2.54)
## ------------------------ ##
AC_INIT([demo], [1.0], address@hidden)
AC_CONFIG_SRCDIR([hello.c])
-AC_CONFIG_AUX_DIR([../../config])
+AC_CONFIG_AUX_DIR([../../libltdl/config])
## ------------------------ ##
Index: tests/depdemo/Makefile.am
===================================================================
RCS file: /cvsroot/libtool/libtool/tests/depdemo/Makefile.am,v
retrieving revision 1.6
diff -u -p -r1.6 Makefile.am
--- tests/depdemo/Makefile.am 22 Apr 2005 10:10:31 -0000 1.6
+++ tests/depdemo/Makefile.am 22 Aug 2005 16:14:18 -0000
@@ -1,6 +1,6 @@
## Makefile.am -- Process this file with automake to produce Makefile.in
##
-## Copyright (C) 2003, 2004 Free Software Foundation
+## Copyright (C) 2003, 2004, 2005 Free Software Foundation
##
## 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
@@ -18,7 +18,7 @@
## Boston, MA 02110-1301, USA.
AUTOMAKE_OPTIONS = no-dependencies foreign
-ACLOCAL_AMFLAGS = -I ../../m4
+ACLOCAL_AMFLAGS = -I ../../libltdl/m4
AM_CPPFLAGS = -I$(top_srcdir)/../..
SUBDIRS = l1 l2 l3 l4
Index: tests/depdemo/configure.ac
===================================================================
RCS file: /cvsroot/libtool/libtool/tests/depdemo/configure.ac,v
retrieving revision 1.12
diff -u -p -r1.12 configure.ac
--- tests/depdemo/configure.ac 22 Apr 2005 10:10:31 -0000 1.12
+++ tests/depdemo/configure.ac 22 Aug 2005 16:14:18 -0000
@@ -1,5 +1,5 @@
## Process this file with autoconf to create configure. -*- autoconf -*-
-# Copyright (C) 2001, 2003, 2004 Free Software Foundation, Inc.
+# Copyright (C) 2001, 2003, 2004, 2005 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
@@ -24,7 +24,7 @@ AC_PREREQ(2.54)
## ------------------------ ##
AC_INIT([depdemo], [1.0], address@hidden)
AC_CONFIG_SRCDIR([main.c])
-AC_CONFIG_AUX_DIR([../../config])
+AC_CONFIG_AUX_DIR([../../libltdl/config])
## ------------------------ ##
Index: tests/f77demo/Makefile.am
===================================================================
RCS file: /cvsroot/libtool/libtool/tests/f77demo/Makefile.am,v
retrieving revision 1.7
diff -u -p -r1.7 Makefile.am
--- tests/f77demo/Makefile.am 22 Apr 2005 10:10:31 -0000 1.7
+++ tests/f77demo/Makefile.am 22 Aug 2005 16:14:18 -0000
@@ -1,6 +1,6 @@
## Makefile.am -- Process this file with automake to produce Makefile.in
##
-## Copyright (C) 2003, 2004 Free Software Foundation
+## Copyright (C) 2003, 2004, 2005 Free Software Foundation
##
## 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
@@ -18,7 +18,7 @@
## Boston, MA 02110-1301, USA.
AUTOMAKE_OPTIONS = no-dependencies foreign
-ACLOCAL_AMFLAGS = -I ../../m4
+ACLOCAL_AMFLAGS = -I ../../libltdl/m4
AM_CPPFLAGS = -I$(top_srcdir)/../..
lib_LTLIBRARIES = libfoo.la libmix.la libfoo2.la libfoo3.la
Index: tests/f77demo/configure.ac
===================================================================
RCS file: /cvsroot/libtool/libtool/tests/f77demo/configure.ac,v
retrieving revision 1.10
diff -u -p -r1.10 configure.ac
--- tests/f77demo/configure.ac 22 Apr 2005 10:10:31 -0000 1.10
+++ tests/f77demo/configure.ac 22 Aug 2005 16:14:18 -0000
@@ -1,5 +1,5 @@
## Process this file with autoconf to create configure. -*- autoconf -*-
-# Copyright (C) 2001, 2003 Free Software Foundation, Inc.
+# Copyright (C) 2001, 2003, 2005 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
@@ -24,7 +24,7 @@ AC_PREREQ(2.54)
AC_INIT([f77demo], [1.0], address@hidden)
AC_CONFIG_HEADERS([config.h:config-h.in])
AC_CONFIG_SRCDIR([foof.f])
-AC_CONFIG_AUX_DIR([../../config])
+AC_CONFIG_AUX_DIR([../../libltdl/config])
## ------------------------ ##
## Automake Initialisation. ##
Index: tests/fcdemo/Makefile.am
===================================================================
RCS file: /cvsroot/libtool/libtool/tests/fcdemo/Makefile.am,v
retrieving revision 1.1
diff -u -p -r1.1 Makefile.am
--- tests/fcdemo/Makefile.am 8 Aug 2005 09:23:57 -0000 1.1
+++ tests/fcdemo/Makefile.am 22 Aug 2005 16:14:18 -0000
@@ -18,7 +18,7 @@
## Boston, MA 02110-1301, USA.
AUTOMAKE_OPTIONS = no-dependencies foreign
-ACLOCAL_AMFLAGS = -I ../../m4
+ACLOCAL_AMFLAGS = -I ../../libltdl/m4
AM_CPPFLAGS = -I$(top_srcdir)/../..
lib_LTLIBRARIES = libfoo.la libmix.la libfoo2.la libfoo3.la
Index: tests/fcdemo/configure.ac
===================================================================
RCS file: /cvsroot/libtool/libtool/tests/fcdemo/configure.ac,v
retrieving revision 1.1
diff -u -p -r1.1 configure.ac
--- tests/fcdemo/configure.ac 8 Aug 2005 09:23:57 -0000 1.1
+++ tests/fcdemo/configure.ac 22 Aug 2005 16:14:18 -0000
@@ -24,7 +24,7 @@ AC_PREREQ(2.54)
AC_INIT([fcdemo], [1.0], address@hidden)
AC_CONFIG_HEADERS([config.h:config-h.in])
AC_CONFIG_SRCDIR([foof.f90])
-AC_CONFIG_AUX_DIR([../../config])
+AC_CONFIG_AUX_DIR([../../libltdl/config])
## ------------------------ ##
## Automake Initialisation. ##
Index: tests/mdemo/Makefile.am
===================================================================
RCS file: /cvsroot/libtool/libtool/tests/mdemo/Makefile.am,v
retrieving revision 1.6
diff -u -p -r1.6 Makefile.am
--- tests/mdemo/Makefile.am 22 Apr 2005 10:10:31 -0000 1.6
+++ tests/mdemo/Makefile.am 22 Aug 2005 16:14:18 -0000
@@ -1,6 +1,6 @@
## Makefile.am -- Process this file with automake to produce Makefile.in
##
-## Copyright (C) 2003, 2004 Free Software Foundation
+## Copyright (C) 2003, 2004, 2005 Free Software Foundation
##
## 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
@@ -18,7 +18,7 @@
## Boston, MA 02110-1301, USA.
AUTOMAKE_OPTIONS = no-dependencies foreign
-ACLOCAL_AMFLAGS = -I ../../m4
+ACLOCAL_AMFLAGS = -I ../../libltdl/m4
AM_CPPFLAGS = -I$(top_srcdir)/../.. $(INCLTDL)
lib_LTLIBRARIES = libsub.la foo1.la libfoo2.la libmlib.la
@@ -49,7 +49,7 @@ top_distdir = ../..
@LIBLTDL@: $(top_distdir)/libtool $(top_distdir)/libltdl/libtool \
$(top_distdir)/libltdl/config.h $(srcdir)/$(top_distdir)/libltdl/ltdl.c \
$(srcdir)/$(top_distdir)/libltdl/ltdl.h
- (cd $(top_distdir)/libltdl; $(MAKE) `echo $(LIBLTDL) | sed
's,.*\.\./libltdl/,,g'`)
+ (cd $(top_distdir); $(MAKE) `echo $(LIBLTDL) | sed
's,.*\.\./libltdl/,libltdl/,g'`)
# Without the following line, the check may fail if libltdl/libtool is
# removed after libltdl is configured
$(top_distdir)/libltdl/libtool $(top_distdir)/libltdl/config.h:
Index: tests/mdemo/configure.ac
===================================================================
RCS file: /cvsroot/libtool/libtool/tests/mdemo/configure.ac,v
retrieving revision 1.12
diff -u -p -r1.12 configure.ac
--- tests/mdemo/configure.ac 22 Apr 2005 10:10:31 -0000 1.12
+++ tests/mdemo/configure.ac 22 Aug 2005 16:14:18 -0000
@@ -1,5 +1,5 @@
## Process this file with autoconf to create configure. -*- autoconf -*-
-# Copyright (C) 2001, 2003, 2004 Free Software Foundation, Inc.
+# Copyright (C) 2001, 2003, 2004, 2005 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
@@ -24,7 +24,7 @@ AC_PREREQ(2.54)
## ------------------------ ##
AC_INIT([mdemo], [1.0], address@hidden)
AC_CONFIG_SRCDIR([main.c])
-AC_CONFIG_AUX_DIR([../../config])
+AC_CONFIG_AUX_DIR([../../libltdl/config])
## ------------------------ ##
Index: tests/mdemo2/Makefile.am
===================================================================
RCS file: /cvsroot/libtool/libtool/tests/mdemo2/Makefile.am,v
retrieving revision 1.7
diff -u -p -r1.7 Makefile.am
--- tests/mdemo2/Makefile.am 22 Apr 2005 10:10:31 -0000 1.7
+++ tests/mdemo2/Makefile.am 22 Aug 2005 16:14:18 -0000
@@ -1,6 +1,6 @@
## Makefile.am -- Process this file with automake to produce Makefile.in
##
-## Copyright (C) 2003, 2004 Free Software Foundation
+## Copyright (C) 2003, 2004, 2005 Free Software Foundation
##
## 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
@@ -18,7 +18,7 @@
## Boston, MA 02110-1301, USA.
AUTOMAKE_OPTIONS = no-dependencies foreign
-ACLOCAL_AMFLAGS = -I ../../m4
+ACLOCAL_AMFLAGS = -I ../../libltdl/m4
AM_CPPFLAGS = -I$(top_srcdir)/../.. -I$(top_srcdir)/../../libltdl
bin_PROGRAMS = mdemo2 mdemo2_static
Index: tests/mdemo2/configure.ac
===================================================================
RCS file: /cvsroot/libtool/libtool/tests/mdemo2/configure.ac,v
retrieving revision 1.12
diff -u -p -r1.12 configure.ac
--- tests/mdemo2/configure.ac 22 Apr 2005 10:10:31 -0000 1.12
+++ tests/mdemo2/configure.ac 22 Aug 2005 16:14:18 -0000
@@ -1,5 +1,5 @@
## Process this file with autoconf to create configure. -*- autoconf -*-
-# Copyright (C) 2001, 2003, 2004 Free Software Foundation, Inc.
+# Copyright (C) 2001, 2003, 2004, 2005 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
@@ -24,7 +24,7 @@ AC_PREREQ(2.54)
## ------------------------ ##
AC_INIT([mdemo2], [1.0], address@hidden)
AC_CONFIG_SRCDIR([main.c])
-AC_CONFIG_AUX_DIR([../../config])
+AC_CONFIG_AUX_DIR([../../libltdl/config])
## ------------------------ ##
Index: tests/pdemo/Makefile.am
===================================================================
RCS file: /cvsroot/libtool/libtool/tests/pdemo/Makefile.am,v
retrieving revision 1.7
diff -u -p -r1.7 Makefile.am
--- tests/pdemo/Makefile.am 22 Apr 2005 10:10:31 -0000 1.7
+++ tests/pdemo/Makefile.am 22 Aug 2005 16:14:18 -0000
@@ -1,6 +1,6 @@
## Makefile.am -- Process this file with automake to produce Makefile.in
##
-## Copyright (C) 2003, 2004 Free Software Foundation
+## Copyright (C) 2003, 2004, 2005 Free Software Foundation
##
## 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
@@ -18,7 +18,7 @@
## Boston, MA 02110-1301, USA.
AUTOMAKE_OPTIONS = no-dependencies foreign
-ACLOCAL_AMFLAGS = -I ../../m4
+ACLOCAL_AMFLAGS = -I ../../libltdl/m4
AM_CPPFLAGS = -I$(top_srcdir)/../..
# Build a libtool library, libhello.la for installation in libdir.
Index: tests/pdemo/configure.ac
===================================================================
RCS file: /cvsroot/libtool/libtool/tests/pdemo/configure.ac,v
retrieving revision 1.12
diff -u -p -r1.12 configure.ac
--- tests/pdemo/configure.ac 22 Apr 2005 10:10:31 -0000 1.12
+++ tests/pdemo/configure.ac 22 Aug 2005 16:14:18 -0000
@@ -1,5 +1,5 @@
## Process this file with autoconf to create configure. -*- autoconf -*-
-# Copyright (C) 2001, 2003, 2004 Free Software Foundation, Inc.
+# Copyright (C) 2001, 2003, 2004, 2005 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
@@ -24,7 +24,7 @@ AC_PREREQ(2.54)
## ------------------------ ##
AC_INIT([pdemo], [1.0], address@hidden)
AC_CONFIG_SRCDIR([longer_file_name_hello.c])
-AC_CONFIG_AUX_DIR([../../config])
+AC_CONFIG_AUX_DIR([../../libltdl/config])
## ------------------------ ##
Index: tests/tagdemo/Makefile.am
===================================================================
RCS file: /cvsroot/libtool/libtool/tests/tagdemo/Makefile.am,v
retrieving revision 1.7
diff -u -p -r1.7 Makefile.am
--- tests/tagdemo/Makefile.am 22 Apr 2005 10:10:31 -0000 1.7
+++ tests/tagdemo/Makefile.am 22 Aug 2005 16:14:18 -0000
@@ -1,6 +1,6 @@
## Makefile.am -- Process this file with automake to produce Makefile.in
##
-## Copyright (C) 2003, 2004 Free Software Foundation
+## Copyright (C) 2003, 2004, 2005 Free Software Foundation
##
## 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
@@ -18,7 +18,7 @@
## Boston, MA 02110-1301, USA.
AUTOMAKE_OPTIONS = no-dependencies foreign
-ACLOCAL_AMFLAGS = -I ../../m4
+ACLOCAL_AMFLAGS = -I ../../libltdl/m4
AM_CPPFLAGS = -I$(top_srcdir)/../..
noinst_LTLIBRARIES = libconv.la
Index: tests/tagdemo/configure.ac
===================================================================
RCS file: /cvsroot/libtool/libtool/tests/tagdemo/configure.ac,v
retrieving revision 1.11
diff -u -p -r1.11 configure.ac
--- tests/tagdemo/configure.ac 22 Apr 2005 10:10:31 -0000 1.11
+++ tests/tagdemo/configure.ac 22 Aug 2005 16:14:18 -0000
@@ -1,5 +1,5 @@
## Process this file with autoconf to create configure. -*- autoconf -*-
-# Copyright (C) 2001, 2003, 2004 Free Software Foundation, Inc.
+# Copyright (C) 2001, 2003, 2004, 2005 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
@@ -24,7 +24,7 @@ AC_PREREQ(2.54)
## ------------------------ ##
AC_INIT([tagdemo], [1.0], address@hidden)
AC_CONFIG_SRCDIR([foo.cpp])
-AC_CONFIG_AUX_DIR([../../config])
+AC_CONFIG_AUX_DIR([../../libltdl/config])
AC_CANONICAL_TARGET
signature.asc
Description: OpenPGP digital signature
- Re: template test with subdirs failure for HEAD on darwin [WAS support standalone libltdl [libtool--gary--1.0--patch-23]], (continued)
- Re: template test with subdirs failure for HEAD on darwin [WAS support standalone libltdl [libtool--gary--1.0--patch-23]], Ralf Wildenhues, 2005/08/21
- Re: template test with subdirs failure for HEAD on darwin [WAS support standalone libltdl [libtool--gary--1.0--patch-23]], Gary V. Vaughan, 2005/08/21
- Re: template test with subdirs failure for HEAD on darwin [WAS support standalone libltdl [libtool--gary--1.0--patch-23]], Peter O'Gorman, 2005/08/21
- Re: template test with subdirs failure for HEAD on darwin [WAS support standalone libltdl [libtool--gary--1.0--patch-23]], Gary V. Vaughan, 2005/08/21
- Re: template test with subdirs failure for HEAD on darwin [WAS support standalone libltdl [libtool--gary--1.0--patch-23]], Gary V. Vaughan, 2005/08/21
- Re: template test with subdirs failure for HEAD on darwin [WAS support standalone libltdl [libtool--gary--1.0--patch-23]], Peter O'Gorman, 2005/08/21
Re: support standalone libltdl [libtool--gary--1.0--patch-23], Gary V. Vaughan, 2005/08/22
- Re: support standalone libltdl [libtool--gary--1.0--patch-23], Ralf Wildenhues, 2005/08/22
- Re: support standalone libltdl [libtool--gary--1.0--patch-23],
Gary V. Vaughan <=
- Re: support standalone libltdl [libtool--gary--1.0--patch-23], Ralf Wildenhues, 2005/08/22
- Re: support standalone libltdl [libtool--gary--1.0--patch-23], Bob Friesenhahn, 2005/08/22
- Re: support standalone libltdl [libtool--gary--1.0--patch-23], Noah Misch, 2005/08/22
- Re: support standalone libltdl [libtool--gary--1.0--patch-23], Gary V. Vaughan, 2005/08/22
- Re: support standalone libltdl [libtool--gary--1.0--patch-23], Noah Misch, 2005/08/22
Message not availableRe: support standalone libltdl [libtool--gary--1.0--patch-23], Gary V. Vaughan, 2005/08/22
Re: support standalone libltdl [libtool--gary--1.0--patch-23], Ralf Wildenhues, 2005/08/22
Re: support standalone libltdl [libtool--gary--1.0--patch-23], Gary V. Vaughan, 2005/08/22
Re: support standalone libltdl [libtool--gary--1.0--patch-23], Ralf Wildenhues, 2005/08/22
Re: support standalone libltdl [libtool--gary--1.0--patch-23], Gary V. Vaughan, 2005/08/19