diff options
| -rw-r--r-- | configure.ac | 53 | ||||
| -rw-r--r-- | examples/hosts/Makefile.am | 16 |
2 files changed, 33 insertions, 36 deletions
diff --git a/configure.ac b/configure.ac index c6773a3..ebb9910 100644 --- a/configure.ac +++ b/configure.ac @@ -43,28 +43,6 @@ if test "$strict" = "yes"; then CXXFLAGS="$CFLAGS -ansi -pedantic -Wall -Wextra -Wconversion -Winit-self" fi -# Build utilities? -build_utilities="no" -AC_ARG_ENABLE(utilities, - [AS_HELP_STRING(--enable-utilities, [Build utilities (no) - EXPERIMENTAL])], - [build_utilities="$enableval"]) -if test "$build_utilities" = "yes"; then - AC_PROG_CXX - PKG_CHECK_MODULES(RAUL, raul >= 0.0.0) -fi -AM_CONDITIONAL(BUILD_UTILITIES, [test "$build_utilities" = "yes"]) - -# Bolt on a few specific flags to CXXFLAGS that should always be used -#CFLAGS="$CFLAGS -pipe -Wall -fmessage-length=139 -fdiagnostics-show-location=every-line" - -# Check plugin install directory -AC_MSG_CHECKING([where to install LV2 plugins]) -AC_ARG_WITH(lv2-dir, - AS_HELP_STRING([--with-lv2-dir=DIR], - [directory that LV2 plugins should be installed in ($libdir/lv2)]), - [lv2dir=$withval], [lv2dir=$libdir/lv2]) -AC_MSG_RESULT($lv2dir) -AC_SUBST(lv2dir) # Check for RAPTOR PKG_CHECK_MODULES(RAPTOR, raptor >= 0.21, build_raptor="yes", build_raptor="no") @@ -75,18 +53,35 @@ PKG_CHECK_MODULES(RASQAL, rasqal >= 0.9.11, build_rasqal="yes", build_rasqal="no # Check for JACK build_jack="yes" AC_ARG_ENABLE(jack, - [AS_HELP_STRING(--with-jack, [Build JACK clients (true)])], - [ if test x$with_jack = xno ; then build_jack=no ; fi ]) -if test "$build_jack" = "yes"; then - PKG_CHECK_MODULES(JACK, jack >= 0.99.0, build_jack="yes", build_jack="no") -fi + [AS_HELP_STRING(--enable-jack, [Build JACK clients (true)])], + [ if test x$enable_jack = xno ; then build_jack=no ; fi ]) if test "$build_jack" = "yes"; then + PKG_CHECK_MODULES(JACK, jack >= 0.102.20, build_jack="yes", build_jack="no") AC_DEFINE(HAVE_JACK, 1, [Has JACK]) else - AC_MSG_WARN([JACK not found, JACK clients will not be built.]) + AC_MSG_WARN("JACK not found, JACK clients will not be built.") fi AM_CONDITIONAL(WITH_JACK, [test "$build_jack" = "yes"]) +# Check plugin install directory +AC_MSG_CHECKING([where to install LV2 plugins]) +AC_ARG_WITH(lv2-dir, + AS_HELP_STRING([--with-lv2-dir=DIR], + [directory that LV2 plugins should be installed in ($libdir/lv2)]), + [lv2dir=$withval], [lv2dir=$libdir/lv2]) +AC_MSG_RESULT($lv2dir) +AC_SUBST(lv2dir) + +# Build utilities? +build_utilities="no" +AC_ARG_ENABLE(utilities, + [AS_HELP_STRING(--enable-utilities, [Build utilities (no) - EXPERIMENTAL])], + [build_utilities="$enableval"]) +if test "$build_utilities" = "yes"; then + AC_PROG_CXX + PKG_CHECK_MODULES(RAUL, raul >= 0.0.0) +fi +AM_CONDITIONAL(BUILD_UTILITIES, [test "$build_utilities" = "yes"]) # Write output files AC_CONFIG_FILES([Makefile]) @@ -107,7 +102,7 @@ AC_MSG_RESULT([]) AC_MSG_RESULT([**********************************************************************]) AC_MSG_RESULT([SLV2 build configuration:]) AC_MSG_RESULT([]) -AC_MSG_RESULT([Building JACK client: $build_jack]) +AC_MSG_RESULT([Building JACK clients: $build_jack]) AC_MSG_RESULT([**********************************************************************]) AC_MSG_RESULT([]) diff --git a/examples/hosts/Makefile.am b/examples/hosts/Makefile.am index a5ffd44..f483161 100644 --- a/examples/hosts/Makefile.am +++ b/examples/hosts/Makefile.am @@ -1,7 +1,10 @@ -AM_CFLAGS = -std=c99 -I. -I$(top_srcdir)/include -I$(top_srcdir) `pkg-config --cflags rasqal` -AM_LDFLAGS = `pkg-config --libs rasqal` +AM_CFLAGS = -std=c99 -I$(top_srcdir) @RASQAL_CFLAGS@ -bin_PROGRAMS = slv2_test_host slv2_simple_jack_host slv2_host +bin_PROGRAMS = slv2_test_host + +if WITH_JACK +bin_PROGRAMS += slv2_simple_jack_host slv2_host +endif slv2_test_host_DEPENDENCIES = ../../src/libslv2.la slv2_test_host_LDADD = ../../src/libslv2.la @@ -13,20 +16,19 @@ slv2_test_host_SOURCES = \ if WITH_JACK slv2_simple_jack_host_CFLAGS = @JACK_CFLAGS@ $(AM_CFLAGS) -#simple_jack_host_LIBS = @JACK_LIBS@ slv2_simple_jack_host_DEPENDENCIES = ../../src/libslv2.la -slv2_simple_jack_host_LDADD = ../../src/libslv2.la @JACK_LIBS@ +slv2_simple_jack_host_LDADD = ../../src/libslv2.la @JACK_LIBS@ @RASQAL_LIBS@ slv2_simple_jack_host_SOURCES = \ simple_jack_host.c slv2_host_CFLAGS = @JACK_CFLAGS@ $(AM_CFLAGS) -#host_LIBS = @JACK_LIBS@ + slv2_host_DEPENDENCIES = ../../src/libslv2.la -slv2_host_LDADD = ../../src/libslv2.la @JACK_LIBS@ +slv2_host_LDADD = ../../src/libslv2.la @JACK_LIBS@ @RASQAL_LIBS@ slv2_host_SOURCES = \ host.c |