From 62dc1db8df1755742dc71858b5333f7bc102e0d2 Mon Sep 17 00:00:00 2001 From: David Robillard Date: Sun, 6 May 2007 17:07:08 +0000 Subject: Yeeeeeeeeeet another Jack MIDI fix. This one looks pretty alright maybe! git-svn-id: http://svn.drobilla.net/lad/machina@510 a436a847-0d15-0410-975c-d299462d15a1 --- configure.ac | 42 ++++++++++++++++++++++-------------------- 1 file changed, 22 insertions(+), 20 deletions(-) diff --git a/configure.ac b/configure.ac index e2dbf0a..fb980ec 100644 --- a/configure.ac +++ b/configure.ac @@ -18,26 +18,6 @@ AC_TYPE_SIZE_T PKG_CHECK_MODULES(RAUL, raul >= 0.0.0) PKG_CHECK_MODULES(GLIBMM, glibmm-2.4) -# Jack support -with_jack="yes" -AC_ARG_ENABLE(jack, - [AS_HELP_STRING(--enable-jack, [Enable Jack realtime processing (yes)])], - [ if test x$enable_jack = xno ; then with_jack=no ; fi ]) -if test "$with_jack" = "yes"; then - PKG_CHECK_MODULES(JACK, jack >= 0.102.20, with_jack="yes", with_jack="no") - if test "$with_jack" = "yes"; then - AC_DEFINE(WITH_JACK, 1, [Has JACK]) - fi -fi -AM_CONDITIONAL(WITH_JACK, [test "$with_jack" = "yes"]) -if test "$with_jack" = "yes"; then - AC_DEFINE(HAVE_JACK_MIDI, 1, [Has Jack MIDI]) - AC_JACK_MIDI_NFRAMES_CHECK() - if test "$jackmidi_nframes" = "yes"; then - CFLAGS += "-DJACK_MIDI_NEEDS_NFRAMES" - fi -fi - # Check for debugging flag debug="no" AC_ARG_ENABLE(debug, @@ -73,6 +53,28 @@ if test "$pointer_debug" = "yes"; then CXXFLAGS+=" -DBOOST_SP_ENABLE_DEBUG_HOOKS" fi + +# Jack support +with_jack="yes" +AC_ARG_ENABLE(jack, + [AS_HELP_STRING(--enable-jack, [Enable Jack realtime processing (yes)])], + [ if test x$enable_jack = xno ; then with_jack=no ; fi ]) +if test "$with_jack" = "yes"; then + PKG_CHECK_MODULES(JACK, jack >= 0.102.20, with_jack="yes", with_jack="no") + if test "$with_jack" = "yes"; then + AC_DEFINE(WITH_JACK, 1, [Has JACK]) + fi +fi +AM_CONDITIONAL(WITH_JACK, [test "$with_jack" = "yes"]) +if test "$with_jack" = "yes"; then + AC_DEFINE(HAVE_JACK_MIDI, 1, [Has Jack MIDI]) + AC_JACK_MIDI_NFRAMES_CHECK() + if test "$jackmidi_nframes" = "yes"; then + CFLAGS += "-DJACK_MIDI_NEEDS_NFRAMES" + fi +fi + + # Build GUI? build_gui="yes" AC_ARG_ENABLE(gui, -- cgit v1.2.1