diff --git a/fluidsynth/ChangeLog b/fluidsynth/ChangeLog index 3da278bc..51d1b839 100644 --- a/fluidsynth/ChangeLog +++ b/fluidsynth/ChangeLog @@ -1,4 +1,22 @@ +2003-06-17 Josh Green + + Release version 1.0.2 + Added Makefile.am files where lacking. + + * Makefile.am: Fixes to "make dist" target by adding macbuild, sf2 + and winbuild to SUBDIRS also removed acconfig.h from EXTRA_DIST. + * acinclude.m4: Removed AC_JACK, now using pkgconfig. + * configure.ac: Updated to version 1.0.2, Jack test now using + pkgconfig and built by default if found, coreaudio driver now built + by default if found. + * doc/Makefile.am: Added Doxyfile, example.c, example.sf2, fluidsynth.1 + and fluidsynth-v10-devdoc.xml to EXTRA_DIST. + * src/Makefile.am: fluid_jack.c now conditionally built, fluid_sse.h + added to EXTRA_DIST. + * src/fluid_jack.c: #if JACK_SUPPORT removed as its not needed. + 2003-06-15 Josh Green + * configure.ac: Fixed detection of CoreAudio by looking for CoreAudio/AudioHardware.h. * src/Makefile.am: Added COREAUDIO_CFLAGS and COREAUDIO_LIBS. @@ -11,6 +29,7 @@ * fluidsynth_priv.h: Added "#define WITHOUT_SERVER 1" to Darwin build. 2003-06-12 Josh Green + * Makefile.am: Added autogen.sh to EXTRA_DIST * acinclude.m4: Added AM_PATH_READLINE macro for readline detection and prefix configuration. diff --git a/fluidsynth/Makefile.am b/fluidsynth/Makefile.am index 2b9fe4cf..f463def3 100644 --- a/fluidsynth/Makefile.am +++ b/fluidsynth/Makefile.am @@ -1,8 +1,7 @@ ## Process this file with automake to produce Makefile.in -SUBDIRS = src doc include -EXTRA_DIST = TODO acconfig.h acinclude.m4 fluidsynth.pc.in autogen.sh +SUBDIRS = src doc include macbuild sf2 winbuild +EXTRA_DIST = TODO acinclude.m4 fluidsynth.pc.in autogen.sh DISTCLEANFILES = fluidsynth.pc pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = fluidsynth.pc - diff --git a/fluidsynth/acinclude.m4 b/fluidsynth/acinclude.m4 index 5e86cb51..1e16f84c 100644 --- a/fluidsynth/acinclude.m4 +++ b/fluidsynth/acinclude.m4 @@ -37,51 +37,6 @@ AC_DEFUN(AC_MIDISHARE, ]) -AC_DEFUN(AC_JACK, -[ - - jack_support=no - - AC_ARG_ENABLE(jack-support, - [ --enable-jack-support Compile JACK support], - [jack_support=$enableval]) - - - JACK_SUPPORT=0 - - if test "x$jack_support" != "xno"; then - - AC_CHECK_HEADERS(jack/jack.h) - - if test "${ac_cv_header_jack_jack_h}" = "yes"; then - - dnl jack-0.6.? and above are dependent on librt. - rt_lib_arg=-lrt - AC_CHECK_LIB([rt], [shm_open],, [rt_lib_arg=]) - - if test "x$rt_lib_arg" = "x" ; then - AC_MSG_WARN([ *** Could not find the required rt library. Newer versions of JACK depend on it]) - fi - - jack_found=yes - AC_CHECK_LIB([jack], [jack_client_new],, [jack_found=no], $rt_lib_arg) - - if test "x$jack_found" = "xyes" ; then - JACK_SUPPORT=1 - AC_DEFINE(JACK_SUPPORT, 1, [Define to enable JACK driver]) - fi - - if test "x$jack_found" = "xno" ; then - AC_MSG_WARN([ *** Could not find the required JACK library]) - fi dnl jack_found = yes test - - else - AC_MSG_WARN([ *** Could not find jack.h, disabling JACK driver]) - fi dnl jack.h header test - fi dnl enable_jack_support != no? -]) - - dnl Copied from Josh Green's Smurf SoundFont Editor dnl Peter Hanappe, 21/05/2001 dnl diff --git a/fluidsynth/configure.ac b/fluidsynth/configure.ac index 91ec1cba..0b57580c 100644 --- a/fluidsynth/configure.ac +++ b/fluidsynth/configure.ac @@ -6,7 +6,7 @@ AC_INIT(src/fluidsynth.c) FLUIDSYNTH_VERSION_MAJOR=1 FLUIDSYNTH_VERSION_MINOR=0 -FLUIDSYNTH_VERSION_MICRO=1 +FLUIDSYNTH_VERSION_MICRO=2 FLUIDSYNTH_VERSION=$FLUIDSYNTH_VERSION_MAJOR.$FLUIDSYNTH_VERSION_MINOR.$FLUIDSYNTH_VERSION_MICRO AC_SUBST(FLUIDSYNTH_VERSION_MAJOR) @@ -74,7 +74,7 @@ AM_CONDITIONAL(MINGW32_SUPPORT, test "$mingw32_support" == "yes") ENABLE_FLOAT_SAMPLES=yes AC_ARG_ENABLE(double, - [ --enable-double double floating point for dsp [default=float]], + [ --enable-double double floating point for dsp (default=float)], ENABLE_FLOAT_SAMPLES=no, ENABLE_FLOAT_SAMPLES=yes) if test "x$ENABLE_FLOAT_SAMPLES" = "xyes" ; then @@ -83,7 +83,7 @@ fi profiling_flag=no AC_ARG_ENABLE(profiling, - [ --enable-profiling profile the dsp code [default=no]], + [ --enable-profiling profile the dsp code (default=no)], profiling_flag=yes, profiling_flag=no) if test "x$profiling_flag" = "xyes" ; then @@ -92,7 +92,7 @@ fi longlong=no AC_ARG_ENABLE(longlong, - [ --enable-longlong use long long integers, where appropriate [default=yes]], + [ --enable-longlong use long long integers, where appropriate (default=yes)], longlong=yes, longlong=no) if test "x$longlong" = "xyes" ; then @@ -101,7 +101,7 @@ fi SSE=no AC_ARG_ENABLE(SSE, - [ --enable-SSE Use the SSE instructions of Pentium3+ [default=no]], + [ --enable-SSE Use the SSE instructions of Pentium3+ (default=no)], SSE=yes, SSE=no) if test "x$SSE" = "xyes" ; then @@ -110,7 +110,7 @@ fi ENABLE_LADSPA=no AC_ARG_ENABLE(ladspa, - [ --enable-ladspa Include LADSPA effect unit [default=no]], + [ --enable-ladspa Include LADSPA effect unit (default=no)], ENABLE_LADSPA=yes, ENABLE_LADSPA=no) if test "x$ENABLE_LADSPA" = "xyes" ; then @@ -123,7 +123,7 @@ fi ENABLE_FUNCTIONCHECK=no AC_ARG_ENABLE(functioncheck, - [ --enable-functioncheck enable profiling using FunctionCheck. Turns on debugging. [default=no]], + [ --enable-functioncheck enable profiling using FunctionCheck. Turns on debugging. (default=no)], ENABLE_FUNCTIONCHECK=yes, ENABLE_FUNCTIONCHECK=no) @@ -144,7 +144,7 @@ else fi AC_ARG_ENABLE(debug, - [ --enable-debug enable debugging [default=no]], + [ --enable-debug enable debugging (default=no)], ENABLE_DEBUG=yes) @@ -198,67 +198,53 @@ AC_MIDISHARE dnl - Check support for JACK +AC_ARG_ENABLE(jack-support, + [ --disable-jack-support disable JACK support (default=auto)], + [enable_jack=$enableval], enable_jack="yes") -dnl PKG_CHECK_MODULES(JACK, jack, HAVE_JACK=true, HAVE_JACK=false) -dnl -dnl AC_SUBST(JACK_CFLAGS) -dnl AC_SUBST(JACK_LIBS) +if test "x$enable_jack" != "xno"; then + PKG_CHECK_MODULES(JACK, jack, JACK_SUPPORT=1, JACK_SUPPORT=0) +else + JACK_SUPPORT=0 +fi - -dnl - Check support for JACK -AC_JACK +if test "$JACK_SUPPORT" = "1"; then + AC_DEFINE(JACK_SUPPORT, 1, [Define to enable JACK driver]) +fi +AM_CONDITIONAL(JACK_SUPPORT, test "$JACK_SUPPORT" = "1") +AC_SUBST(JACK_CFLAGS) +AC_SUBST(JACK_LIBS) dnl dnl - Check support for CoreAudio dnl -fluid_enable_coreaudio="no" +AC_CHECK_HEADER(CoreAudio/AudioHardware.h, COREAUDIO_FOUND="yes", + COREAUDIO_FOUND="no") AC_ARG_ENABLE(coreaudio, -[ --enable-coreaudio enable CoreAudio support],[ - case "$enableval" in - "yes") - fluid_enable_coreaudio="yes" - ;; - "no") - fluid_enable_coreaudio="no" - ;; - *) - AC_MSG_ERROR([must use --enable-coreaudio(=yes/no) or --disable-coreaudio]) - ;; - esac -]) + [ --disable-coreaudio disable CoreAudio support (default=auto)], + enable_coreaudio=$enableval, enable_coreaudio="yes") COREAUDIO_SUPPORT=0 -if test "$fluid_enable_coreaudio" = "yes"; then - AC_CHECK_HEADER(CoreAudio/AudioHardware.h, COREAUDIO_FOUND="yes", - COREAUDIO_FOUND="no") - if test "$COREAUDIO_FOUND" = "yes"; then - AC_DEFINE(COREAUDIO_SUPPORT, 1, [whether or not we are supporting CoreAudio]) - COREAUDIO_SUPPORT=1 - COREAUDIO_LIBS=-Wl,-framework,CoreAudio - fi +if test "$fluid_enable_coreaudio" = "yes" -a "$COREAUDIO_FOUND" = "yes"; then + AC_DEFINE(COREAUDIO_SUPPORT, 1, [whether or not we are supporting CoreAudio]) + COREAUDIO_SUPPORT=1 + COREAUDIO_LIBS="-Wl,-framework,CoreAudio" fi AM_CONDITIONAL(COREAUDIO_SUPPORT, test "$COREAUDIO_SUPPORT" = "1") AC_SUBST(COREAUDIO_LIBS) -AC_SUBST(COREAUDIO_CFLAGS) +dnl dnl Check for readline support (Josh Green 2003-06-10) - -AM_PATH_READLINE(HAVE_READLINE=1, HAVE_READLINE=0) - -if test $HAVE_READLINE -ne 1 ; then - WITH_READLINE=no -else - WITH_READLINE=yes -fi - +dnl AC_ARG_WITH(readline, -[ --with-readline Use the readline library for line editing [default=yes]],[ - if test "$withval" = "no"; then - WITH_READLINE=no - fi -]) + [ --without-readline disable readline lib line editing (default=auto)], + with_readline=$withval, with_readline="yes") + +if test "$with_readline" != "no"; then + AM_PATH_READLINE(FOUND_READLINE=1, FOUND_READLINE=0) +fi dnl dnl The following script checks for ncurses support. @@ -274,8 +260,9 @@ dnl dnl On Linux ELF systems, `-lncurses' is preferred to `-ltermcap'. dnl Reported by jdassen@wi.leidenuniv.nl (J.H.M. Dassen) dnl +WITH_READLINE=0 have_termcap=false -if test "x${WITH_READLINE}" = "xyes"; then +if test "${FOUND_READLINE}" = "1"; then _termlib="mytinfo ncurses curses termcap terminfo termlib" for termlib in ${_termlib}; do AC_CHECK_LIB(${termlib}, tgetent, @@ -285,9 +272,9 @@ fi if test "x${have_termcap}" = "xtrue"; then AC_DEFINE(WITH_READLINE, 1, [Define to use the readline library for line editing]) + WITH_READLINE=1 fi - dnl dnl ladcca stuff dnl @@ -323,8 +310,20 @@ AM_CONDITIONAL(LADCCA, test "$LADCCA_FOUND" = "yes") -AC_OUTPUT(Makefile src/Makefile doc/Makefile include/Makefile include/fluidsynth/Makefile include/fluidsynth/version.h fluidsynth.pc) - +AC_OUTPUT([ + Makefile + src/Makefile + doc/Makefile + include/Makefile + include/fluidsynth/Makefile + include/fluidsynth/version.h + fluidsynth.pc + macbuild/Makefile + sf2/Makefile + winbuild/Makefile + winbuild/fluidsynth/Makefile + winbuild/fluidsynth_dll/Makefile + winbuild/fluidsynth_lib/Makefile]) echo echo "**************************************************************" @@ -366,7 +365,7 @@ dnl else dnl echo "Sound file: no" dnl fi -if test "x${WITH_READLINE}" = "xyes"; then +if test "$WITH_READLINE" = "1"; then echo "Readline: yes" else echo "Readline: no" diff --git a/fluidsynth/doc/Makefile.am b/fluidsynth/doc/Makefile.am index cda45c23..e346b596 100644 --- a/fluidsynth/doc/Makefile.am +++ b/fluidsynth/doc/Makefile.am @@ -1,4 +1,5 @@ # install the man pages and include in distribution man_MANS = fluidsynth.1 -EXTRA_DIST = $(man_MANS) +EXTRA_DIST = $(man_MANS) Doxyfile example.c example.sf2 fluidsynth.1 \ + fluidsynth-v10-devdoc.xml diff --git a/fluidsynth/macbuild/Makefile.am b/fluidsynth/macbuild/Makefile.am new file mode 100644 index 00000000..5447ef20 --- /dev/null +++ b/fluidsynth/macbuild/Makefile.am @@ -0,0 +1,3 @@ +## Process this file with automake to produce Makefile.in + +EXTRA_DIST = fluidsynth.mcp README.txt diff --git a/fluidsynth/sf2/Makefile.am b/fluidsynth/sf2/Makefile.am new file mode 100644 index 00000000..15fefc5a --- /dev/null +++ b/fluidsynth/sf2/Makefile.am @@ -0,0 +1,3 @@ +## Process this file with automake to produce Makefile.in + +EXTRA_DIST = COPYRIGHT VintageDreamsWaves-v2.sf2 diff --git a/fluidsynth/src/Makefile.am b/fluidsynth/src/Makefile.am index f9f345c1..322893ac 100644 --- a/fluidsynth/src/Makefile.am +++ b/fluidsynth/src/Makefile.am @@ -9,10 +9,15 @@ if MINGW32_SUPPORT fluid_windows = fluid_dll.c fluid_dsound.c fluid_winmidi.c endif +if JACK_SUPPORT +fluid_jack = fluid_jack.c +endif + # Extra files and optional drivers EXTRA_DIST = fluid_dll.c fluid_dsound.c fluid_winmidi.c fluid_portaudio.c \ fluid_coreaudio.c fluid_dsp_core.c fluid_sndmgr.c \ - config_macos.h config_macosx.h config.macosx_pb.h config_win32.h + config_macos.h config_macosx.h config_macosx_pb.h config_win32.h \ + fluid_sse.h lib_LTLIBRARIES = libfluidsynth.la bin_PROGRAMS = fluidsynth @@ -20,6 +25,7 @@ bin_PROGRAMS = fluidsynth libfluidsynth_la_SOURCES = \ $(fluid_coreaudio) \ $(fluid_windows) \ + $(fluid_jack) \ fluid_adriver.c \ fluid_adriver.h \ fluid_alsa.c \ @@ -41,7 +47,6 @@ libfluidsynth_la_SOURCES = \ fluid_hash.h \ fluid_io.c \ fluid_io.h \ - fluid_jack.c \ fluid_ladspa.c \ fluid_ladspa.h \ fluid_list.c \ @@ -79,10 +84,10 @@ libfluidsynth_la_SOURCES = \ fluid_voice.h INCLUDES = -I$(srcdir)/../include $(LADCCA_CFLAGS) $(READLINE_CFLAGS) \ - $(COREAUDIO_CFLAGS) + $(JACK_CFLAGS) libfluidsynth_la_LIBADD = $(LIBFLUID_LIBS) $(LADCCA_LIBS) $(READLINE_LIBS) \ - $(COREAUDIO_LIBS) + $(COREAUDIO_LIBS) $(JACK_LIBS) libfluidsynth_la_LDFLAGS = \ -version-info @LIBFLUIDSYNTH_MAJ@:@LIBFLUIDSYNTH_MIN@:0 \ -export-dynamic @FCLDFLAGS@ $(LIBFLUID_LDFLAGS) diff --git a/fluidsynth/src/config.h.in b/fluidsynth/src/config.h.in index 05a93086..edb35b32 100644 --- a/fluidsynth/src/config.h.in +++ b/fluidsynth/src/config.h.in @@ -30,9 +30,6 @@ /* Define to 1 if you have the header file. */ #undef HAVE_INTTYPES_H -/* Define to 1 if you have the header file. */ -#undef HAVE_JACK_JACK_H - /* whether or not we are supporting ladcca */ #undef HAVE_LADCCA @@ -42,18 +39,12 @@ /* Define to 1 if you have the `dl' library (-ldl). */ #undef HAVE_LIBDL -/* Define to 1 if you have the `jack' library (-ljack). */ -#undef HAVE_LIBJACK - /* Define to 1 if you have the `MidiShare' library (-lMidiShare). */ #undef HAVE_LIBMIDISHARE /* Define to 1 if you have the `pthread' library (-lpthread). */ #undef HAVE_LIBPTHREAD -/* Define to 1 if you have the `rt' library (-lrt). */ -#undef HAVE_LIBRT - /* Define to 1 if you have the header file. */ #undef HAVE_LIMITS_H diff --git a/fluidsynth/src/fluid_jack.c b/fluidsynth/src/fluid_jack.c index f792404b..e2ec32aa 100644 --- a/fluidsynth/src/fluid_jack.c +++ b/fluidsynth/src/fluid_jack.c @@ -35,8 +35,6 @@ #include "fluid_mdriver.h" #include "fluid_settings.h" -#if JACK_SUPPORT - #include #include "config.h" @@ -563,5 +561,3 @@ fluid_jack_audio_driver_shutdown(void *arg) FLUID_LOG(FLUID_ERR, "Help! Lost the connection to the JACK server"); /* exit (1); */ } - -#endif diff --git a/fluidsynth/winbuild/Makefile.am b/fluidsynth/winbuild/Makefile.am new file mode 100644 index 00000000..715df1ad --- /dev/null +++ b/fluidsynth/winbuild/Makefile.am @@ -0,0 +1,4 @@ +## Process this file with automake to produce Makefile.in + +SUBDIRS = fluidsynth fluidsynth_dll fluidsynth_lib +EXTRA_DIST = fluidsynth.dsw diff --git a/fluidsynth/winbuild/fluidsynth/Makefile.am b/fluidsynth/winbuild/fluidsynth/Makefile.am new file mode 100644 index 00000000..17e811a5 --- /dev/null +++ b/fluidsynth/winbuild/fluidsynth/Makefile.am @@ -0,0 +1,3 @@ +## Process this file with automake to produce Makefile.in + +EXTRA_DIST = fluidsynth.dsp diff --git a/fluidsynth/winbuild/fluidsynth_dll/Makefile.am b/fluidsynth/winbuild/fluidsynth_dll/Makefile.am new file mode 100644 index 00000000..12b8e101 --- /dev/null +++ b/fluidsynth/winbuild/fluidsynth_dll/Makefile.am @@ -0,0 +1,3 @@ +## Process this file with automake to produce Makefile.in + +EXTRA_DIST = fluidsynth_dll.dsp diff --git a/fluidsynth/winbuild/fluidsynth_lib/Makefile.am b/fluidsynth/winbuild/fluidsynth_lib/Makefile.am new file mode 100644 index 00000000..b439e0c9 --- /dev/null +++ b/fluidsynth/winbuild/fluidsynth_lib/Makefile.am @@ -0,0 +1,3 @@ +## Process this file with automake to produce Makefile.in + +EXTRA_DIST = fluidsynth_lib.dsp