From: Jacob Meuser <jakemsr@jakemsr.com>
Date: Tue, 3 Aug 2004 14:54:34 +0000 (+0000)
Subject: * ltmain.in: Allow some static libraries to be used in generating a
X-Git-Tag: release-1-9b~27
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5326cb1cafb5f81eb0910116ac92a0a46f6605ba;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 cf629b42d..344c88282 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  Geoffrey Keating  <geoffk@apple.com>
 
 	* m4/libtool.m4 [darwin]: Don't use -all_load.
diff --git a/config/ltmain.in b/config/ltmain.in
index 1416769fb..b4827c8d7 100644
--- a/config/ltmain.in
+++ b/config/ltmain.in
@@ -2412,7 +2412,22 @@ EOF
 	    case " $dlpreconveniencelibs " 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"