From 71429b35f54575edcdc4aafad6d2b97789f2cafa Mon Sep 17 00:00:00 2001 From: Martin Pulec Date: Thu, 1 Aug 2019 10:18:10 +0200 Subject: [PATCH] Configure: allow libjack64 lib name for JACK (Win) --- configure.ac | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index 5d7e3ad0a..c2e9aec06 100644 --- a/configure.ac +++ b/configure.ac @@ -2504,11 +2504,18 @@ AC_ARG_ENABLE(jack-transport, [jack_trans_req=no]) AC_CHECK_HEADER(jack/jack.h, FOUND_JACK_H=yes, FOUND_JACK_H=no) -AC_CHECK_LIB(jack, jack_client_new, FOUND_JACK_L=yes, FOUND_JACK_L=no) +AC_CHECK_LIB(jack, jack_client_new, [FOUND_JACK_L=yes] + [JACK_LIB=-ljack], FOUND_JACK_L=no) +if test $FOUND_JACK_L = no; then + # Windows + AC_CHECK_LIB(libjack64, jack_client_new, [FOUND_JACK_L=yes] + [JACK_LIB=-llibjack64], FOUND_JACK_L=no) +fi + if test $jack_trans_req != no -a $FOUND_JACK_H = yes -a $FOUND_JACK_L = yes then JACK_TRANS_OBJ="src/audio/jack.o" - JACK_TRANS_LIB="-ljack" + JACK_TRANS_LIB="$JACK_LIB" AC_DEFINE([HAVE_JACK_TRANS], [1], [Build with JACK transport support]) jack_trans=yes fi @@ -2527,7 +2534,6 @@ if test $jack_req != no -a $FOUND_JACK_H = yes -a $FOUND_JACK_L = yes then JACK_CAP_OBJ="src/audio/capture/jack.o" JACK_PLAY_OBJ="src/audio/playback/jack.o" - JACK_LIB="-ljack" AC_DEFINE([HAVE_JACK], [1], [Build with JACK support]) jack=yes ADD_MODULE("acap_jack", "$JACK_CAP_OBJ", "$JACK_LIB")