From: Peter O'Gorman <peter@pogma.com>
Date: Tue, 29 Jan 2008 22:07:18 +0000 (+0000)
Subject: * libltdl/m4/libtool.m4 [darwin]: Changes to glob pattern matching
X-Git-Tag: release-2-1b~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=71821b098f3d2cf0f58985ae6aa0643d073adcf9;p=thirdparty%2Flibtool.git

* libltdl/m4/libtool.m4 [darwin]: Changes to glob pattern matching
to be safer.
---

diff --git a/ChangeLog b/ChangeLog
index 011a8f94f..0670cdb17 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2008-01-29  Peter O'Gorman  <peter@pogma.com>
 
+	* libltdl/m4/libtool.m4 [darwin]: Changes to glob pattern matching
+	to be safer.
+
 	Search the compiler path too.
 	* libltdl/m4/libtool.m4 (compiler_lib_search_dirs): New variable.
 	* libltdl/config/ltmain.m4sh: Use it.
diff --git a/libltdl/m4/libtool.m4 b/libltdl/m4/libtool.m4
index 14f317d26..3e0ee0620 100644
--- a/libltdl/m4/libtool.m4
+++ b/libltdl/m4/libtool.m4
@@ -928,15 +928,16 @@ m4_defun_once([_LT_REQUIRED_DARWIN_CHECKS],[
 	LDFLAGS="$save_LDFLAGS"
     ])
     case $host_os in
-      rhapsody* | darwin1.[[012]])
-        _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress'
-        ;;
-    darwin*) # Darwin 1.3 on
+    rhapsody* | darwin1.[[012]])
+      _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
+    darwin1.*)
+      _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
+    darwin*) # darwin 5.x on 
       # if running on 10.5 or later, the deployment target defaults
       # to the OS version, if on x86, and 10.4, the deployment
       # target defaults to 10.4. Don't you love it? 
       case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
-	10.0,i?86*-darwin8*|10.0,*-darwin[[91]]*)
+	10.0,*86*-darwin8*|10.0,*-darwin[[91]]*)
 	  _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
 	10.[[012]]*)
 	  _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;