From: Jacob Meuser <jakemsr@jakemsr.com>
Date: Tue, 3 Aug 2004 14:55:58 +0000 (+0000)
Subject: * ltmain.in: Allow some static libraries to be used in generating a
X-Git-Tag: release-1-5-8~2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=dba5c4a7237f3105f069e1cbf742eee47171a9a1;p=thirdparty%2Flibtool.git

* ltmain.in: Allow some static libraries to be used in generating a
shared library on NetBSD and OpenBSD. match-pattern_regex decides
which are good.
---

diff --git a/ChangeLog b/ChangeLog
index 69b955d57..5dbbf3f44 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2004-08-03  Jacob Meuser <jakemsr@jakemsr.com>
+
+	* ltmain.in: Allow some static libraries to be used in generating a
+	shared library on NetBSD and OpenBSD. match-pattern_regex decides
+	which are good.
+
 2004-08-02  Todd Vierling  <tv@duh.org>,
 	Peter O'Gorman  <peter@pogma.com>
 
diff --git a/ltmain.in b/ltmain.in
index a1cd19889..a4686d235 100644
--- a/ltmain.in
+++ b/ltmain.in
@@ -2099,7 +2099,22 @@ EOF
 	  fi
 	  case $linkmode in
 	  lib)
-	    if test "$deplibs_check_method" != pass_all; then
+	    valid_a_lib=no
+	    case $deplibs_check_method in
+	      match_pattern*)
+		set dummy $deplibs_check_method
+	        match_pattern_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"`
+		if eval $echo \"$deplib\" 2>/dev/null \
+		    | $SED 10q \
+		    | $EGREP "$match_pattern_regex" > /dev/null; then
+		  valid_a_lib=yes
+		fi
+		;;
+	      pass_all)
+		valid_a_lib=yes
+		;;
+            esac
+	    if test "$valid_a_lib" != yes; then
 	      $echo
 	      $echo "*** Warning: Trying to link with static lib archive $deplib."
 	      $echo "*** I have the capability to make that library automatically link in when"