Index: configure.ac =================================================================== --- configure.ac (revision 1171) +++ configure.ac (working copy) @@ -197,8 +197,14 @@ AC_MSG_RESULT([**********************************************************************]) AC_MSG_RESULT([Configuration:]) 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 1171) +++ src/PatchageCanvas.cpp (working copy) @@ -19,12 +19,11 @@ #include CONFIG_H_PATH #include "PatchageCanvas.hpp" #include "Patchage.hpp" -#ifdef HAVE_JACK +#if defined(HAVE_JACK_DBUS) +#include "JackDbusDriver.hpp" +#elif defined(HAVE_JACK) #include "JackDriver.hpp" #endif -#ifdef HAVE_JACK_DBUS -#include "JackDbusDriver.hpp" -#endif #include "PatchageModule.hpp" #include "PatchagePort.hpp" #ifdef HAVE_ALSA @@ -77,7 +76,7 @@ // TODO: filthy. keep a port map and make this O(log(n)) switch (ref.type) { -#if HAVE_JACK +#if defined(HAVE_JACK) && !defined(HAVE_JACK_DBUS) case PatchageEvent::PortRef::JACK_ID: jack_port = jack_port_by_id(_app->jack_driver()->client(), ref.id.jack_id); if (!jack_port) Index: src/Patchage.cpp =================================================================== --- src/Patchage.cpp (revision 1171) +++ src/Patchage.cpp (working copy) @@ -27,12 +27,11 @@ #include CONFIG_H_PATH #include "GladeFile.hpp" -#ifdef HAVE_JACK +#if defined(HAVE_JACK_DBUS) +#include "JackDbusDriver.hpp" +#elif defined(HAVE_JACK) #include "JackDriver.hpp" #endif -#ifdef HAVE_JACK_DBUS -#include "JackDbusDriver.hpp" -#endif #include "JackSettingsDialog.hpp" #include "Patchage.hpp" #include "PatchageCanvas.hpp" Index: src/PatchageEvent.cpp =================================================================== --- src/PatchageEvent.cpp (revision 1171) +++ src/PatchageEvent.cpp (working copy) @@ -22,12 +22,11 @@ #include "PatchageModule.hpp" #include "PatchageEvent.hpp" #include "Driver.hpp" -#ifdef HAVE_JACK +#if defined(HAVE_JACK_DBUS) +#include "JackDbusDriver.hpp" +#elif defined(HAVE_JACK) #include "JackDriver.hpp" #endif -#ifdef HAVE_JACK_DBUS -#include "JackDbusDriver.hpp" -#endif #ifdef HAVE_ALSA #include "AlsaDriver.hpp" #endif