From 9b24c3ac59cd0a394672689aa82b6845628626cb Mon Sep 17 00:00:00 2001 From: David Robillard Date: Sun, 16 Mar 2008 17:01:28 +0000 Subject: Add Jack D-Bus driver (from Nedko). git-svn-id: http://svn.drobilla.net/lad/patchage@1167 a436a847-0d15-0410-975c-d299462d15a1 --- configure.ac | 25 +++++++++++++++++++++---- 1 file changed, 21 insertions(+), 4 deletions(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index 01f1e0d..86e77a2 100644 --- a/configure.ac +++ b/configure.ac @@ -100,15 +100,31 @@ CFLAGS="$CFLAGS -std=c99 -pipe -fmessage-length=999 -DCONFIG_H_PATH=\\\"$CONFIG_ #################### GENERIC OPTIONS +# Jack D-Bus support +build_jack_dbus="no" +AC_ARG_ENABLE(dbus, + [AS_HELP_STRING(--enable-dbus, [Use Jack D-Bus instead of libjack])], + [ if test x$enable_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]) + 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 ]) -if test "$build_jack" = "yes"; then - PKG_CHECK_MODULES(JACK, jack >= 0.107.0) - AC_DEFINE(HAVE_JACK_MIDI, 1, [Has Jack MIDI]) +if test "x$build_jack" = "xyes"; then + PKG_CHECK_MODULES(JACK, jack >= 0.107.0, [build_jack="yes"], [build_jack="no"]) + if test "x$build_jack" = "xyes"; then + AC_DEFINE(HAVE_JACK, 1, [Has Jack]) + AC_DEFINE(HAVE_JACK_MIDI, 1, [Has Jack MIDI]) + fi fi # ALSA support @@ -152,7 +168,7 @@ 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"]) ############# PATCHAGE PKG_CHECK_MODULES(GTHREAD, gthread-2.0) @@ -184,6 +200,7 @@ 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]) AC_MSG_RESULT([LASH support: $build_lash]) AC_MSG_RESULT([ALSA support: $ALSA_FOUND]) AC_MSG_RESULT([]) -- cgit v1.2.1