--- linuxsampler/trunk/configure.in 2004/10/19 00:36:34 288 +++ linuxsampler/trunk/configure.in 2005/02/26 02:01:14 411 @@ -62,18 +62,18 @@ AC_CHECK_HEADER(alsa/asoundlib.h, AC_CHECK_LIB(asound, main, - have_alsa="true" + have_alsa=1 , - have_alsa="false" + have_alsa=0 ) , - have_alsa="false" + have_alsa=0 ) -if test "$have_alsa" = "true"; then +if test "$have_alsa" = "1"; then have_midi_input_driver="true" have_audio_output_driver="true"; fi -AM_CONDITIONAL(HAVE_ALSA, test $have_alsa = "true") +AM_CONDITIONAL(HAVE_ALSA, test $have_alsa = "1") AC_DEFINE_UNQUOTED(HAVE_ALSA,$have_alsa,[Define to 1 if you have ALSA installed.]) @@ -138,17 +138,30 @@ else HAVE_JACK=1 have_audio_output_driver="true"; + 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) fi AM_CONDITIONAL(HAVE_JACK, test $HAVE_JACK = 1) AC_DEFINE_UNQUOTED(HAVE_JACK,$HAVE_JACK,[Define to 1 if you have JACK installed.]) +# SQLITE3 +PKG_CHECK_MODULES(SQLITE3, sqlite3, HAVE_SQLITE3=true, HAVE_SQLITE3=false) +AC_SUBST(SQLITE3_LIBS) +AC_SUBST(SQLITE3_CFLAGS) +if test $HAVE_SQLITE3 = false; then + HAVE_SQLITE3=0; +else + HAVE_SQLITE3=1 +fi +AM_CONDITIONAL(HAVE_SQLITE3, test $HAVE_SQLITE3 = 1) +AC_DEFINE_UNQUOTED(HAVE_SQLITE3,$HAVE_SQLITE3,[Define to 1 if you have SQLITE3 installed.]) + -if test "$have_midi_input_driver=" = "false"; then +if test "$have_midi_input_driver" = "false"; then echo "No supported MIDI input system found!" echo "Sorry, LinuxSampler only supports ALSA as MIDI input driver at the moment!" exit -1; fi -if test "$have_audio_output_driver=" = "false"; then +if test "$have_audio_output_driver" = "false"; then echo "No supported audio output system found!" echo "Sorry, LinuxSampler only supports ALSA and JACK as audio output driver at the moment!" exit -1; @@ -156,7 +169,7 @@ AM_CONFIG_HEADER(config.h) -AM_INIT_AUTOMAKE(linuxsampler, 0.2) +AM_INIT_AUTOMAKE(linuxsampler, 0.3.0) AC_LANG_CPLUSPLUS AC_PROG_CXX