]> git.ipfire.org Git - thirdparty/libarchive.git/commitdiff
Merge r4050 from trunk to fix Issue 212.
authorTim Kientzle <kientzle@gmail.com>
Sat, 31 Dec 2011 18:54:34 +0000 (13:54 -0500)
committerTim Kientzle <kientzle@gmail.com>
Sat, 31 Dec 2011 18:54:34 +0000 (13:54 -0500)
SVN-Revision: 4051

configure.ac

index 763d659350aae803c677d10d2e0fc7c3ceb531d3..6a8a01f7471e0db5e29f49ebb1df340e20f31a9a 100644 (file)
@@ -571,7 +571,9 @@ main(int argc, char **argv)
     [ AC_MSG_RESULT([yes])
       found_$1=yes
       if [[ -n "$4" ]]; then
-        test -n "$(echo $mdLIBS | $GREP .$4)" || mdLIBS="$mdLIBS $4"
+        # The .$4 avoids -e, which doesn't work on Solaris 10
+       # The _$mdLIBS allows .$4 to match at beginning of string <sigh>
+        test -n "$(echo _$mdLIBS | $GREP .$4)" || mdLIBS="$mdLIBS $4"
       fi
       AC_DEFINE(ARCHIVE_CRYPTO_$1_$2, 1, [ $1 via ARCHIVE_CRYPTO_$1_$2 supported.])
     ],