--- linuxsampler/trunk/configure.in 2012/02/19 12:13:19 2317 +++ linuxsampler/trunk/configure.in 2012/07/08 14:44:47 2356 @@ -5,7 +5,7 @@ LINUXSAMPLER_RELEASE_MAJOR=1 LINUXSAMPLER_RELEASE_MINOR=0 -LINUXSAMPLER_RELEASE_BUILD=0.svn17 +LINUXSAMPLER_RELEASE_BUILD=0.svn18 #------------------------------------------------------------------------------------ # The following is the libtool / shared library version. This doesn't have to @@ -512,10 +512,9 @@ AM_CONDITIONAL(HAVE_DSSI, test $config_have_dssi = "yes") # LV2 -PKG_CHECK_MODULES(LV2, lv2core, config_have_lv2="yes", config_have_lv2="no") -if test $config_have_lv2 = "no"; then - AC_CHECK_HEADER(lv2.h, config_have_lv2="yes", config_have_lv2="no") -fi +PKG_CHECK_MODULES(LV2, lv2 >= 1.0.0, config_have_lv2="yes", config_have_lv2="no") +AC_SUBST(LV2_CFLAGS) +AC_SUBST(LV2_LIBS) AM_CONDITIONAL(HAVE_LV2, test $config_have_lv2 = "yes") # VST @@ -628,7 +627,7 @@ # Check for Vorbis support in libsndfile linuxsampler_save_CFLAGS=$CFLAGS CFLAGS="$SNDFILE_CFLAGS $CFLAGS" -AC_CHECK_DECLS([SF_FORMAT_VORBIS], [], [] ,[[#include ]]) +AC_CHECK_DECLS([SF_FORMAT_VORBIS], [], [], [[#include ]]) # Check for loop functionality in libsndfile AC_CHECK_MEMBERS([SF_INSTRUMENT.loops],, @@ -740,8 +739,7 @@ asynchronous cancel of pthreads (default=yes for Mac targets, no otherwise).], [config_pthread_testcancel="$enableval"], - [] -) + []) if test "$config_pthread_testcancel" = "yes"; then AC_DEFINE_UNQUOTED(CONFIG_PTHREAD_TESTCANCEL, 1, [Define to 1 to enable pthread_testcancel() calls.]) fi