--- linuxsampler/trunk/configure.ac	2012/09/08 17:33:03	2368
+++ linuxsampler/trunk/configure.ac	2017/05/28 14:46:14	3228
@@ -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.svn18)
+m4_define(linuxsampler_release_build, 0.svn53)
 
 
 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,18 @@
 # the LSCP specification version this LinuSampler release complies with:
 
 LSCP_RELEASE_MAJOR=1
-LSCP_RELEASE_MINOR=5
+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)
 AC_SUBST(SHARED_VERSION_INFO)
@@ -126,7 +130,7 @@
 )
 AC_LANG_POP([C])
 AC_MSG_RESULT([$have_unix98])
-if test "$have_unix98" = "no" -a "$have_windows" = "0"; then
+if test "$have_unix98" = "no" -a "$have_windows" = "0" -a "$mac" = "no" ; then
     if test "x$HAVE_UNIX98" = "x"; then
         echo "LinuxSampler only runs on UNIX98 compatible systems, which is mandatory for"
         echo "pthread_mutexattr_settype() call in Mutex.cpp. You may want to run"
@@ -148,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,
@@ -177,10 +188,18 @@
     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
+# parser yacc tables.
+if echo "$YACC" | grep -q bison; then
+    # NOTE: m4 removes [], that's why it needs to be escaped
+    bison_version=[`$YACC --version | head -n 1 | sed -e 's/[^0-9.]*\([-0-9.]\+\)$/\1/'`]
+    bison_version_major=`echo $bison_version | cut -d. -f1`
+    bison_version_minor=`echo $bison_version | cut -d. -f2`
+    AC_DEFINE_UNQUOTED(HAVE_BISON_MAJ,$bison_version_major,[Define to the major version of the GNU Bison program installed.])
+    AC_DEFINE_UNQUOTED(HAVE_BISON_MIN,$bison_version_minor,[Define to the minor version of the GNU Bison program installed.])
+fi
 
 
 
@@ -290,7 +309,8 @@
         AC_SUBST(JACK_CFLAGS)
         linuxsampler_save_LIBS=$LIBS
         LIBS="$JACK_LIBS $LIBS"
-        AC_CHECK_FUNCS(jack_client_name_size jack_client_open)
+        AC_CHECK_FUNCS(jack_client_name_size jack_client_open \
+                       jack_on_info_shutdown)
         LIBS=$linuxsampler_save_LIBS
         have_audio_output_driver="true";
     fi
@@ -516,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")
@@ -581,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!"
@@ -627,10 +650,10 @@
 AC_SUBST(SNDFILE_CFLAGS)
 AC_SUBST(SNDFILE_LIBS)
 
-# Check for Vorbis support in libsndfile
+# Check for Vorbis and FLAC support in libsndfile
 linuxsampler_save_CFLAGS=$CFLAGS
 CFLAGS="$SNDFILE_CFLAGS $CFLAGS"
-AC_CHECK_DECLS([SF_FORMAT_VORBIS], [], [], [[#include <sndfile.h>]])
+AC_CHECK_DECLS([SF_FORMAT_VORBIS, SF_FORMAT_FLAC], [], [], [[#include <sndfile.h>]])
 
 # Check for loop functionality in libsndfile
 AC_CHECK_MEMBERS([SF_INSTRUMENT.loops],,
@@ -1309,7 +1332,6 @@
 # Create Build Files
 
 AC_CONFIG_HEADERS([config.h])
-AM_INIT_AUTOMAKE
 
 AC_LANG([C++])
 
@@ -1321,6 +1343,7 @@
     Makefile \
     man/Makefile \
     man/linuxsampler.1 \
+    man/lscp.1 \
     src/Makefile \
     src/db/Makefile \
     src/network/Makefile \
@@ -1342,6 +1365,9 @@
     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 \
     Artwork/Makefile \