--- linuxsampler/trunk/configure.ac 2014/02/23 19:10:36 2523 +++ linuxsampler/trunk/configure.ac 2017/05/31 21:07:44 3260 @@ -1,9 +1,9 @@ #------------------------------------------------------------------------------------ # LinuxSampler's / liblinuxsampler's "official" release version: -m4_define(linuxsampler_release_major, 1) +m4_define(linuxsampler_release_major, 2) m4_define(linuxsampler_release_minor, 0) -m4_define(linuxsampler_release_build, 0.svn33) +m4_define(linuxsampler_release_build, 0.svn60) AC_INIT([linuxsampler],[linuxsampler_release_major.linuxsampler_release_minor.linuxsampler_release_build]) @@ -26,7 +26,7 @@ # 6. If any interfaces have been removed since the last public release, then set age # to 0. -LIBLINUXSAMPLER_LT_CURRENT=3 +LIBLINUXSAMPLER_LT_CURRENT=4 LIBLINUXSAMPLER_LT_REVISION=0 LIBLINUXSAMPLER_LT_AGE=0 SHARED_VERSION_INFO="$LIBLINUXSAMPLER_LT_CURRENT:$LIBLINUXSAMPLER_LT_REVISION:$LIBLINUXSAMPLER_LT_AGE" @@ -35,14 +35,17 @@ # the LSCP specification version this LinuSampler release complies with: LSCP_RELEASE_MAJOR=1 -LSCP_RELEASE_MINOR=6 +LSCP_RELEASE_MINOR=7 AC_DEFINE_UNQUOTED(LSCP_RELEASE_MAJOR, ${LSCP_RELEASE_MAJOR}, [LSCP spec major version this release complies with.]) AC_DEFINE_UNQUOTED(LSCP_RELEASE_MINOR, ${LSCP_RELEASE_MINOR}, [LSCP spec minor version this release complies with.]) +AM_INIT_AUTOMAKE([subdir-objects]) +AC_PROG_CC AC_PROG_CXX AC_LIBTOOL_WIN32_DLL AC_PROG_LIBTOOL +AC_PROG_LEX AC_PROG_YACC AC_SUBST(SHLIB_VERSION_ARG) @@ -149,6 +152,13 @@ CXXFLAGS="$CXXFLAGS $PTHREAD_CFLAGS" CC="$PTHREAD_CC" + +# check for compiler's pragma diagnostic capabilities +m4_ifdef([m4_include(m4/pragma_diagnostics.m4)],, + [sinclude([m4/pragma_diagnostics.m4])]) +ACX_CXX_PRAGMA_DIAGNOSTICS + + # check for a bug in NPTL-enabled glibc # (see Gentoo bug report #194076) AC_ARG_ENABLE(nptl-bug-check, @@ -178,10 +188,6 @@ echo "NPTL glibc bug check disabled" fi -# FIXME: this is actually a dependency of libgig, not of LS directly, why -# isn't it hidden by libgig? -AC_CHECK_HEADERS(uuid/uuid.h) -AC_SEARCH_LIBS(uuid_generate, uuid) # In case Bison is available, determine the exact version, since we need to # use different custom parser code for Bison 2.x vs. Bison 3.x generated @@ -530,6 +536,9 @@ # LV2 PKG_CHECK_MODULES(LV2, lv2 >= 1.0.0, config_have_lv2="yes", config_have_lv2="no") +if test "$config_have_lv2" != "yes"; then + PKG_CHECK_MODULES(LV2, lv2core >= 1.0.0, config_have_lv2="yes", config_have_lv2="no") +fi AC_SUBST(LV2_CFLAGS) AC_SUBST(LV2_LIBS) AM_CONDITIONAL(HAVE_LV2, test $config_have_lv2 = "yes") @@ -595,7 +604,7 @@ # Checks for various DLL libraries # Check presence of libgig -libgig_version="3.3.0" +libgig_version="4.0.0" PKG_CHECK_MODULES(GIG, gig >= $libgig_version, HAVE_GIG=true, HAVE_GIG=false) if test "$HAVE_GIG" = "false"; then echo "Required libgig version not found!" @@ -1323,7 +1332,6 @@ # Create Build Files AC_CONFIG_HEADERS([config.h]) -AM_INIT_AUTOMAKE([subdir-objects]) AC_LANG([C++]) @@ -1357,6 +1365,8 @@ src/hostplugins/lv2/manifest.ttl \ src/hostplugins/vst/Makefile \ src/hostplugins/au/Makefile \ + src/scriptvm/Makefile \ + src/scriptvm/editor/Makefile \ src/shell/Makefile \ linuxsampler.spec \ debian/Makefile \