Commit Graph

22 Commits

Author SHA1 Message Date
Gary V. Vaughan
746e5a476a Support 'recursive' mode for building libltdl: Automake will
recursively descend into the libltdl directory, and use libltdl's
Makefile.am code to build libltdl:
* ltdl.m4 (LT_CONFIG_LTDL_DIR): Don't barf on 'recursive' mode
for 2nd argument.
(_LTDL_MODE_DISPATCH): Handle recursive mode.
2005-11-07 14:18:15 +00:00
Gary V. Vaughan
1d7d709392 * libltdl/m4/ltdl.m4 (LTDL_INIT): Don't force running
AC_CONFIG_HEADERS for subproject ltdl.
* tests/old-m4-iface.at, tests/subproject.at: Remove workaround.
2005-11-07 12:42:40 +00:00
Gary V. Vaughan
c0d31c3321 * libltdl/m4/ltdl.m4 (LT_CONFIG_LTDL_DIR): Add LTDL-MODE
argument.
* configure.ac: Use it.
2005-11-07 12:34:27 +00:00
Ralf Wildenhues
580906de04 * Makefile.am: `2>&1' as suggested by Albert Chin.
* libltdl/m4/libtool.m4, libltdl/m4/ltdl.m4:
Two newlines before each macro, fix underlines.
2005-11-06 11:37:25 +00:00
Gary V. Vaughan
0c25422a6c * tests/nonrecursive.at: New tests for libltdl as a subdirectory,
configured and compiled from the toplevel project.
* tests/testsuite.at: Use it.
(LT_AT_AUTOHEADER): New macro.
* Makefile.am (TESTSUITE_AT): Depend on nonrecursive.at.
2005-11-02 17:43:51 +00:00
Gary V. Vaughan
e8c879bb97 * libltdl/m4/ltdl.m4 (LTDL_INIT): Call _LT_ENABLE_INSTALL directly
instead of m4_requiring it, as it relies on enable_ltdl_install
and enable_ltdl_convenience to have been initialised first.
2005-11-01 14:32:18 +00:00
Kean Johnston
00ede62b4c * libltdl/m4/ltdl.m4 (LT_SYS_DLOPEN_DEPLIBS): All SCO platforms
open dependency libraries when you dlopen a module.
2005-10-31 09:44:28 +00:00
Gary V. Vaughan
16ef6d9b8e * libltdl/m4/ltdl.m4 (LT_WITH_LTDL): Don't nest AC_MSG_CHECKING/
AC_MSG_RESULT pairs.
2005-10-14 15:43:08 +00:00
Ralf Wildenhues
0ea91b1940 * libltdl/m4/ltdl.m4 (LT_WITH_LTDL): Also set INCLTDL. 2005-10-11 11:27:56 +00:00
Ralf Wildenhues
35fc3630d8 * libltdl/m4/ltdl.m4 (LTDL_CONVENIENCE, LTDL_INSTALLABLE)
(LT_WITH_LTDL): Revert Gary's 2005-10-10 patch.
2005-10-11 11:25:08 +00:00
Gary V. Vaughan
76466c93ad * libltdl/m4/ltdl.m4 (_LT_ENABLE_INSTALL): Remove bogus extra
closing brackets.
2005-10-10 17:28:58 +00:00
Gary V. Vaughan
db78393b63 * libltdl/m4/ltdl.m4 (LTDL_CONVENIENCE, LTDL_INSTALLABLE): Remove
AC_SUBST of LIBLTDL, LTDLINCL, and all mention of INCLTDL.
(LT_WITH_LTDL): Due to order constraints between LTDL_CONVENIENCE,
LTDL_INSTALLABLE, LT_WITH_LTDL & LTDL_INIT, we can safely AC_SUBST
LIBLTDL and LTDLINCL here.  Also, remember to synch INCLTDL.
2005-10-10 17:20:10 +00:00
Gary V. Vaughan
e3ab6c9f4f * libltdl/m4/ltdl.m4 (_LT_CONFIG_LTDL_DIR): Spurious './' prefixes
upset BSD pmake, don't set lt_ltdl_dir in this case.
(LTDL_CONVENIENCE, LTDL_INSTALLABLE): Adjust.
2005-10-05 09:42:41 +00:00
Gary V. Vaughan
9f6099490a * libltdl/m4/ltdl.m4: Bump serial as we are changing the
interface.
(LT_CONFIG_LTDL_DIR): New macro to centralise setting the
subdirectory used for libltdl.
(LTDL_CONVENIENCE): Continue backwards compatibility support for
declaring the libltdl source subdirectory with an argument, but
defer to LT_CONFIG_LTDL_DIR.
(AC_LIBLTDL_CONVENIENCE): Adjust to upgrade to the new style.
(LTDL_INSTALLABLE, AC_LIBLTDL_INSTALLABLE): Ditto.
(LTDL_INIT): lt_ltdl_dir is set by LT_CONFIG_LTDL_DIR now, and
even `./' needs trailing slashes trimming!  If the user didn't
upgrade their configure.ac yet, call LT_CONFIG_LTDL_DIR for them.
* libtoolize.m4sh (func_scan_files): If --ltdl option is given
without a directory argument, use the value from
LT_CONFIG_LTDL_DIR; if the argument is given, and there is also a
value in LT_CONFIG_LTDL_DIR, ensure they are the same.
* libltdl/configure.ac: Use it.
* NEWS: Updated.
2005-10-03 15:45:47 +00:00
Ralf Wildenhues
609c71cc50 * libltdl/m4/ltdl.m4 (LTDL_INIT) <CONFIG_H>: Rename to..
<LT_CONFIG_H>: this, to contain the name of the config
header.
* Makefile.am <DEFS>: Use it to define LT_CONFIG_H.
* HACKING, libltdl/argz.c, libltdl/lt__alloc.c,
libltdl/libltdl/lt__dirent.h, libltdl/libltdl/lt__glibc.h,
libltdl/libltdl/lt__private.h, libltdl/libltdl/lt__strl.h:
Adjusted.
2005-09-17 07:29:03 +00:00
Ralf Wildenhues
d0963c53c2 * libltdl/m4/ltdl.m4 (LT_WITH_LTDL, LTDL_CONVENIENCE)
(LTDL_INSTALLABLE): Use less quoting for expanded LIBLTDL,
LTDLINCL.  Use m4_default instead of m4_if, to work
around AU_ALIAS bug with empty macro arguments.
(LTDL_INIT): Likewise.
* libltdl/m4/ltoptions.m4 (_LT_WITH_PIC): Likewise.
* TODO, HACKING: Updated.
2005-09-12 11:21:40 +00:00
Gary V. Vaughan
2a7742ed61 * libltdl/m4/ltdl.m4 (LTDL_CONVENIENCE): Fix the comment to not
pretend that LIBLTDL and LTDLINCL are not AC_SUBSTed here.
2005-08-29 10:47:41 +00:00
Gary V. Vaughan
684fb2fa37 * libltdl/m4/libtool.m4, libltdl/m4/ltdl.m4: AU_DEFUN doesn't pass
arguments.  Use AU_ALIAS instead!
2005-08-28 22:55:40 +00:00
Ralf Wildenhues
cbd5046d65 * libltdl/m4/ltdl.m4 (LT_SYS_SYMBOL_USCORE): Use _LT_EOF, not
EOF.
2005-08-24 11:13:18 +00:00
Stepan Kasal
d452d7e4cc * libltdl/m4/ltdl.m4 (LTDL_INIT): Use AH_HEADER if defined.
Compute CONFIG_H only before creating config.status.
Reported by Peter Ekberg <peda@axentia.se>.
2005-08-23 16:04:27 +00:00
Gary V. Vaughan
757d7dc478 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-23 01:49:37 +00:00
Peter Ekberg
efe47e6656 This commit results in a temporary non-building tree, but CVS can't
cope with moving a file and changing it in the same changeset:

* config, m4: Moved from here...
* libltdl/config, libltdl/m4: ...to here.
2005-08-22 22:33:35 +00:00