* 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 69b955d57f51a068ea374daa5274e4e9540bd3fb..5dbbf3f448a1777812bde88ce72502f43e89e457 100644 (file)
--- 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 a1cd198895a0cc3ad8eb76c7f93b2c10f91afc17..a4686d2359ec0387ceef7794446093210869ab92 100644 (file)
--- 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"