--- linuxsampler/trunk/configure.in 2007/03/24 15:02:48 1120 +++ linuxsampler/trunk/configure.in 2007/09/30 20:04:11 1360 @@ -5,7 +5,7 @@ LINUXSAMPLER_RELEASE_MAJOR=0 LINUXSAMPLER_RELEASE_MINOR=4 -LINUXSAMPLER_RELEASE_BUILD=0.4cvs +LINUXSAMPLER_RELEASE_BUILD=0.7cvs #------------------------------------------------------------------------------------ # The following is the libtool / shared library version. This doesn't have to @@ -127,7 +127,7 @@ [ --disable-alsa-driver Disable support for the Advanced Linux Sound Architecture (ALSA).], - [config_alsa_driver="no"], + [config_alsa_driver="$enableval"], [config_alsa_driver="yes"] ) have_alsa=0 @@ -207,7 +207,7 @@ [ --disable-jack-driver Disable support for the Jack Audio Connection Kit (JACK).], - [config_jack_driver="no"], + [config_jack_driver="$enableval"], [config_jack_driver="yes"] ) have_jack=0 @@ -230,7 +230,7 @@ [ --disable-arts-driver Disable support for the Analogue Realtime System (aRts).], - [config_arts_driver="no"], + [config_arts_driver="$enableval"], [config_arts_driver="yes"] ) have_arts=0 @@ -251,7 +251,7 @@ AC_ARG_ENABLE(midishare-driver, [ --disable-midishare-driver Disable support for the MidiShare system.], - [config_midishare_driver="no"], + [config_midishare_driver="$enableval"], [config_midishare_driver="yes"] ) have_midishare=0 @@ -277,7 +277,7 @@ AC_ARG_ENABLE(coremidi-driver, [ --disable-coremidi-driver Disable support for the Apple CoreMIDI system.], - [config_coremidi_driver="no"], + [config_coremidi_driver="$enableval"], [config_coremidi_driver="yes"] ) have_coremidi=0 @@ -308,16 +308,21 @@ AC_SUBST(GIG_CFLAGS) AC_SUBST(GIG_LIBS) -# SQLITE3 -PKG_CHECK_MODULES(SQLITE3, sqlite3, HAVE_SQLITE3=true, HAVE_SQLITE3=false) +# Check presence of sqlite3 +sqlite_version="3.3" +PKG_CHECK_MODULES(SQLITE3, sqlite3 >= $sqlite_version, HAVE_SQLITE3=true, HAVE_SQLITE3=false) AC_SUBST(SQLITE3_LIBS) AC_SUBST(SQLITE3_CFLAGS) if test $HAVE_SQLITE3 = false; then HAVE_SQLITE3=0; - echo "no, support for instrument DB will be disabled!" + instruments_db_support="no" + echo "*** Required sqlite version not found!" + echo "*** You need to have sqlite version ${sqlite_version} or higher" + echo "*** for instruments database support to be enabled." + echo "*** Support for instruments DB will be disabled!" else HAVE_SQLITE3=1 - echo "yes" + instruments_db_support="yes" fi AM_CONDITIONAL(HAVE_SQLITE3, test $HAVE_SQLITE3 = 1) AC_DEFINE_UNQUOTED(HAVE_SQLITE3,$HAVE_SQLITE3,[Define to 1 if you have SQLITE3 installed.]) @@ -343,17 +348,18 @@ # TODO: should we use AC_ARG_VAR(variable, description) instead? AC_ARG_ENABLE(asm, - [ --enable-asm + [ --disable-asm Enable hand-crafted assembly optimizations - (default=off). LinuxSampler provides CPU specific - assembly optimizations for the most important - synthesis algorithms. This is currently disabled - by default since current asm code is broken.], - [config_asm="yes"], - [config_asm="no"] + (default=on). LinuxSampler provides CPU specific + assembly optimizations. This is currently limited + to just enter a fast (denormal) FPU mode on x86 + platforms. There are currently no synthesis core + assembly optimizations anymore since LS 0.4.0], + [config_asm="$enableval"], + [config_asm="yes"] ) if test "$config_asm" = "yes"; then - AC_DEFINE_UNQUOTED(CONFIG_ASM, 1, [Define to 1 if you want to enable hand-crafted asm optimizations.]) + AC_DEFINE_UNQUOTED(CONFIG_ASM, 1, [Define to 1 if you want to enable asm optimizations.]) fi AC_ARG_ENABLE(dev-mode, @@ -362,7 +368,7 @@ we do some extra sanity checks here and there. This helps to spot possible problems, but reduces efficiency a bit], - [config_dev_mode="no"], + [config_dev_mode="$enableval"], [config_dev_mode="yes"] ) if test "$config_dev_mode" = "yes"; then @@ -390,7 +396,7 @@ context as well. Otherwise if disabled segmentation faults will be forced by the application on critical errors.], - [config_rt_exceptions="yes"], + [config_rt_exceptions="$enableval"], [config_rt_exceptions="no"] ) if test "$config_rt_exceptions" = "yes"; then @@ -584,7 +590,7 @@ If enabled will force filter to be used even if no usage was define in instrument patch files. (default=no).], - [config_force_filter="yes"], + [config_force_filter="$enableval"], [config_force_filter="no"] ) if test "$config_force_filter" = "yes"; then @@ -674,7 +680,7 @@ messages which do not provide a correct checksum will be ignored. This is disabled by default as not all devices honor GS checksums.], - [config_assert_gs_sysex_checksum="yes"], + [config_assert_gs_sysex_checksum="$enableval"], [config_assert_gs_sysex_checksum="no"] ) if test "config_assert_gs_sysex_checksum" = "yes"; then @@ -720,8 +726,7 @@ Similar to intmath but uses abs() function. Depending on compiler and platrofm this could perform better than integer math as it avoids - an extra integer multiply instruction. - + an extra integer multiply instruction. diharmonic: The triangular wave will be approximated by adding two sinusoidials. This solution might especially hurt on @@ -755,8 +760,7 @@ Similar to intmath but uses abs() function. Depending on compiler and platrofm this could perform better than integer math as it avoids - an extra integer multiply instruction. - + an extra integer multiply instruction. diharmonic: The triangular wave will be approximated by adding two sinusoidials. This solution might especially hurt on @@ -787,7 +791,7 @@ will not discard notes, triggered in mute mode, when the channel is unmuted. But also will reduce the efficiency.], - [config_process_muted_channels="yes"], + [config_process_muted_channels="$enableval"], [config_process_muted_channels="no"] ) if test "$config_process_muted_channels" = "yes"; then @@ -801,7 +805,7 @@ all voices whenever it receives an All-Notes-Off MIDI message. You can disable this behavior, so that LS simply ignores such messages.], - [config_process_all_notes_off="no"], + [config_process_all_notes_off="$enableval"], [config_process_all_notes_off="yes"] ) if test "$config_process_all_notes_off" = "yes"; then @@ -815,13 +819,26 @@ generated by for example the envelope generator will be smoother, minimizing the risk for audio clicks. Disable it to reduce CPU usage.], - [config_interpolate_volume="no"], + [config_interpolate_volume="$enableval"], [config_interpolate_volume="yes"] ) if test "$config_interpolate_volume" = "yes"; then AC_DEFINE_UNQUOTED(CONFIG_INTERPOLATE_VOLUME, 1, [Define to 1 if you want to enable interpolation of volume modulation.]) fi +AC_ARG_ENABLE(plugin-dir, + [ --enable-plugin-dir + Directory where the sampler shall look for potential plugins, + that is 3rd party shared libraries that should be loaded by + the sampler on startup. By default the sampler will search + for plugins in the subdirectory "plugins" below its own + library directory. + (i.e. /usr/local/lib/linuxsampler/plugins)], + [config_plugin_dir="${enableval}"], + [config_plugin_dir="${libdir}/linuxsampler/plugins"] +) +AC_SUBST(config_plugin_dir) + ########################################################################### # Automatic Benchmarks (to detect the best algorithms for the system) @@ -856,6 +873,15 @@ echo "Call './configure --help' for further information or read configure.in." exit -1; fi +else + case "$config_signed_triang_algo" in + intmath) + triang_signed=2 ;; + diharmonic) + triang_signed=3 ;; + intmathabs) + triang_signed=5 ;; + esac fi AC_DEFINE_UNQUOTED(CONFIG_SIGNED_TRIANG_ALGO, ${triang_signed}, [Define signed triangular wave algorithm to be used.]) @@ -887,6 +913,15 @@ echo "Call './configure --help' for further information or read configure.in." exit -1; fi +else + case "$config_unsigned_triang_algo" in + intmath) + triang_unsigned=2 ;; + diharmonic) + triang_unsigned=3 ;; + intmathabs) + triang_unsigned=5 ;; + esac fi AC_DEFINE_UNQUOTED(CONFIG_UNSIGNED_TRIANG_ALGO, ${triang_unsigned}, [Define unsigned triangular wave algorithm to be used.]) @@ -918,13 +953,12 @@ man/Makefile \ man/linuxsampler.1 \ src/Makefile \ + src/db/Makefile \ src/network/Makefile \ src/engines/Makefile \ src/engines/gig/Makefile \ src/engines/common/Makefile \ - src/common/Makefile src/lib/Makefile \ - src/lib/fileloader/Makefile \ - src/lib/fileloader/libgig/Makefile \ + src/common/Makefile \ src/testcases/Makefile \ src/drivers/Makefile \ src/drivers/audio/Makefile \ @@ -934,7 +968,7 @@ Artwork/Makefile \ scripts/Makefile \ osx/Makefile \ - osx/LinuxSampler.xcode/Makefile \ + osx/linuxsampler.xcodeproj/Makefile \ Documentation/Makefile \ Documentation/Engines/Makefile \ Documentation/Engines/gig/Makefile \ @@ -942,6 +976,12 @@ Doxyfile \ ) +# resolve all nested variables in '${config_plugin_dir}' +# (merely for providing a human readable summary below) +while test $config_plugin_dir != `eval echo ${config_plugin_dir}` ; do + config_plugin_dir=`eval echo ${config_plugin_dir}` +done + ########################################################################### # Output All Configuration Options @@ -984,6 +1024,8 @@ echo "# Process Muted Channels: ${config_process_muted_channels}" echo "# Process All-Notes-Off MIDI message: ${config_process_all_notes_off}" echo "# Interpolate Volume: ${config_interpolate_volume}" +echo "# Instruments database support: ${instruments_db_support}" +echo "# Plugin Path: ${config_plugin_dir}" echo "#-------------------------------------------------------------------#" echo "# Read './configure --help' or file 'configure.in' for details. #" echo "#####################################################################"