Francois Gouget : winejack: Fix detection of jack libraries with a bad soname.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 90a6fb047eb75db3472f38580fc963bf7310e1cc
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=90a6fb047eb75db3472f38580f...

Author: Francois Gouget <fgouget(a)codeweavers.com>
Date:   Fri Jul 11 17:47:23 2008 +0200

winejack: Fix detection of jack libraries with a bad soname.

---

 configure    |    4 ++--
 configure.ac |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/configure b/configure
index 56eb2c9..36832f3 100755
--- a/configure
+++ b/configure
@@ -15154,8 +15154,8 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
        $as_test_x conftest$ac_exeext; then
   case "$LIBEXT" in
     dll) ;;
-    dylib) ac_cv_lib_soname_jack=`otool -L conftest$ac_exeext | grep "libjack\\.[0-9A-Za-z.]*dylib" | sed -e "s/^.*\/\(libjack\.[0-9A-Za-z.]*dylib\).*$/\1/"';2,$d'` ;;
-    *) ac_cv_lib_soname_jack=`$ac_cv_path_LDD conftest$ac_exeext | grep "libjack\\.$LIBEXT" | sed -e "s/^.*\(libjack\.$LIBEXT[^	 ]*\).*$/\1/"';2,$d'` ;;
+    dylib) ac_cv_lib_soname_jack=`otool -L conftest$ac_exeext | grep "libjack-*[0-9.]*\\.[0-9A-Za-z.]*dylib" | sed -e "s/^.*\/\(libjack-*[0-9.]*\.[0-9A-Za-z.]*dylib\).*$/\1/"';2,$d'` ;;
+    *) ac_cv_lib_soname_jack=`$ac_cv_path_LDD conftest$ac_exeext | grep "libjack-*[0-9.]*\\.$LIBEXT" | sed -e "s/^.*\(libjack-*[0-9.]*\.$LIBEXT[^	 ]*\).*$/\1/"';2,$d'` ;;
   esac
 else
   echo "$as_me: failed program was:" >&5
diff --git a/configure.ac b/configure.ac
index bef895b..8ed54a8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1129,7 +1129,7 @@ WINE_NOTICE_WITH(cups,[test "x$ac_cv_lib_soname_cups" = "x"],
 dnl **** Check for jack ****
 if test "$ac_cv_header_jack_jack_h" = "yes"
 then
-    WINE_CHECK_SONAME(jack,jack_client_new)
+    WINE_CHECK_SONAME(jack,jack_client_new,,,,[[libjack-*[[0-9.]]*]])
 fi
 
 dnl **** Check for fontconfig ****