configure: Make the libjack soname check depend on the header check.

configure

@@ -13664,6 +13664,88 @@ fi
 
 fi
 
+if test "$ac_cv_header_jack_jack_h" = "yes"
+then
+    { echo "$as_me:$LINENO: checking for -ljack" >&5
+echo $ECHO_N "checking for -ljack... $ECHO_C" >&6; }
+if test "${ac_cv_lib_soname_jack+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  ac_check_soname_save_LIBS=$LIBS
+LIBS="-ljack  $LIBS"
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char jack_client_new ();
+int
+main ()
+{
+return jack_client_new ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $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'` ;;
+  esac
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
+  LIBS=$ac_check_soname_save_LIBS
+fi
+if test "x$ac_cv_lib_soname_jack" = "x"; then
+  { echo "$as_me:$LINENO: result: not found" >&5
+echo "${ECHO_T}not found" >&6; }
+
+else
+  { echo "$as_me:$LINENO: result: $ac_cv_lib_soname_jack" >&5
+echo "${ECHO_T}$ac_cv_lib_soname_jack" >&6; }
+
+cat >>confdefs.h <<_ACEOF
+#define SONAME_LIBJACK "$ac_cv_lib_soname_jack"
+_ACEOF
+
+
+fi
+
+fi
+
 
 EXTRACFLAGS=""
 
@@ -15154,84 +15236,6 @@ _ACEOF
 
 fi
 
-{ echo "$as_me:$LINENO: checking for -ljack" >&5
-echo $ECHO_N "checking for -ljack... $ECHO_C" >&6; }
-if test "${ac_cv_lib_soname_jack+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_check_soname_save_LIBS=$LIBS
-LIBS="-ljack  $LIBS"
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char jack_client_new ();
-int
-main ()
-{
-return jack_client_new ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $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'` ;;
-  esac
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-  LIBS=$ac_check_soname_save_LIBS
-fi
-if test "x$ac_cv_lib_soname_jack" = "x"; then
-  { echo "$as_me:$LINENO: result: not found" >&5
-echo "${ECHO_T}not found" >&6; }
-
-else
-  { echo "$as_me:$LINENO: result: $ac_cv_lib_soname_jack" >&5
-echo "${ECHO_T}$ac_cv_lib_soname_jack" >&6; }
-
-cat >>confdefs.h <<_ACEOF
-#define SONAME_LIBJACK "$ac_cv_lib_soname_jack"
-_ACEOF
-
-
-fi
-
 { echo "$as_me:$LINENO: checking for -lfontconfig" >&5
 echo $ECHO_N "checking for -lfontconfig... $ECHO_C" >&6; }
 if test "${ac_cv_lib_soname_fontconfig+set}" = set; then

configure.ac

@@ -973,6 +973,12 @@ then
     WINE_CHECK_SONAME(cups,cupsGetDefault)
 fi
 
+dnl **** Check for jack ****
+if test "$ac_cv_header_jack_jack_h" = "yes"
+then
+    WINE_CHECK_SONAME(jack,jack_client_new)
+fi
+
 dnl **** Check for gcc specific options ****
 
 AC_SUBST(EXTRACFLAGS,"")
@@ -1121,7 +1127,6 @@ WINE_CHECK_SONAME(Xcursor,XcursorImageLoadCursor,,,[$X_LIBS -lX11 $X_EXTRA_LIBS]
 WINE_CHECK_SONAME(freetype,FT_Init_FreeType,,,[$X_LIBS])
 WINE_CHECK_SONAME(GL,glXQueryExtension,,,[$X_LIBS $X_EXTRA_LIBS])
 WINE_CHECK_SONAME(txc_dxtn,fetch_2d_texel_rgba_dxt1)
-WINE_CHECK_SONAME(jack,jack_client_new)
 WINE_CHECK_SONAME(fontconfig,FcInit)
 WINE_CHECK_SONAME(ssl,SSL_library_init)
 WINE_CHECK_SONAME(crypto,BIO_new_socket)

dlls/winejack.drv/audio.c

@@ -63,7 +63,7 @@
 
 WINE_DEFAULT_DEBUG_CHANNEL(wave);
 
-#ifdef HAVE_JACK_JACK_H
+#ifdef SONAME_LIBJACK
 
 #define MAKE_FUNCPTR(f) static typeof(f) * fp_##f = NULL;
 
@@ -2386,7 +2386,7 @@ DWORD WINAPI JACK_widMessage(WORD wDevID, WORD wMsg, DWORD dwUser,
   return MMSYSERR_NOTSUPPORTED;
 }
 
-#else /* !HAVE_JACK_JACK_H */
+#else /* !SONAME_LIBJACK */
 
 /**************************************************************************
  * 				widMessage (WINEJACK.6)
@@ -2408,4 +2408,4 @@ DWORD WINAPI JACK_wodMessage(WORD wDevID, WORD wMsg, DWORD dwUser,
   return MMSYSERR_NOTENABLED;
 }
 
-#endif /* HAVE_JACK_JACK_H */
+#endif /* SONAME_LIBJACK */

dlls/winejack.drv/jack.c

@@ -37,11 +37,7 @@
 
 WINE_DEFAULT_DEBUG_CHANNEL(jack);
 
-#ifdef HAVE_JACK_JACK_H
-
-#ifndef SONAME_LIBJACK
-#define SONAME_LIBJACK "libjack" SONAME_EXT
-#endif
+#ifdef SONAME_LIBJACK
 
 void *jackhandle = NULL;
 
@@ -114,7 +110,7 @@ static LRESULT JACK_drvClose(DWORD_PTR dwDevID)
   TRACE("(%08lx)\n", dwDevID);
   return 1;
 }
-#endif /* #ifdef HAVE_JACK_JACK_H */
+#endif /* #ifdef SONAME_LIBJACK */
 
 
 /**************************************************************************
@@ -137,7 +133,7 @@ LRESULT CALLBACK JACK_DriverProc(DWORD_PTR dwDevID, HDRVR hDriv, UINT wMsg,
            wMsg, dwParam1, dwParam2);
     
     switch(wMsg) {
-#ifdef HAVE_JACK_JACK_H
+#ifdef SONAME_LIBJACK
     case DRV_LOAD:		return JACK_drvLoad();
     case DRV_FREE:		return JACK_drvFree();
     case DRV_OPEN:		return JACK_drvOpen((LPSTR)dwParam1);