FYI: HEAD: Kill two showstoppers at once

[Ralf Wildenhues]

Hi Gary,

* Gary V. Vaughan wrote on Wed, Aug 31, 2005 at 02:45:32PM CEST:
> Ralf Wildenhues wrote:
> 
> >>Ah, okay.  We just need to move the _LT_SET_OPTIONS up the expansion  
> >>stack.  If it didn't take arguments we could just AC_REQUIRE a
> >>wrapper,
> >
> >Isn't that what the optional second argument to AC_REQUIRE could be
> >used for?  It's not documented, but if Stepan recommends it..?
> >(I have asked on the autoconf list about it).
> 
> Hmm... okay.  I hadn't noticed that nuance before.

and Stepan OKed it now, so..

> >See proposed patch at end.
> 
> Looks reasonable,  however, one or both of the requiring and required 
> macro will need to be m4_defun to get the m4_provide machinery (I forget
> which, sorry).

I have applied the patch with this fixed, see below.
Thanks for reviewing!

Cheers,
Ralf

        * 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.

Index: libltdl/m4/libtool.m4
===================================================================
RCS file: /cvsroot/libtool/libtool/libltdl/m4/libtool.m4,v
retrieving revision 1.8
diff -u -r1.8 libtool.m4
--- libltdl/m4/libtool.m4       31 Aug 2005 07:37:26 -0000      1.8
+++ libltdl/m4/libtool.m4       1 Sep 2005 11:38:37 -0000
@@ -65,6 +65,7 @@
 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"
@@ -72,9 +73,6 @@
 # Always use our own libtool.
 LIBTOOL='$(SHELL) $(top_builddir)/libtool'
 AC_SUBST(LIBTOOL)dnl
-
-# Set options
-_LT_SET_OPTIONS([$1])dnl
 
 _LT_SETUP
 
Index: libltdl/m4/ltoptions.m4
===================================================================
RCS file: /cvsroot/libtool/libtool/libltdl/m4/ltoptions.m4,v
retrieving revision 1.3
diff -u -r1.3 ltoptions.m4
--- libltdl/m4/ltoptions.m4     31 Aug 2005 11:50:46 -0000      1.3
+++ libltdl/m4/ltoptions.m4     1 Sep 2005 11:38:37 -0000
@@ -56,8 +56,9 @@
 # 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