Index: configure.ac =================================================================== --- configure.ac (revision 1169) +++ configure.ac (working copy) @@ -102,20 +102,24 @@ # Jack D-Bus support build_jack_dbus="no" -AC_ARG_ENABLE(dbus, +AC_ARG_ENABLE(jack-dbus, [AS_HELP_STRING(--enable-jack-dbus, [Use Jack D-Bus instead of libjack])], [ if test x$enable_jack_dbus = xyes ; then build_jack_dbus=yes ; fi ]) if test "x$build_jack_dbus" = "xyes"; then PKG_CHECK_MODULES(DBUS, dbus-glib-1, [build_jack_dbus="yes"], [build_jack_dbus="no"]) if test "x$build_jack_dbus" = "xyes"; then - AC_DEFINE([HAVE_JACKDBUS], 1, [Defined if Jack D-Bus driver needs to be built]) + AC_DEFINE([HAVE_JACK_DBUS], 1, [Defined if Jack D-Bus driver needs to be built]) fi fi -AM_CONDITIONAL(WITH_JACKDBUS, [test "$build_jack_dbus"="yes"]) +AM_CONDITIONAL(WITH_JACK_DBUS, [test "$build_jack_dbus"="yes"]) - # Jack support -build_jack="yes" +if test "x$build_jack_dbus" == "xyes"; then + build_jack="no" +else + build_jack="yes" +fi + AC_ARG_ENABLE(enable-jack, [AS_HELP_STRING(--enable-jack, [Enable Jack support (yes)])], [ if test x$enable_jack = xno ; then build_jack=no ; fi ]) @@ -168,7 +172,7 @@ AM_CONDITIONAL(WITH_ALSA, [test "$ALSA_FOUND" = "yes"]) AM_CONDITIONAL(WITH_LASH, [test "$have_lash" = "yes"]) AM_CONDITIONAL(WITH_JACK, [test "$build_jack" = "yes"]) -AM_CONDITIONAL(WITH_JACKDBUS, [test "$build_jack" = "dbus"]) +AM_CONDITIONAL(WITH_JACK_DBUS, [test "$build_jack_dbus" = "yes"]) ############# PATCHAGE PKG_CHECK_MODULES(GTHREAD, gthread-2.0) @@ -201,6 +205,14 @@ AC_MSG_RESULT([]) AC_MSG_RESULT([Jack support: $build_jack]) AC_MSG_RESULT([Jack D-Bus: $build_jack_dbus]) +# we are not building libjack driver if jackdbus driver is being built (src/Makefile.am) +if test "$build_jack_dbus" = "yes"; then +AC_MSG_RESULT([Jack support: yes (D-Bus)]) +elif test "$build_jack" = "yes"; then +AC_MSG_RESULT([Jack support: yes (libjack)]) +else +AC_MSG_RESULT([Jack support: no]) +fi AC_MSG_RESULT([LASH support: $build_lash]) AC_MSG_RESULT([ALSA support: $ALSA_FOUND]) AC_MSG_RESULT([]) Index: src/PatchageCanvas.cpp =================================================================== --- src/PatchageCanvas.cpp (revision 1169) +++ src/PatchageCanvas.cpp (working copy) @@ -22,7 +22,7 @@ #ifdef HAVE_JACK #include "JackDriver.hpp" #endif -#ifdef HAVE_JACKDBUS +#ifdef HAVE_JACK_DBUS #include "JackDbusDriver.hpp" #endif #include "PatchageModule.hpp" Index: src/Patchage.cpp =================================================================== --- src/Patchage.cpp (revision 1169) +++ src/Patchage.cpp (working copy) @@ -30,7 +30,7 @@ #ifdef HAVE_JACK #include "JackDriver.hpp" #endif -#ifdef HAVE_JACKDBUS +#ifdef HAVE_JACK_DBUS #include "JackDbusDriver.hpp" #endif #include "JackSettingsDialog.hpp" Index: src/PatchageEvent.cpp =================================================================== --- src/PatchageEvent.cpp (revision 1169) +++ src/PatchageEvent.cpp (working copy) @@ -25,7 +25,7 @@ #ifdef HAVE_JACK #include "JackDriver.hpp" #endif -#ifdef HAVE_JACKDBUS +#ifdef HAVE_JACK_DBUS #include "JackDbusDriver.hpp" #endif #ifdef HAVE_ALSA