From: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Date: Wed, 31 Aug 2005 11:50:46 +0000 (+0000)
Subject: * libltdl/m4/ltoptions.m4 (_LT_SET_OPTIONS): Move option macro
X-Git-Tag: release-2-1b~540
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0d0e4d3075fc0a9aa06842d12ba3c7e5583373e4;p=thirdparty%2Flibtool.git

* libltdl/m4/ltoptions.m4 (_LT_SET_OPTIONS): Move option macro
dipatch..
(_LT_SET_OPTION): here.  Do not fail but warn on unknown
options.
(_LT_UNLESS_OPTIONS(win32-dll), LT_OPTION_DEFINE(dlopen)):
Add whitespace.
Reported by Robert Ögren <lists@roboros.com> and
Akim Demaille <akim@lrde.epita.fr>.
---

diff --git a/ChangeLog b/ChangeLog
index ba831672a..58433dd3b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2005-08-31  Gary V. Vaughan <gary@gnu.org>,
+	    Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
+
+	* libltdl/m4/ltoptions.m4 (_LT_SET_OPTIONS): Move option macro
+	dipatch..
+	(_LT_SET_OPTION): here.  Do not fail but warn on unknown
+	options.
+	(_LT_UNLESS_OPTIONS(win32-dll), LT_OPTION_DEFINE(dlopen)):
+	Add whitespace.
+	Reported by Robert Ögren <lists@roboros.com> and
+	Akim Demaille <akim@lrde.epita.fr>.
+
 2005-08-31  Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
 
 	* libltdl/m4/libtool.m4 [ solaris CC ]: Document issue with C++
diff --git a/libltdl/m4/ltoptions.m4 b/libltdl/m4/ltoptions.m4
index 32a0f4a12..4da9fb49f 100644
--- a/libltdl/m4/ltoptions.m4
+++ b/libltdl/m4/ltoptions.m4
@@ -20,9 +20,15 @@ m4_define([_LT_MANGLE_OPTION],
 
 
 # _LT_SET_OPTION(NAME)
-# ------------------------------
-# Set option NAME.  Other NAMEs are saved as a flag.
-m4_define([_LT_SET_OPTION], [m4_define(_LT_MANGLE_OPTION([$1]))])
+# --------------------
+# Set option NAME, and if there is a matching handler defined,
+# dispatch to it.  Other NAMEs are saved as a flag.
+m4_define([_LT_SET_OPTION],
+[m4_define(_LT_MANGLE_OPTION([$1]))dnl
+m4_ifdef(_LT_MANGLE_DEFUN([$1]),
+        _LT_MANGLE_DEFUN([$1]),
+    [m4_warn([Unknown Libtool option `$1'])])[]dnl
+])
 
 
 # _LT_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET])
@@ -52,16 +58,14 @@ m4_ifdef([$0_found], [m4_undefine([$0_found])], [$2
 # and exit.
 m4_define([_LT_SET_OPTIONS],
 [m4_foreach([_LT_Option], m4_split(m4_normalize([$1])),
-    [_LT_SET_OPTION(_LT_Option)
-    m4_ifdef(_LT_MANGLE_DEFUN(_LT_Option),
-	     _LT_MANGLE_DEFUN(_LT_Option),
-	[m4_fatal([Unknown option `]_LT_Option[' to LT][_INIT_LIBTOOL])])
-    ])dnl
+    [_LT_SET_OPTION(_LT_Option)])
 dnl
 dnl Simply set some default values (i.e off) if boolean options were not
 dnl specified:
-_LT_UNLESS_OPTIONS([dlopen], enable_dlopen=no)
-_LT_UNLESS_OPTIONS([win32-dll], enable_win32_dll=no)
+_LT_UNLESS_OPTIONS([dlopen], [enable_dlopen=no
+])
+_LT_UNLESS_OPTIONS([win32-dll], [enable_win32_dll=no
+])
 dnl
 dnl If no reference was made to various pairs of opposing options, then
 dnl we run the default mode handler for the pair.  For example, if neither
@@ -92,7 +96,8 @@ m4_define([LT_OPTION_DEFINE],
 
 # dlopen
 # ------
-LT_OPTION_DEFINE([dlopen], [enable_dlopen=yes])
+LT_OPTION_DEFINE([dlopen], [enable_dlopen=yes
+])
 
 AU_DEFUN([AC_LIBTOOL_DLOPEN],
 [_LT_SET_OPTION([dlopen])