diff options
| author | Gary V. Vaughan <gary@gnu.org> | 2008-01-06 16:33:31 +0000 |
|---|---|---|
| committer | Gary V. Vaughan <gary@gnu.org> | 2008-01-06 16:33:31 +0000 |
| commit | 2ebff7eea07df1d9ff7f317b0f895cd2162ba454 (patch) | |
| tree | aa7d2f29ad72a2f605d4c3d57fbd6a083b0641c6 /configure.ac | |
| parent | 920b97072f3cf8a9e04e8e6cafc1126e73a71710 (diff) | |
| download | libtool-2ebff7eea07df1d9ff7f317b0f895cd2162ba454.tar.gz | |
Move libltdl build mode options from LT_CONFIG_LTDL_DIR to
LTDL_INIT. Accept (optional) new 'convenience' and 'installable'
options in lieu of LTDL_CONVENIENCE and LTDL_INSTALL macros. And
also, implement --with-included-ltdl, --with-ltdl-lib and
--with-ltdl-include configure-time options:
* libltdl/m4/ltoptions.m4: Associate existing option settings with
LT_INIT.
(LT_OPTION_DEFINE): Associate options 'nonrecursive', 'recursive',
'subproject', 'installable' and 'convenience' with LTDL_INIT.
(_LT_MANGLE_OPTION, _LT_SET_OPTION, _LT_IF_OPTION)
(_LT_UNLESS_OPTIONS, _LT_SET_OPTIONS): Add MACRO-NAME argument to
support options to named macros instead of hardcoding only LT_INIT
options.
* libltdl/m4/ltdl.m4 (_LTDL_CONVENIENCE): Factor common code from
LTDL_CONVENIENCE and LTDL_INIT([convenience]).
(_LTDL_INSTALLABLE): Factor out common code from LTDL_INSTALLABLE
and LTDL_INIT([installable]).
(_LTDL_SETUP): Renamed from LTDL_INIT. Support new configure-time
options: --with-included-ltdl, --with-ltdl-lib,
--with-ltdl-include.
(LTDL_CONVENIENCE, LTDL_INSTALLABLE): Adjust.
(LT_WITH_LTDL): Removed.
(LTDL_INIT): Parse caller options.
* libltdl/m4/libtool.m4 (LT_INIT): Declare that this macro must be
expanded before LTDL_INIT, and be sure to parse caller options.
* configure.ac: Call directly into internal _LTDL_SETUP macro.
* libtoolize.m4sh (func_scan_files): Ltdl mode argument moved from
LT_CONFIG_LTDL_DIR to LT_INIT.
* tests/nonrecursive.at, tests/recursive.at: Use new interfaces.
* tests/configure-iface.at: Test it.
* Makefile.am (TESTSUITE_AT): Add configure-iface.at.
* doc/libtool.texi (Distributing libltdl): Document improved.
LTDL_INIT interfaces.
* NEWS: Updated.
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index fef57953..3e2b4971 100644 --- a/configure.ac +++ b/configure.ac @@ -1,6 +1,6 @@ # Process this file with autoconf to create configure. -*- autoconf -*- -# Copyright (C) 2001, 2004, 2005 Free Software Foundation, Inc. +# Copyright (C) 2001, 2004, 2005, 2008 Free Software Foundation, Inc. # Written by Gary V. Vaughan, 2001 # # This file is part of GNU Libtool. @@ -181,7 +181,7 @@ AC_PROG_CPP ## Libtool initialisation. ## ## ----------------------- ## LT_INIT([dlopen win32-dll]) -LTDL_INIT([libltdl]) +_LTDL_SETUP # Enable all the language support we can LT_LANG(C++) |