--- linuxsampler/trunk/configure.ac	2013/05/03 14:26:32	2448
+++ linuxsampler/trunk/configure.ac	2014/03/05 17:29:15	2532
@@ -3,7 +3,7 @@
 
 m4_define(linuxsampler_release_major, 1)
 m4_define(linuxsampler_release_minor, 0)
-m4_define(linuxsampler_release_build, 0.svn21)
+m4_define(linuxsampler_release_build, 0.svn36)
 
 
 AC_INIT([linuxsampler],[linuxsampler_release_major.linuxsampler_release_minor.linuxsampler_release_build])
@@ -35,7 +35,7 @@
 # the LSCP specification version this LinuSampler release complies with:
 
 LSCP_RELEASE_MAJOR=1
-LSCP_RELEASE_MINOR=5
+LSCP_RELEASE_MINOR=6
 
 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.])
@@ -43,6 +43,7 @@
 AC_PROG_CXX
 AC_LIBTOOL_WIN32_DLL
 AC_PROG_LIBTOOL
+AC_PROG_YACC
 
 AC_SUBST(SHLIB_VERSION_ARG)
 AC_SUBST(SHARED_VERSION_INFO)
@@ -182,6 +183,18 @@
 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 +303,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
@@ -1309,7 +1323,7 @@
 # Create Build Files
 
 AC_CONFIG_HEADERS([config.h])
-AM_INIT_AUTOMAKE
+AM_INIT_AUTOMAKE([subdir-objects])
 
 AC_LANG([C++])
 
@@ -1321,6 +1335,7 @@
     Makefile \
     man/Makefile \
     man/linuxsampler.1 \
+    man/lscp.1 \
     src/Makefile \
     src/db/Makefile \
     src/network/Makefile \
@@ -1342,6 +1357,7 @@
     src/hostplugins/lv2/manifest.ttl \
     src/hostplugins/vst/Makefile \
     src/hostplugins/au/Makefile \
+    src/shell/Makefile \
     linuxsampler.spec \
     debian/Makefile \
     Artwork/Makefile \