* libltdl/m4/ltoptions.m4 (_LT_SET_OPTIONS): m4_defun this..

* libltdl/m4/libtool.m4 (LT_INIT): so it can be m4_require'd
from here with user-supplied options.  Fixes output macro
ordering issue.
This commit is contained in:
Ralf Wildenhues 2005-09-01 11:41:26 +00:00
parent 07821db0fd
commit 9af1d3e4e7
3 changed files with 11 additions and 5 deletions

View File

@ -1,3 +1,10 @@
2005-09-01 Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
* libltdl/m4/ltoptions.m4 (_LT_SET_OPTIONS): m4_defun this..
* libltdl/m4/libtool.m4 (LT_INIT): so it can be m4_require'd
from here with user-supplied options. Fixes output macro
ordering issue.
2005-09-01 Gary V. Vaughan <gary@gnu.org>
* libtoolize.m4sh (func_scan_files): When searching for evidence

View File

@ -65,6 +65,7 @@ AC_REQUIRE([LTOPTIONS_VERSION])dnl
AC_REQUIRE([LTSUGAR_VERSION])dnl
AC_REQUIRE([LTVERSION_VERSION])dnl
m4_require([_LT_PROG_LTMAIN])dnl
m4_require([_LT_SET_OPTIONS], [_LT_SET_OPTIONS([$1])])dnl
# This can be used to rebuild libtool when needed
LIBTOOL_DEPS="$ltmain"
@ -73,9 +74,6 @@ LIBTOOL_DEPS="$ltmain"
LIBTOOL='$(SHELL) $(top_builddir)/libtool'
AC_SUBST(LIBTOOL)dnl
# Set options
_LT_SET_OPTIONS([$1])dnl
_LT_SETUP
# Only expand once:

View File

@ -56,8 +56,9 @@ m4_ifdef([$0_found], [m4_undefine([$0_found])], [$2
# If any OPTION has a handler macro declared with LT_OPTION_DEFINE,
# dispatch to that macro; otherwise complain about the unknown option
# and exit.
m4_define([_LT_SET_OPTIONS],
[m4_foreach([_LT_Option], m4_split(m4_normalize([$1])),
m4_defun([_LT_SET_OPTIONS],
[# Set options
m4_foreach([_LT_Option], m4_split(m4_normalize([$1])),
[_LT_SET_OPTION(_LT_Option)])
dnl
dnl Simply set some default values (i.e off) if boolean options were not