--- linuxsampler/trunk/configure.in 2008/02/16 01:09:33 1695 +++ linuxsampler/trunk/configure.in 2008/07/10 15:00:38 1750 @@ -5,7 +5,7 @@ LINUXSAMPLER_RELEASE_MAJOR=0 LINUXSAMPLER_RELEASE_MINOR=5 -LINUXSAMPLER_RELEASE_BUILD=1.4cvs +LINUXSAMPLER_RELEASE_BUILD=1.6cvs #------------------------------------------------------------------------------------ # The following is the libtool / shared library version. This doesn't have to @@ -38,6 +38,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.]) +AC_PROG_CXX AM_PROG_LIBTOOL AC_SUBST(SHLIB_VERSION_ARG) @@ -161,6 +162,11 @@ 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) + ########################################################################### @@ -264,7 +270,10 @@ if test $have_jack = "1"; then AC_SUBST(JACK_LIBS) AC_SUBST(JACK_CFLAGS) - AC_CHECK_LIB(jack, jack_client_name_size, [AC_DEFINE(HAVE_JACK_CLIENT_NAME_SIZE, 1, [Define to 1 if you have the `jack_client_name_size' function.])], , $JACK_LIBS) + linuxsampler_save_LIBS=$LIBS + LIBS="$JACK_LIBS $LIBS" + AC_CHECK_FUNCS(jack_client_name_size jack_client_open) + LIBS=$linuxsampler_save_LIBS have_audio_output_driver="true"; fi else @@ -558,7 +567,7 @@ AC_ARG_ENABLE(pthread-testcancel, [ --enable-pthread-testcancel - Enable pthread_testcancel() calls and avoid asynchronous + Enable pthread_testcancel() calls and avoid asynchronous cancel of pthreads (default=no).], [config_pthread_testcancel="$enableval"], [config_pthread_testcancel="no"] @@ -1116,7 +1125,6 @@ AM_INIT_AUTOMAKE(linuxsampler, "$LINUXSAMPLER_RELEASE_MAJOR.$LINUXSAMPLER_RELEASE_MINOR.$LINUXSAMPLER_RELEASE_BUILD") AC_LANG_CPLUSPLUS -AC_PROG_CXX # some gcc 4.0 versions need -msse for SSE register allocations if test "$config_asm" = "yes"; then @@ -1139,6 +1147,7 @@ src/engines/Makefile \ src/engines/gig/Makefile \ src/engines/common/Makefile \ + src/effects/Makefile \ src/common/Makefile \ src/testcases/Makefile \ src/drivers/Makefile \