diff options
| author | David Robillard <d@drobilla.net> | 2008-03-16 18:18:37 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2008-03-16 18:18:37 +0000 |
| commit | 66493fcf17859a7de6da63f7c780dff1bc743545 (patch) | |
| tree | e169b0c68117eb177c6db4917bb23b683284996d | |
| parent | d086e5fed249f351359c74e1289b03571fd30087 (diff) | |
| download | patchage-66493fcf17859a7de6da63f7c780dff1bc743545.tar.gz patchage-66493fcf17859a7de6da63f7c780dff1bc743545.tar.bz2 patchage-66493fcf17859a7de6da63f7c780dff1bc743545.zip | |
Fix Jack D-Bus stuff.
git-svn-id: http://svn.drobilla.net/lad/patchage@1170 a436a847-0d15-0410-975c-d299462d15a1
| -rw-r--r-- | configure.ac | 15 | ||||
| -rw-r--r-- | src/Patchage.cpp | 2 | ||||
| -rw-r--r-- | src/PatchageCanvas.cpp | 2 | ||||
| -rw-r--r-- | src/PatchageEvent.cpp | 2 |
4 files changed, 9 insertions, 12 deletions
diff --git a/configure.ac b/configure.ac index ae34a3e..18e201f 100644 --- a/configure.ac +++ b/configure.ac @@ -102,20 +102,17 @@ CFLAGS="$CFLAGS -std=c99 -pipe -fmessage-length=999 -DCONFIG_H_PATH=\\\"$CONFIG_ # 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"]) - # Jack support -build_jack="yes" 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 ]) @@ -165,10 +162,10 @@ else AC_MSG_WARN([LASH not found, session support will not be built.]) fi -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_ALSA, [test "x$ALSA_FOUND" = "xyes"]) +AM_CONDITIONAL(WITH_LASH, [test "x$have_lash" = "xyes"]) +AM_CONDITIONAL(WITH_JACK, [test "x$build_jack" = "xyes"]) +AM_CONDITIONAL(WITH_JACK_DBUS, [test "x$build_jack_dbus" = "xyes"]) ############# PATCHAGE PKG_CHECK_MODULES(GTHREAD, gthread-2.0) diff --git a/src/Patchage.cpp b/src/Patchage.cpp index 3803a6b..33b60ad 100644 --- a/src/Patchage.cpp +++ b/src/Patchage.cpp @@ -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" diff --git a/src/PatchageCanvas.cpp b/src/PatchageCanvas.cpp index aa7ef64..6619c01 100644 --- a/src/PatchageCanvas.cpp +++ b/src/PatchageCanvas.cpp @@ -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" diff --git a/src/PatchageEvent.cpp b/src/PatchageEvent.cpp index afab9ae..53dd612 100644 --- a/src/PatchageEvent.cpp +++ b/src/PatchageEvent.cpp @@ -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 |