From a19b6f25ae209460a6362ee67c98c86cf8b9696a Mon Sep 17 00:00:00 2001 From: "benjamin.drung@gmail.com" Date: Wed, 20 Nov 2013 02:51:42 +0000 Subject: [PATCH] Use Automake for Audacity. --- Makefile.am | 70 +++ autogen.sh | 6 - configure.ac | 121 ++--- help/Makefile.am | 4 + images/Makefile.am | 29 ++ lib-src/Makefile.am | 175 +++++++ lib-src/dist-libsoxr.mk | 89 ++++ lib-src/dist-libvamp.mk | 103 ++++ lib-src/dist-portaudio.mk | 354 ++++++++++++++ locale/LINGUAS | 52 ++ locale/Makevars | 41 ++ locale/POTFILES.in | 503 +++++++++++++++++++ m4/audacity_checklib_ffmpeg.m4 | 70 +-- m4/audacity_checklib_lame.m4 | 39 +- m4/audacity_checklib_libexpat.m4 | 41 +- m4/audacity_checklib_libflac.m4 | 67 ++- m4/audacity_checklib_libid3tag.m4 | 52 +- m4/audacity_checklib_libmad.m4 | 46 +- m4/audacity_checklib_libnyquist.m4 | 36 +- m4/audacity_checklib_libresample.m4 | 34 +- m4/audacity_checklib_libsamplerate.m4 | 44 +- m4/audacity_checklib_libsbsms.m4 | 46 +- m4/audacity_checklib_libsndfile.m4 | 31 +- m4/audacity_checklib_libsoundtouch.m4 | 66 ++- m4/audacity_checklib_libsoxr.m4 | 48 +- m4/audacity_checklib_libtwolame.m4 | 46 +- m4/audacity_checklib_libvamp.m4 | 55 +-- m4/audacity_checklib_libvorbis.m4 | 52 +- m4/audacity_checklib_lv2.m4 | 48 +- m4/audacity_checklib_portaudio.m4 | 36 +- m4/audacity_checklib_portsmf.m4 | 50 +- m4/audacity_checklib_taglib.m4 | 51 +- m4/audacity_checklib_widgetextra.m4 | 15 +- src/Makefile.am | 670 ++++++++++++++++++++++++++ src/configtemplate.h | 35 ++ tests/Makefile.am | 23 + 36 files changed, 2658 insertions(+), 590 deletions(-) create mode 100644 Makefile.am delete mode 100755 autogen.sh create mode 100644 help/Makefile.am create mode 100644 images/Makefile.am create mode 100644 lib-src/Makefile.am create mode 100644 lib-src/dist-libsoxr.mk create mode 100644 lib-src/dist-libvamp.mk create mode 100644 lib-src/dist-portaudio.mk create mode 100644 locale/LINGUAS create mode 100644 locale/Makevars create mode 100644 locale/POTFILES.in create mode 100644 src/Makefile.am create mode 100644 tests/Makefile.am diff --git a/Makefile.am b/Makefile.am new file mode 100644 index 000000000..6001212be --- /dev/null +++ b/Makefile.am @@ -0,0 +1,70 @@ +SUBDIRS = help images lib-src po src tests + +ACLOCAL_AMFLAGS = -I m4 + +dist_doc_DATA = LICENSE.txt README.txt +dist_pkgdata_DATA = presets/EQDefaultCurves.xml + +nobase_dist_pkgdata_DATA = \ + nyquist/bug.lsp \ + nyquist/dspprims.lsp \ + nyquist/envelopes.lsp \ + nyquist/equalizer.lsp \ + nyquist/evalenv.lsp \ + nyquist/fileio.lsp \ + nyquist/follow.lsp \ + nyquist/init.lsp \ + nyquist/misc.lsp \ + nyquist/nyinit.lsp \ + nyquist/nyqmisc.lsp \ + nyquist/nyquist.lsp \ + nyquist/nyquist-plot.txt \ + nyquist/printrec.lsp \ + nyquist/profile.lsp \ + nyquist/sal.lsp \ + nyquist/sal-parse.lsp \ + nyquist/seqfnint.lsp \ + nyquist/seq.lsp \ + nyquist/seqmidi.lsp \ + nyquist/sndfnint.lsp \ + nyquist/stk.lsp \ + nyquist/system.lsp \ + nyquist/xlinit.lsp \ + nyquist/xm.lsp \ + nyquist/rawwaves/mand1.raw \ + nyquist/rawwaves/mand2.raw \ + nyquist/rawwaves/mand3.raw \ + nyquist/rawwaves/mand4.raw \ + nyquist/rawwaves/mand5.raw \ + nyquist/rawwaves/mand6.raw \ + nyquist/rawwaves/mand7.raw \ + nyquist/rawwaves/mand8.raw \ + nyquist/rawwaves/mand9.raw \ + nyquist/rawwaves/mand10.raw \ + nyquist/rawwaves/mand11.raw \ + nyquist/rawwaves/mand12.raw \ + nyquist/rawwaves/mandpluk.raw \ + nyquist/rawwaves/marmstk1.raw \ + nyquist/rawwaves/sinewave.raw \ + plug-ins/adjustable-fade.ny \ + plug-ins/analyze.ny \ + plug-ins/beat.ny \ + plug-ins/clicktrack.ny \ + plug-ins/clipfix.ny \ + plug-ins/crossfadein.ny \ + plug-ins/crossfadeout.ny \ + plug-ins/delay.ny \ + plug-ins/equalabel.ny \ + plug-ins/highpass.ny \ + plug-ins/lowpass.ny \ + plug-ins/notch.ny \ + plug-ins/pluck.ny \ + plug-ins/rissetdrum.ny \ + plug-ins/sample-data-export.ny \ + plug-ins/SilenceMarker.ny \ + plug-ins/SoundFinder.ny \ + plug-ins/StudioFadeOut.ny \ + plug-ins/tremolo.ny \ + plug-ins/vocalremover.ny \ + plug-ins/vocoder.ny \ + $(NULL) diff --git a/autogen.sh b/autogen.sh deleted file mode 100755 index 84d9a5296..000000000 --- a/autogen.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/sh -set -e - -aclocal -I m4 -autoconf -rm -rf aclocal.m4 autom4te.cache diff --git a/configure.ac b/configure.ac index 62071616f..f15bbe79a 100644 --- a/configure.ac +++ b/configure.ac @@ -34,12 +34,18 @@ dnl Require autoconf >= 2.59 AC_PREREQ([2.59]) dnl Init autoconf -AC_INIT +AC_INIT([audacity], [2.0.6]) dnl Check for existence of Audacity.h AC_CONFIG_SRCDIR([src/Audacity.h]) dnl we have some extra macros in m4/ AC_CONFIG_MACRO_DIR([m4]) +AM_INIT_AUTOMAKE([dist-xz foreign no-dist-gzip subdir-objects -Wall -Wno-override]) +AM_MAINTAINER_MODE([disable]) + +AM_GNU_GETTEXT_VERSION([0.18]) +AM_GNU_GETTEXT([external]) + dnl ------------------------------------------------------- dnl Checks for programs. dnl ------------------------------------------------------- @@ -57,6 +63,10 @@ CFLAGS="$cflags_save" CPPFLAGS="$cppflags_save" CXXFLAGS="$cxxflags_save" +AM_PROG_AR + +LT_INIT([disable-shared]) + AC_PROG_INSTALL dnl pkg-config is required for lots of things AC_CHECK_PROG(HAVE_PKG_CONFIG, pkg-config, yes, no) @@ -65,29 +75,16 @@ if test x$HAVE_PKG_CONFIG = xno ; then fi dnl extra variables -dnl list of static link libraries to link in, with paths relative to lib-src -AC_SUBST(LOCAL_LIBS) -dnl optional object files (from audacity itself) depending on options enabled -AC_SUBST(EXTRAOBJS) dnl Extra things that need to be built during make (makefile targets) AC_SUBST(EXTRATARGETS) -dnl extra things to install during make install (makefile targets) -AC_SUBST(EXTRAINSTALLTARGETS) -dnl extra things to remove during uninstall (makefile targets) -AC_SUBST(EXTRAUNINSTALLTARGETS) -AC_SUBST(OPTOBJS) AC_SUBST(CDEPEND) AC_SUBST(PRECOMP_CFLAGS) -AC_SUBST(AFTERBUILD) AC_SUBST(INSTALL_PREFIX) dnl the header file with #defines from configure in it AC_SUBST(CONFIGHEADER) dnl LDFLAGS that will be valid for the build, but aren't yet valid so shouldn't dnl be used for configure script tests (they are needed for main build). AC_SUBST(BUILD_LDFLAGS) -dnl List of libraries in lib-src that need to be compiled before building -dnl audacity. Each name in the list should be a _target_ in lib-src/Makefile -AC_SUBST(LIBSRC_BUILD) AC_SUBST(MIMETYPES) @@ -311,8 +308,10 @@ dnl Pass wx config path to lower levels ac_configure_args="$ac_configure_args --with-wx-config=\"$WX_CONFIG\"" dnl Gather wx arguments -LIBS="$LIBS `$WX_CONFIG $wxconfigargs --libs`" -CXXFLAGS="$CXXFLAGS `$WX_CONFIG $wxconfigargs --cxxflags`" +WX_CXXFLAGS=$($WX_CONFIG $wxconfigargs --cxxflags) +WX_LIBS=$($WX_CONFIG $wxconfigargs --libs) +AC_SUBST([WX_CXXFLAGS]) +AC_SUBST([WX_LIBS]) dnl----------------------------------------------------------------- dnl Pull in library Cflags and so on for the non-optional libraries @@ -322,8 +321,9 @@ ac_configure_args="$ac_configure_args --enable-static=yes --enable-shared=no" dnl Include FileDialog AC_CONFIG_SUBDIRS([lib-src/FileDialog]) -LOCAL_LIBS="$LOCAL_LIBS FileDialog.a" CXXFLAGS="$CXXFLAGS -I\$(top_srcdir)/lib-src/FileDialog" +FILEDIALOG_LIBS='$(top_builddir)/lib-src/FileDialog/libFileDialog.la' +AC_SUBST([FILEDIALOG_LIBS]) dnl------------------------------------------------------------- dnl Optional library support. Lots of things we could use, but @@ -474,7 +474,7 @@ fi dnl----------------------------------------------------------------- -dnl Based on the optional lib selections, modify LOCAL_LIBS, CXXFLAGS, etc +dnl Based on the optional lib selections, modify CXXFLAGS, etc for lib in $LIBRARIES ; do eval LIB_USE_LOCAL=\$${lib}_USE_LOCAL eval LIB_USE_SYSTEM=\$${lib}_USE_SYSTEM @@ -482,10 +482,6 @@ for lib in $LIBRARIES ; do eval MIMETYPES=\"${MIMETYPES}\$${lib}_MIMETYPES\" fi if test "x$LIB_USE_LOCAL" = "xyes" ; then - eval LIBSRC_BUILD=\"$LIBSRC_BUILD \$${lib}_LOCAL_BUILD\" - eval LOCAL_LIBS=\"$LOCAL_LIBS \$${lib}_LOCAL_LIBS\" - eval BUILD_LDFLAGS=\"\$BUILD_LDFLAGS \$${lib}_LOCAL_LDFLAGS\" - eval OPTOBJS=\"$OPTOBJS \$${lib}_LOCAL_OPTOBJS\" eval CXXFLAGS=\"\$CXXFLAGS \$${lib}_LOCAL_CXXFLAGS\" eval ac_configure_args=\"\$ac_configure_args \$${lib}_LOCAL_CONFIGURE_ARGS\" @@ -495,7 +491,6 @@ for lib in $LIBRARIES ; do done elif test "$LIB_USE_SYSTEM" = "yes" ; then eval LIBS=\"$LIBS \$${lib}_SYSTEM_LIBS\" - eval OPTOBJS=\"$OPTOBJS \$${lib}_SYSTEM_OPTOBJS\" #LIBS="$LIBS $THESE_LIBS" eval CXXFLAGS=\"\$CXXFLAGS \$${lib}_SYSTEM_CXXFLAGS\" @@ -508,24 +503,26 @@ done dnl " This is included purely to close an otherwise endless string in vim -AUDACITY_CONFIG_SUBDIRS_EXPAT -AUDACITY_CONFIG_SUBDIRS_LIBFLAC -AUDACITY_CONFIG_SUBDIRS_LIBID3TAG -AUDACITY_CONFIG_SUBDIRS_LIBMAD -AUDACITY_CONFIG_SUBDIRS_LIBNYQUIST -AUDACITY_CONFIG_SUBDIRS_LIBRESAMPLE -AUDACITY_CONFIG_SUBDIRS_LIBSAMPLERATE -AUDACITY_CONFIG_SUBDIRS_LIBSBSMS -AUDACITY_CONFIG_SUBDIRS_LIBSNDFILE -AUDACITY_CONFIG_SUBDIRS_LIBSOUNDTOUCH -AUDACITY_CONFIG_SUBDIRS_LIBSOXR -AUDACITY_CONFIG_SUBDIRS_LIBTWOLAME -AUDACITY_CONFIG_SUBDIRS_LIBVAMP -AUDACITY_CONFIG_SUBDIRS_LIBVORBIS -AUDACITY_CONFIG_SUBDIRS_LV2 -AUDACITY_CONFIG_SUBDIRS_PORTAUDIO -AUDACITY_CONFIG_SUBDIRS_PORTSMF -AUDACITY_CONFIG_SUBDIRS_WIDGETEXTRA +AUDACITY_CONFIG_EXPAT +AUDACITY_CONFIG_FFMPEG +AUDACITY_CONFIG_LAME +AUDACITY_CONFIG_LIBFLAC +AUDACITY_CONFIG_LIBID3TAG +AUDACITY_CONFIG_LIBMAD +AUDACITY_CONFIG_LIBNYQUIST +AUDACITY_CONFIG_LIBRESAMPLE +AUDACITY_CONFIG_LIBSAMPLERATE +AUDACITY_CONFIG_LIBSBSMS +AUDACITY_CONFIG_LIBSNDFILE +AUDACITY_CONFIG_LIBSOUNDTOUCH +AUDACITY_CONFIG_LIBSOXR +AUDACITY_CONFIG_LIBTWOLAME +AUDACITY_CONFIG_LIBVAMP +AUDACITY_CONFIG_LIBVORBIS +AUDACITY_CONFIG_LV2 +AUDACITY_CONFIG_PORTAUDIO +AUDACITY_CONFIG_PORTSMF +AUDACITY_CONFIG_WIDGETEXTRA dnl-------------------------------------------------------------------------- dnl Optional features (which don't use libraries - just compile-time on/off) @@ -542,6 +539,7 @@ AC_ARG_ENABLE(ladspa, [enable LADSPA plug-in support [default=yes]])], use_ladspa=$enableval, use_ladspa="yes") +AM_CONDITIONAL([USE_LADSPA], [test "$use_ladspa" = yes]) AC_ARG_ENABLE(quicktime, [AS_HELP_STRING([--enable-quicktime], @@ -568,7 +566,6 @@ case "${host_os}" in PRECOMP_CFLAGS="-include AudacityHeaders.h" CONFIGHEADER="configunix.h" CXXFLAGS="-I\$(top_srcdir)/mac $CXXFLAGS" - AFTERBUILD="" EXTRATARGETS="../Audacity.app" if [[ "$use_audiounits" = "auto" ]] ; then use_audiounits="yes" @@ -586,16 +583,11 @@ case "${host_os}" in AC_DEFINE(__CYGWIN__,1,[We're using cygwin]) dnl ' (end endless string in vim) AC_DEFINE(_FILE_OFFSET_BITS,32,[Placeholder for large file support]) - - AFTERBUILD="" ;; *) dnl Unix configuration CONFIGHEADER="configunix.h" - AFTERBUILD="" - EXTRAINSTALLTARGETS="$EXTRAINSTALLTARGETS install-extra-data" - EXTRAUNINSTALLTARGETS="$EXTRAUNINSTALLTARGETS uninstall-extra-data" dnl On Unix we always use dlopen AC_SEARCH_LIBS([dlopen], [dl]) @@ -648,10 +640,11 @@ if [[ "$use_portmixer" = "yes" ]] ; then [Define if PortMixer support should be enabled]) CXXFLAGS="-I\$(top_srcdir)/lib-src/portmixer/include $CXXFLAGS" - LOCAL_LIBS="$LOCAL_LIBS libportmixer.a" + PORTMIXER_LIBS='$(top_builddir)/lib-src/portmixer/src/libportmixer.la' AC_CONFIG_SUBDIRS([lib-src/portmixer]) fi +AC_SUBST([PORTMIXER_LIBS]) dnl Check for lrint/lrintf AC_C99_FUNC_LRINT @@ -659,9 +652,6 @@ AC_C99_FUNC_LRINTF if [[ "$use_ladspa" = "yes" ]] ; then - OPTOBJS="$OPTOBJS effects/ladspa/LoadLadspa.o" - OPTOBJS="$OPTOBJS effects/ladspa/LadspaEffect.o" - AC_DEFINE(USE_LADSPA, 1, [Define if LADSPA plug-ins are enabled]) @@ -675,18 +665,14 @@ if [[ "$use_ladspa" = "yes" ]] ; then esac fi +AM_CONDITIONAL([USE_AUDIO_UNITS], [test "$use_audiounits" = yes]) if [[ "$use_audiounits" = "yes" ]] ; then - OPTOBJS="$OPTOBJS effects/audiounits/LoadAudioUnits.o" - OPTOBJS="$OPTOBJS effects/audiounits/AudioUnitEffect.o" - AC_DEFINE(USE_AUDIO_UNITS, 1, [Define if Audio Unit plug-ins are enabled (Mac OS X only)]) fi +AM_CONDITIONAL([USE_QUICKTIME], [test "$use_quicktime" = yes]) if [[ "$use_quicktime" = "yes" ]] ; then - OPTOBJS="$OPTOBJS import/ImportQT.o" - OPTOBJS="$OPTOBJS import/ImportQTWrapper.o" - AC_DEFINE(USE_QUICKTIME, 1, [Define if QuickTime importing is enabled (Mac OS X only)]) fi @@ -703,17 +689,16 @@ case "${host_os}" in esac # process Makefile.in's to generate Makefiles -AC_CONFIG_FILES([Makefile src/Makefile lib-src/Makefile \ - locale/Makefile]) -# Anything that depends on the name of the installed Audacity binary needs -# to be processed to set that here -AC_CONFIG_FILES([src/audacity.desktop]) - -dnl There are various other files we might need to process, depends on what -dnl has been enabled previously -if [[ -e tests/Makefile.in ]]; then - AC_CONFIG_FILES([tests/Makefile]) -fi +AC_CONFIG_FILES([ + Makefile + help/Makefile + images/Makefile + lib-src/Makefile + po/Makefile.in + src/audacity.desktop + src/Makefile + tests/Makefile +]) AC_OUTPUT diff --git a/help/Makefile.am b/help/Makefile.am new file mode 100644 index 000000000..a80280758 --- /dev/null +++ b/help/Makefile.am @@ -0,0 +1,4 @@ +dist_man_MANS = audacity.1 + +appdatadir = $(datarootdir)/appdata +dist_appdata_DATA = audacity.appdata.xml diff --git a/images/Makefile.am b/images/Makefile.am new file mode 100644 index 000000000..493afb375 --- /dev/null +++ b/images/Makefile.am @@ -0,0 +1,29 @@ +iconsdatadir = $(datarootdir)/icons/hicolor +icons16dir = $(iconsdatadir)/16x16/apps +icons22dir = $(iconsdatadir)/22x22/apps +icons24dir = $(iconsdatadir)/24x24/apps +icons32dir = $(iconsdatadir)/32x32/apps +icons48dir = $(iconsdatadir)/48x48/apps +iconsscalabledir = $(iconsdatadir)/scalable/apps + +dist_icons16_DATA = icons/16x16/audacity.png +dist_icons22_DATA = icons/22x22/audacity.png +dist_icons24_DATA = icons/24x24/audacity.png +dist_icons32_DATA = icons/32x32/audacity.png +dist_icons48_DATA = icons/48x48/audacity.png +dist_iconsscalable_DATA = audacity.svg + +pixmapdir = $(datarootdir)/pixmaps +dist_pixmap_DATA = \ + gnome-mime-application-x-audacity-project.xpm \ + icons/16x16/audacity16.xpm \ + icons/32x32/audacity32.xpm \ + $(NULL) + +pixmap_DATA = icons/48x48/audacity.xpm + +# Copy AudacityLogo48x48.xpm to icons/48x48/audacity.xpm +# We could rename this file instead and adjust all locations. +icons/48x48/audacity.xpm: AudacityLogo48x48.xpm + cp AudacityLogo48x48.xpm icons/48x48/audacity.xpm +CLEANFILES = icons/48x48/audacity.xpm diff --git a/lib-src/Makefile.am b/lib-src/Makefile.am new file mode 100644 index 000000000..c7491bf92 --- /dev/null +++ b/lib-src/Makefile.am @@ -0,0 +1,175 @@ +EXTRA_DIST = \ + ffmpeg/libavcodec/avcodec.h \ + ffmpeg/libavformat/avformat.h \ + ffmpeg/libavformat/avio.h \ + ffmpeg/libavutil/attributes.h \ + ffmpeg/libavutil/avconfig.h \ + ffmpeg/libavutil/avutil.h \ + ffmpeg/libavutil/common.h \ + ffmpeg/libavutil/error.h \ + ffmpeg/libavutil/fifo.h \ + ffmpeg/libavutil/intfloat_readwrite.h \ + ffmpeg/libavutil/log.h \ + ffmpeg/libavutil/mathematics.h \ + ffmpeg/libavutil/mem.h \ + ffmpeg/libavutil/pixfmt.h \ + ffmpeg/libavutil/rational.h \ + ffmpeg/win32/inttypes.h \ + ffmpeg/win32/stdint.h \ + lame/lame/lame.h \ + $(NULL) + +# Distribute patches +EXTRA_DIST += \ + portsmf/autotools.patch \ + portsmf/autotools-fix-make-dist.patch \ + sbsms/autotools.patch \ + sbsms/autotools-fix-make-dist.patch \ + sbsms/dont-mangle-cflags.patch \ + $(NULL) + +DIST_SUBDIRS = \ + FileDialog \ + libnyquist \ + lib-widget-extra \ + lv2 \ + portmixer \ + portsmf \ + sbsms \ + $(NULL) + +include dist-libsoxr.mk +include dist-libvamp.mk +include dist-portaudio.mk + +# TODO: Distribute these libraries that do not use Automake: +# libresample +# TODO: Check and distribute these directories: +# libscorealign, mod-null, mod-nyq-bench, mod-script-pipe, mod-track-panel, portmidi + +SUBDIRS = FileDialog + +if USE_LOCAL_EXPAT +# Note: This library will not be distributed in the source tarball. +SUBDIRS += expat +endif + +if USE_LOCAL_LIBID3TAG +# Note: This library will not be distributed in the source tarball. +SUBDIRS += libid3tag +endif + +if USE_LOCAL_LIBMAD +# Note: This library will not be distributed in the source tarball. +SUBDIRS += libmad +endif + +if USE_LOCAL_LIBNYQUIST +SUBDIRS += libnyquist +endif + +if USE_LOCAL_LIBRESAMPLE +SUBDIRS += libresample +endif + +if USE_LOCAL_LIBSAMPLERATE +# Note: This library will not be distributed in the source tarball. +SUBDIRS += libsamplerate +endif + +if USE_LOCAL_LIBSNDFILE +# Note: This library will not be distributed in the source tarball. +SUBDIRS += libsndfile +endif + +if USE_LOCAL_LIBSOUNDTOUCH +# Note: This library will not be distributed in the source tarball. +SUBDIRS += soundtouch +endif + +if USE_LOCAL_LIBSOXR +SUBDIRS += libsoxr +endif + +if USE_LOCAL_LIBTWOLAME +# Note: This library will not be distributed in the source tarball. +SUBDIRS += twolame +endif + +if USE_LOCAL_LIBVORBIS +# Note: These libraries will not be distributed in the source tarball. +SUBDIRS += libogg libvorbis +endif + +if USE_LOCAL_LIBFLAC +# Note: libflac needs to be linked against (the local or system) libogg. +# Note: This library will not be distributed in the source tarball. +SUBDIRS += libflac +endif + +if USE_LOCAL_LV2 +SUBDIRS += lv2 +endif + +if USE_LOCAL_PORTAUDIO +SUBDIRS += portaudio-v19 +endif + +# Note: portmixer needs to be linked against (the local or system) portaudio. +SUBDIRS += portmixer + +if USE_LOCAL_PORTSMF +SUBDIRS += portsmf +endif + +if USE_LOCAL_SBSMS +SUBDIRS += sbsms +endif + +if USE_LOCAL_VAMP +SUBDIRS += libvamp +endif + +if USE_LOCAL_WIDGETEXTRA +SUBDIRS += lib-widget-extra +endif + +# Overwrite install* targets from automake. We do not want to install anything +# from the lib-src libraries, because we statically link these libraries. +install: +install-dvi: +install-data: +install-exec: +install-html: +install-info: +install-ps: +install-pdf: +installdirs: +uninstall: + +# Overwrite check target. We do not want to run the tests from the libraries. +check: + +# Overwrite distclean rule to avoid running distclean for unconfigured libraries +# (and then failing due to the missing Makefile). +distclean: + @for subdir in $(SUBDIRS); do \ + if test -f $$subdir/Makefile; then \ + echo "Making $@ in $$subdir"; \ + $(MAKE) $(AM_MAKEFLAGS) -C $$subdir $@ || exit 1; \ + fi; \ + done + rm -f Makefile + +# Overwrite maintainer-clean rule to avoid running maintainer-clean for +# unconfigured libraries (and then failing due to the missing Makefile). +maintainer-clean: + @for subdir in $(SUBDIRS); do \ + if test -f $$subdir/Makefile; then \ + echo "Making $@ in $$subdir"; \ + $(MAKE) $(AM_MAKEFLAGS) -C $$subdir $@ || exit 1; \ + fi; \ + done + rm -f Makefile + +.PHONY: check install install-dvi install-data install-exec install-html install-info install-ps install-pdf installdirs uninstall distclean maintainer-clean diff --git a/lib-src/dist-libsoxr.mk b/lib-src/dist-libsoxr.mk new file mode 100644 index 000000000..ddcda06aa --- /dev/null +++ b/lib-src/dist-libsoxr.mk @@ -0,0 +1,89 @@ +EXTRA_DIST += \ + libsoxr/add-make-check-support.patch \ + libsoxr/AUTHORS \ + libsoxr/CMakeLists.txt \ + libsoxr/cmake/Modules/FindLibAVCodec.cmake \ + libsoxr/cmake/Modules/FindOpenMP.cmake \ + libsoxr/cmake/Modules/FindSIMD.cmake \ + libsoxr/cmake/Modules/TestBigEndian.cmake \ + libsoxr/configure \ + libsoxr/COPYING.LGPL \ + libsoxr/deinstall.cmake.in \ + libsoxr/examples/1a-lsr.c \ + libsoxr/examples/1-single-block.c \ + libsoxr/examples/2-stream.C \ + libsoxr/examples/3-options-input-fn.c \ + libsoxr/examples/4-split-channels.c \ + libsoxr/examples/5-variable-rate.c \ + libsoxr/examples/CMakeLists.txt \ + libsoxr/examples/examples-common.h \ + libsoxr/examples/README \ + libsoxr/go \ + libsoxr/go.bat \ + libsoxr/INSTALL \ + libsoxr/inst-check \ + libsoxr/inst-check-soxr \ + libsoxr/LICENCE \ + libsoxr/msvc/libsoxr.vcproj \ + libsoxr/msvc/README \ + libsoxr/msvc/soxr-config.h \ + libsoxr/NEWS \ + libsoxr/README \ + libsoxr/soxr-config.h.in \ + libsoxr/src/aliases.h \ + libsoxr/src/avfft32.c \ + libsoxr/src/avfft32s.c \ + libsoxr/src/ccrw2.h \ + libsoxr/src/CMakeLists.txt \ + libsoxr/src/data-io.c \ + libsoxr/src/data-io.h \ + libsoxr/src/dbesi0.c \ + libsoxr/src/fft4g32.c \ + libsoxr/src/fft4g32s.c \ + libsoxr/src/fft4g64.c \ + libsoxr/src/fft4g.c \ + libsoxr/src/fft4g_cache.h \ + libsoxr/src/fft4g.h \ + libsoxr/src/fifo.h \ + libsoxr/src/filter.c \ + libsoxr/src/filter.h \ + libsoxr/src/filters.h \ + libsoxr/src/half_coefs.h \ + libsoxr/src/half-fir.h \ + libsoxr/src/internal.h \ + libsoxr/src/libsoxr-dev.src.in \ + libsoxr/src/libsoxr.src.in \ + libsoxr/src/lsr.c \ + libsoxr/src/pffft32.c \ + libsoxr/src/pffft32s.c \ + libsoxr/src/pffft.c \ + libsoxr/src/pffft.h \ + libsoxr/src/poly-fir0.h \ + libsoxr/src/poly-fir.h \ + libsoxr/src/rate32.c \ + libsoxr/src/rate32s.c \ + libsoxr/src/rate64.c \ + libsoxr/src/rate.h \ + libsoxr/src/rdft.h \ + libsoxr/src/rint-clip.h \ + libsoxr/src/rint.h \ + libsoxr/src/samplerate.h \ + libsoxr/src/simd.c \ + libsoxr/src/simd-dev.h \ + libsoxr/src/simd.h \ + libsoxr/src/soxr.c \ + libsoxr/src/soxr.h \ + libsoxr/src/soxr-lsr.h \ + libsoxr/src/soxr-lsr.pc.in \ + libsoxr/src/soxr.pc.in \ + libsoxr/src/vr32.c \ + libsoxr/tests/CMakeLists.txt \ + libsoxr/tests/cmp-test.cmake \ + libsoxr/tests/eg-test \ + libsoxr/tests/io-test \ + libsoxr/tests/large-ratio \ + libsoxr/tests/README \ + libsoxr/tests/vector-cmp.c \ + libsoxr/tests/vector-gen.c \ + libsoxr/TODO \ + $(NULL) diff --git a/lib-src/dist-libvamp.mk b/lib-src/dist-libvamp.mk new file mode 100644 index 000000000..a32a25b7b --- /dev/null +++ b/lib-src/dist-libvamp.mk @@ -0,0 +1,103 @@ +EXTRA_DIST += \ + libvamp/build/Doxyfile \ + libvamp/build/libvamp-hostsdk.la.in \ + libvamp/build/libvamp-sdk.la.in \ + libvamp/build/Makefile.mingw32 \ + libvamp/build/Makefile.osx \ + libvamp/build/Makefile.osx.106 \ + libvamp/build/README.linux \ + libvamp/build/README.msvc \ + libvamp/build/README.osx \ + libvamp/build/update-version.sh \ + libvamp/build/VampExamplePlugins.sln \ + libvamp/build/VampExamplePlugins.vcproj \ + libvamp/build/VampExamplePlugins.vcxproj \ + libvamp/build/VampHostSDK.sln \ + libvamp/build/VampHostSDK.vcproj \ + libvamp/build/VampHostSDK.vcxproj \ + libvamp/build/vamp-plugin.list \ + libvamp/build/vamp-plugin.map \ + libvamp/build/VampPluginSDK.sln \ + libvamp/build/VampPluginSDK.vcproj \ + libvamp/build/VampPluginSDK.vcxproj \ + libvamp/CHANGELOG \ + libvamp/configure \ + libvamp/configure.ac \ + libvamp/COPYING \ + libvamp/examples/AmplitudeFollower.cpp \ + libvamp/examples/AmplitudeFollower.h \ + libvamp/examples/FixedTempoEstimator.cpp \ + libvamp/examples/FixedTempoEstimator.h \ + libvamp/examples/PercussionOnsetDetector.cpp \ + libvamp/examples/PercussionOnsetDetector.h \ + libvamp/examples/plugins.cpp \ + libvamp/examples/PowerSpectrum.cpp \ + libvamp/examples/PowerSpectrum.h \ + libvamp/examples/SpectralCentroid.cpp \ + libvamp/examples/SpectralCentroid.h \ + libvamp/examples/vamp-example-plugins.cat \ + libvamp/examples/vamp-example-plugins.n3 \ + libvamp/examples/ZeroCrossing.cpp \ + libvamp/examples/ZeroCrossing.h \ + libvamp/fix-all-target.patch \ + libvamp/fix-linkage-against-dl.patch \ + libvamp/host/system.h \ + libvamp/host/vamp-simple-host.cpp \ + libvamp/INSTALL \ + libvamp/Makefile.in \ + libvamp/pkgconfig/vamp-hostsdk.pc.in \ + libvamp/pkgconfig/vamp.pc.in \ + libvamp/pkgconfig/vamp-sdk.pc.in \ + libvamp/rdf/doc/glance.htm \ + libvamp/rdf/doc/vamp.html \ + libvamp/rdf/doc/vamp.pl \ + libvamp/rdf/generator/vamp-rdf-template-generator.cpp \ + libvamp/rdf/README \ + libvamp/rdf/ToDo \ + libvamp/rdf/vamp.n3 \ + libvamp/rdf/vamp.rdf \ + libvamp/README \ + libvamp/README.compat \ + libvamp/skeleton/Makefile.skeleton \ + libvamp/skeleton/MyPlugin.cpp \ + libvamp/skeleton/MyPlugin.h \ + libvamp/skeleton/plugins.cpp \ + libvamp/skeleton/vamp-plugin.list \ + libvamp/skeleton/vamp-plugin.map \ + libvamp/src/doc-overview \ + libvamp/src/vamp-hostsdk/acsymbols.c \ + libvamp/src/vamp-hostsdk/PluginBufferingAdapter.cpp \ + libvamp/src/vamp-hostsdk/PluginChannelAdapter.cpp \ + libvamp/src/vamp-hostsdk/PluginHostAdapter.cpp \ + libvamp/src/vamp-hostsdk/PluginInputDomainAdapter.cpp \ + libvamp/src/vamp-hostsdk/PluginLoader.cpp \ + libvamp/src/vamp-hostsdk/PluginSummarisingAdapter.cpp \ + libvamp/src/vamp-hostsdk/PluginWrapper.cpp \ + libvamp/src/vamp-hostsdk/RealTime.cpp \ + libvamp/src/vamp-hostsdk/Window.h \ + libvamp/src/vamp-sdk/acsymbols.c \ + libvamp/src/vamp-sdk/FFT.cpp \ + libvamp/src/vamp-sdk/FFTimpl.cpp \ + libvamp/src/vamp-sdk/PluginAdapter.cpp \ + libvamp/src/vamp-sdk/RealTime.cpp \ + libvamp/vamp-hostsdk/hostguard.h \ + libvamp/vamp-hostsdk/PluginBase.h \ + libvamp/vamp-hostsdk/PluginBufferingAdapter.h \ + libvamp/vamp-hostsdk/PluginChannelAdapter.h \ + libvamp/vamp-hostsdk/Plugin.h \ + libvamp/vamp-hostsdk/PluginHostAdapter.h \ + libvamp/vamp-hostsdk/PluginInputDomainAdapter.h \ + libvamp/vamp-hostsdk/PluginLoader.h \ + libvamp/vamp-hostsdk/PluginSummarisingAdapter.h \ + libvamp/vamp-hostsdk/PluginWrapper.h \ + libvamp/vamp-hostsdk/RealTime.h \ + libvamp/vamp-hostsdk/vamp-hostsdk.h \ + libvamp/vamp-sdk/FFT.h \ + libvamp/vamp-sdk/plugguard.h \ + libvamp/vamp-sdk/PluginAdapter.h \ + libvamp/vamp-sdk/PluginBase.h \ + libvamp/vamp-sdk/Plugin.h \ + libvamp/vamp-sdk/RealTime.h \ + libvamp/vamp-sdk/vamp-sdk.h \ + libvamp/vamp/vamp.h \ + $(NULL) diff --git a/lib-src/dist-portaudio.mk b/lib-src/dist-portaudio.mk new file mode 100644 index 000000000..5358a0221 --- /dev/null +++ b/lib-src/dist-portaudio.mk @@ -0,0 +1,354 @@ +EXTRA_DIST += \ + portaudio-v19/bindings/cpp/aclocal.m4 \ + portaudio-v19/bindings/cpp/AUTHORS \ + portaudio-v19/bindings/cpp/bin/Makefile.am \ + portaudio-v19/bindings/cpp/bin/Makefile.in \ + portaudio-v19/bindings/cpp/build/gnu/aclocal.m4 \ + portaudio-v19/bindings/cpp/build/gnu/config.guess \ + portaudio-v19/bindings/cpp/build/gnu/config.sub \ + portaudio-v19/bindings/cpp/build/gnu/configure \ + portaudio-v19/bindings/cpp/build/gnu/configure.ac \ + portaudio-v19/bindings/cpp/build/gnu/install-sh \ + portaudio-v19/bindings/cpp/build/gnu/Makefile.in \ + portaudio-v19/bindings/cpp/build/gnu/OUT_OF_DATE \ + portaudio-v19/bindings/cpp/build/vc6/devs_example.dsp \ + portaudio-v19/bindings/cpp/build/vc6/devs_example.dsw \ + portaudio-v19/bindings/cpp/build/vc6/sine_example.dsp \ + portaudio-v19/bindings/cpp/build/vc6/sine_example.dsw \ + portaudio-v19/bindings/cpp/build/vc6/static_library.dsp \ + portaudio-v19/bindings/cpp/build/vc6/static_library.dsw \ + portaudio-v19/bindings/cpp/build/vc7_1/devs_example.sln \ + portaudio-v19/bindings/cpp/build/vc7_1/devs_example.vcproj \ + portaudio-v19/bindings/cpp/build/vc7_1/sine_example.sln \ + portaudio-v19/bindings/cpp/build/vc7_1/sine_example.vcproj \ + portaudio-v19/bindings/cpp/build/vc7_1/static_library.sln \ + portaudio-v19/bindings/cpp/build/vc7_1/static_library.vcproj \ + portaudio-v19/bindings/cpp/build/vc7/OUT_OF_DATE \ + portaudio-v19/bindings/cpp/ChangeLog \ + portaudio-v19/bindings/cpp/configure \ + portaudio-v19/bindings/cpp/configure.ac \ + portaudio-v19/bindings/cpp/COPYING \ + portaudio-v19/bindings/cpp/doc/config.doxy \ + portaudio-v19/bindings/cpp/doc/config.doxy.linux \ + portaudio-v19/bindings/cpp/doc/Makefile.am \ + portaudio-v19/bindings/cpp/doc/Makefile.in \ + portaudio-v19/bindings/cpp/doc/README \ + portaudio-v19/bindings/cpp/example/devs.cxx \ + portaudio-v19/bindings/cpp/example/sine.cxx \ + portaudio-v19/bindings/cpp/include/Makefile.am \ + portaudio-v19/bindings/cpp/include/Makefile.in \ + portaudio-v19/bindings/cpp/include/portaudiocpp/AsioDeviceAdapter.hxx \ + portaudio-v19/bindings/cpp/include/portaudiocpp/AutoSystem.hxx \ + portaudio-v19/bindings/cpp/include/portaudiocpp/BlockingStream.hxx \ + portaudio-v19/bindings/cpp/include/portaudiocpp/CallbackInterface.hxx \ + portaudio-v19/bindings/cpp/include/portaudiocpp/CallbackStream.hxx \ + portaudio-v19/bindings/cpp/include/portaudiocpp/CFunCallbackStream.hxx \ + portaudio-v19/bindings/cpp/include/portaudiocpp/CppFunCallbackStream.hxx \ + portaudio-v19/bindings/cpp/include/portaudiocpp/Device.hxx \ + portaudio-v19/bindings/cpp/include/portaudiocpp/DirectionSpecificStreamParameters.hxx \ + portaudio-v19/bindings/cpp/include/portaudiocpp/Exception.hxx \ + portaudio-v19/bindings/cpp/include/portaudiocpp/HostApi.hxx \ + portaudio-v19/bindings/cpp/include/portaudiocpp/InterfaceCallbackStream.hxx \ + portaudio-v19/bindings/cpp/include/portaudiocpp/MemFunCallbackStream.hxx \ + portaudio-v19/bindings/cpp/include/portaudiocpp/PortAudioCpp.hxx \ + portaudio-v19/bindings/cpp/include/portaudiocpp/SampleDataFormat.hxx \ + portaudio-v19/bindings/cpp/include/portaudiocpp/Stream.hxx \ + portaudio-v19/bindings/cpp/include/portaudiocpp/StreamParameters.hxx \ + portaudio-v19/bindings/cpp/include/portaudiocpp/SystemDeviceIterator.hxx \ + portaudio-v19/bindings/cpp/include/portaudiocpp/SystemHostApiIterator.hxx \ + portaudio-v19/bindings/cpp/include/portaudiocpp/System.hxx \ + portaudio-v19/bindings/cpp/INSTALL \ + portaudio-v19/bindings/cpp/lib/Makefile.am \ + portaudio-v19/bindings/cpp/lib/Makefile.in \ + portaudio-v19/bindings/cpp/Makefile.am \ + portaudio-v19/bindings/cpp/Makefile.in \ + portaudio-v19/bindings/cpp/NEWS \ + portaudio-v19/bindings/cpp/portaudiocpp.pc.in \ + portaudio-v19/bindings/cpp/README \ + portaudio-v19/bindings/cpp/SConscript \ + portaudio-v19/bindings/cpp/source/portaudiocpp/AsioDeviceAdapter.cxx \ + portaudio-v19/bindings/cpp/source/portaudiocpp/BlockingStream.cxx \ + portaudio-v19/bindings/cpp/source/portaudiocpp/CallbackInterface.cxx \ + portaudio-v19/bindings/cpp/source/portaudiocpp/CallbackStream.cxx \ + portaudio-v19/bindings/cpp/source/portaudiocpp/CFunCallbackStream.cxx \ + portaudio-v19/bindings/cpp/source/portaudiocpp/CppFunCallbackStream.cxx \ + portaudio-v19/bindings/cpp/source/portaudiocpp/Device.cxx \ + portaudio-v19/bindings/cpp/source/portaudiocpp/DirectionSpecificStreamParameters.cxx \ + portaudio-v19/bindings/cpp/source/portaudiocpp/Exception.cxx \ + portaudio-v19/bindings/cpp/source/portaudiocpp/HostApi.cxx \ + portaudio-v19/bindings/cpp/source/portaudiocpp/InterfaceCallbackStream.cxx \ + portaudio-v19/bindings/cpp/source/portaudiocpp/MemFunCallbackStream.cxx \ + portaudio-v19/bindings/cpp/source/portaudiocpp/Stream.cxx \ + portaudio-v19/bindings/cpp/source/portaudiocpp/StreamParameters.cxx \ + portaudio-v19/bindings/cpp/source/portaudiocpp/System.cxx \ + portaudio-v19/bindings/cpp/source/portaudiocpp/SystemDeviceIterator.cxx \ + portaudio-v19/bindings/cpp/source/portaudiocpp/SystemHostApiIterator.cxx \ + portaudio-v19/bindings/java/c/build/vs2010/PortAudioJNI/PortAudioJNI.sln \ + portaudio-v19/bindings/java/c/build/vs2010/PortAudioJNI/PortAudioJNI.vcproj \ + portaudio-v19/bindings/java/c/build/vs2010/PortAudioJNI/PortAudioJNI.vcxproj \ + portaudio-v19/bindings/java/c/src/com_portaudio_BlockingStream.c \ + portaudio-v19/bindings/java/c/src/com_portaudio_BlockingStream.h \ + portaudio-v19/bindings/java/c/src/com_portaudio_PortAudio.c \ + portaudio-v19/bindings/java/c/src/com_portaudio_PortAudio.h \ + portaudio-v19/bindings/java/c/src/jpa_tools.c \ + portaudio-v19/bindings/java/c/src/jpa_tools.h \ + portaudio-v19/bindings/java/jportaudio/.classpath \ + portaudio-v19/bindings/java/jportaudio.dox \ + portaudio-v19/bindings/java/jportaudio/jtests/com/portaudio/PlaySine.java \ + portaudio-v19/bindings/java/jportaudio/jtests/com/portaudio/TestBasic.java \ + portaudio-v19/bindings/java/jportaudio/.project \ + portaudio-v19/bindings/java/jportaudio/src/com/portaudio/BlockingStream.java \ + portaudio-v19/bindings/java/jportaudio/src/com/portaudio/DeviceInfo.java \ + portaudio-v19/bindings/java/jportaudio/src/com/portaudio/HostApiInfo.java \ + portaudio-v19/bindings/java/jportaudio/src/com/portaudio/PortAudio.java \ + portaudio-v19/bindings/java/jportaudio/src/com/portaudio/StreamInfo.java \ + portaudio-v19/bindings/java/jportaudio/src/com/portaudio/StreamParameters.java \ + portaudio-v19/bindings/java/scripts/make_header.bat \ + portaudio-v19/build/msvc/portaudio.def \ + portaudio-v19/build/msvc/portaudio.dsp \ + portaudio-v19/build/msvc/portaudio.dsw \ + portaudio-v19/build/msvc/portaudio.sln \ + portaudio-v19/build/msvc/portaudio.vcproj \ + portaudio-v19/build/msvc/readme.txt \ + portaudio-v19/build/scons/SConscript_common \ + portaudio-v19/build/scons/SConscript_opts \ + portaudio-v19/CMakeLists.txt \ + portaudio-v19/cmake_support/FindASIOSDK.cmake \ + portaudio-v19/cmake_support/FindDXSDK.cmake \ + portaudio-v19/cmake_support/options_cmake.h.in \ + portaudio-v19/cmake_support/template_portaudio.def \ + portaudio-v19/config.guess \ + portaudio-v19/config.sub \ + portaudio-v19/configure \ + portaudio-v19/configure.in \ + portaudio-v19/depcomp \ + portaudio-v19/doc/src/api_overview.dox \ + portaudio-v19/doc/src/images/portaudio-external-architecture-diagram.png \ + portaudio-v19/doc/src/license.dox \ + portaudio-v19/doc/src/mainpage.dox \ + portaudio-v19/doc/src/srcguide.dox \ + portaudio-v19/doc/src/tutorial/blocking_read_write.dox \ + portaudio-v19/doc/src/tutorial/compile_cmake.dox \ + portaudio-v19/doc/src/tutorial/compile_linux.dox \ + portaudio-v19/doc/src/tutorial/compile_mac_coreaudio.dox \ + portaudio-v19/doc/src/tutorial/compile_windows_asio_msvc.dox \ + portaudio-v19/doc/src/tutorial/compile_windows.dox \ + portaudio-v19/doc/src/tutorial/compile_windows_mingw.dox \ + portaudio-v19/doc/src/tutorial/exploring.dox \ + portaudio-v19/doc/src/tutorial/initializing_portaudio.dox \ + portaudio-v19/doc/src/tutorial/open_default_stream.dox \ + portaudio-v19/doc/src/tutorial/querying_devices.dox \ + portaudio-v19/doc/src/tutorial/start_stop_abort.dox \ + portaudio-v19/doc/src/tutorial/terminating_portaudio.dox \ + portaudio-v19/doc/src/tutorial/tutorial_start.dox \ + portaudio-v19/doc/src/tutorial/utility_functions.dox \ + portaudio-v19/doc/src/tutorial/writing_a_callback.dox \ + portaudio-v19/doc/utils/checkfiledocs.py \ + portaudio-v19/Doxyfile \ + portaudio-v19/Doxyfile.developer \ + portaudio-v19/examples/CMakeLists.txt \ + portaudio-v19/examples/pa_devs.c \ + portaudio-v19/examples/paex_mono_asio_channel_select.c \ + portaudio-v19/examples/paex_ocean_shore.c \ + portaudio-v19/examples/paex_pink.c \ + portaudio-v19/examples/paex_read_write_wire.c \ + portaudio-v19/examples/paex_record.c \ + portaudio-v19/examples/paex_record_file.c \ + portaudio-v19/examples/paex_saw.c \ + portaudio-v19/examples/paex_sine.c \ + portaudio-v19/examples/paex_sine_c++.cpp \ + portaudio-v19/examples/paex_wmme_ac3.c \ + portaudio-v19/examples/paex_wmme_surround.c \ + portaudio-v19/examples/paex_write_sine.c \ + portaudio-v19/examples/paex_write_sine_nonint.c \ + portaudio-v19/examples/pa_fuzz.c \ + portaudio-v19/fixdir.bat \ + portaudio-v19/fixfile.bat \ + portaudio-v19/include/pa_asio.h \ + portaudio-v19/include/pa_jack.h \ + portaudio-v19/include/pa_linux_alsa.h \ + portaudio-v19/include/pa_mac_core.h \ + portaudio-v19/include/pa_unix_oss.h \ + portaudio-v19/include/pa_win_ds.h \ + portaudio-v19/include/pa_win_wasapi.h \ + portaudio-v19/include/pa_win_waveformat.h \ + portaudio-v19/include/pa_win_wdmks.h \ + portaudio-v19/include/pa_win_wmme.h \ + portaudio-v19/include/portaudio.h \ + portaudio-v19/index.html \ + portaudio-v19/install-sh \ + portaudio-v19/jack.patch \ + portaudio-v19/libtool22.patch \ + portaudio-v19/LICENSE.txt \ + portaudio-v19/ltmain.sh \ + portaudio-v19/Makefile.in \ + portaudio-v19/missing \ + portaudio-v19/pablio/pablio.c \ + portaudio-v19/pablio/pablio.def \ + portaudio-v19/pablio/pablio.h \ + portaudio-v19/pablio/README.txt \ + portaudio-v19/pablio/test_rw.c \ + portaudio-v19/pablio/test_rw_echo.c \ + portaudio-v19/pablio/test_w_saw8.c \ + portaudio-v19/pablio/test_w_saw.c \ + portaudio-v19/portaudio-2.0.pc.in \ + portaudio-v19/qa/loopback/README.txt \ + portaudio-v19/qa/loopback/src/audio_analyzer.c \ + portaudio-v19/qa/loopback/src/audio_analyzer.h \ + portaudio-v19/qa/loopback/src/biquad_filter.c \ + portaudio-v19/qa/loopback/src/biquad_filter.h \ + portaudio-v19/qa/loopback/src/paqa.c \ + portaudio-v19/qa/loopback/src/paqa_tools.c \ + portaudio-v19/qa/loopback/src/paqa_tools.h \ + portaudio-v19/qa/loopback/src/qa_tools.h \ + portaudio-v19/qa/loopback/src/test_audio_analyzer.c \ + portaudio-v19/qa/loopback/src/test_audio_analyzer.h \ + portaudio-v19/qa/loopback/src/write_wav.c \ + portaudio-v19/qa/loopback/src/write_wav.h \ + portaudio-v19/qa/paqa_devs.c \ + portaudio-v19/qa/paqa_errs.c \ + portaudio-v19/qa/paqa_latency.c \ + portaudio-v19/README.configure.txt \ + portaudio-v19/README.txt \ + portaudio-v19/SConstruct \ + portaudio-v19/src/common/pa_allocation.c \ + portaudio-v19/src/common/pa_allocation.h \ + portaudio-v19/src/common/pa_converters.c \ + portaudio-v19/src/common/pa_converters.h \ + portaudio-v19/src/common/pa_cpuload.c \ + portaudio-v19/src/common/pa_cpuload.h \ + portaudio-v19/src/common/pa_debugprint.c \ + portaudio-v19/src/common/pa_debugprint.h \ + portaudio-v19/src/common/pa_dither.c \ + portaudio-v19/src/common/pa_dither.h \ + portaudio-v19/src/common/pa_dynload.c \ + portaudio-v19/src/common/pa_dynload.h \ + portaudio-v19/src/common/pa_endianness.h \ + portaudio-v19/src/common/pa_front.c \ + portaudio-v19/src/common/pa_hostapi.h \ + portaudio-v19/src/common/pa_memorybarrier.h \ + portaudio-v19/src/common/pa_process.c \ + portaudio-v19/src/common/pa_process.h \ + portaudio-v19/src/common/pa_ringbuffer.c \ + portaudio-v19/src/common/pa_ringbuffer.h \ + portaudio-v19/src/common/pa_stream.c \ + portaudio-v19/src/common/pa_stream.h \ + portaudio-v19/src/common/pa_trace.c \ + portaudio-v19/src/common/pa_trace.h \ + portaudio-v19/src/common/pa_types.h \ + portaudio-v19/src/common/pa_util.h \ + portaudio-v19/src/hostapi/alsa/pa_linux_alsa.c \ + portaudio-v19/src/hostapi/asihpi/pa_linux_asihpi.c \ + portaudio-v19/src/hostapi/asio/ASIO-README.txt \ + portaudio-v19/src/hostapi/asio/Callback_adaptation_.pdf \ + portaudio-v19/src/hostapi/asio/iasiothiscallresolver.cpp \ + portaudio-v19/src/hostapi/asio/iasiothiscallresolver.h \ + portaudio-v19/src/hostapi/asio/pa_asio.cpp \ + portaudio-v19/src/hostapi/asio/Pa_ASIO.pdf \ + portaudio-v19/src/hostapi/coreaudio/notes.txt \ + portaudio-v19/src/hostapi/coreaudio/pa_mac_core_blocking.c \ + portaudio-v19/src/hostapi/coreaudio/pa_mac_core_blocking.h \ + portaudio-v19/src/hostapi/coreaudio/pa_mac_core.c \ + portaudio-v19/src/hostapi/coreaudio/pa_mac_core_internal.h \ + portaudio-v19/src/hostapi/coreaudio/pa_mac_core_old.c \ + portaudio-v19/src/hostapi/coreaudio/pa_mac_core_utilities.c \ + portaudio-v19/src/hostapi/coreaudio/pa_mac_core_utilities.h \ + portaudio-v19/src/hostapi/dsound/pa_win_ds.c \ + portaudio-v19/src/hostapi/dsound/pa_win_ds_dynlink.c \ + portaudio-v19/src/hostapi/dsound/pa_win_ds_dynlink.h \ + portaudio-v19/src/hostapi/jack/pa_jack.c \ + portaudio-v19/src/hostapi/jack/pa_jack_dynload.c \ + portaudio-v19/src/hostapi/jack/pa_jack_dynload.h \ + portaudio-v19/src/hostapi/oss/low_latency_tip.txt \ + portaudio-v19/src/hostapi/oss/pa_unix_oss.c \ + portaudio-v19/src/hostapi/oss/recplay.c \ + portaudio-v19/src/hostapi/skeleton/pa_hostapi_skeleton.c \ + portaudio-v19/src/hostapi/skeleton/README.txt \ + portaudio-v19/src/hostapi/wasapi/mingw-include/audioclient.h \ + portaudio-v19/src/hostapi/wasapi/mingw-include/AudioSessionTypes.h \ + portaudio-v19/src/hostapi/wasapi/mingw-include/devicetopology.h \ + portaudio-v19/src/hostapi/wasapi/mingw-include/endpointvolume.h \ + portaudio-v19/src/hostapi/wasapi/mingw-include/FunctionDiscoveryKeys_devpkey.h \ + portaudio-v19/src/hostapi/wasapi/mingw-include/functiondiscoverykeys.h \ + portaudio-v19/src/hostapi/wasapi/mingw-include/ksguid.h \ + portaudio-v19/src/hostapi/wasapi/mingw-include/ks.h \ + portaudio-v19/src/hostapi/wasapi/mingw-include/ksmedia.h \ + portaudio-v19/src/hostapi/wasapi/mingw-include/ksproxy.h \ + portaudio-v19/src/hostapi/wasapi/mingw-include/ksuuids.h \ + portaudio-v19/src/hostapi/wasapi/mingw-include/mmdeviceapi.h \ + portaudio-v19/src/hostapi/wasapi/mingw-include/propidl.h \ + portaudio-v19/src/hostapi/wasapi/mingw-include/propkeydef.h \ + portaudio-v19/src/hostapi/wasapi/mingw-include/propkey.h \ + portaudio-v19/src/hostapi/wasapi/mingw-include/propsys.h \ + portaudio-v19/src/hostapi/wasapi/mingw-include/rpcsal.h \ + portaudio-v19/src/hostapi/wasapi/mingw-include/sal.h \ + portaudio-v19/src/hostapi/wasapi/mingw-include/sdkddkver.h \ + portaudio-v19/src/hostapi/wasapi/mingw-include/shtypes.h \ + portaudio-v19/src/hostapi/wasapi/mingw-include/structuredquery.h \ + portaudio-v19/src/hostapi/wasapi/pa_win_wasapi.c \ + portaudio-v19/src/hostapi/wasapi/readme.txt \ + portaudio-v19/src/hostapi/wdmks/pa_win_wdmks.c \ + portaudio-v19/src/hostapi/wdmks/readme.txt \ + portaudio-v19/src/hostapi/wmme/pa_win_wmme.c \ + portaudio-v19/src/os/unix/pa_unix_hostapis.c \ + portaudio-v19/src/os/unix/pa_unix_util.c \ + portaudio-v19/src/os/unix/pa_unix_util.h \ + portaudio-v19/src/os/win/pa_win_coinitialize.c \ + portaudio-v19/src/os/win/pa_win_coinitialize.h \ + portaudio-v19/src/os/win/pa_win_hostapis.c \ + portaudio-v19/src/os/win/pa_win_util.c \ + portaudio-v19/src/os/win/pa_win_waveformat.c \ + portaudio-v19/src/os/win/pa_win_wdmks_utils.c \ + portaudio-v19/src/os/win/pa_win_wdmks_utils.h \ + portaudio-v19/src/os/win/pa_x86_plain_converters.c \ + portaudio-v19/src/os/win/pa_x86_plain_converters.h \ + portaudio-v19/src/SConscript \ + portaudio-v19/test/CMakeLists.txt \ + portaudio-v19/testcvs/changeme.txt \ + portaudio-v19/test/pa_minlat.c \ + portaudio-v19/test/patest1.c \ + portaudio-v19/test/patest_buffer.c \ + portaudio-v19/test/patest_callbackstop.c \ + portaudio-v19/test/patest_clip.c \ + portaudio-v19/test/patest_converters.c \ + portaudio-v19/test/patest_dither.c \ + portaudio-v19/test/patest_dsound_find_best_latency_params.c \ + portaudio-v19/test/patest_dsound_low_level_latency_params.c \ + portaudio-v19/test/patest_dsound_surround.c \ + portaudio-v19/test/patest_hang.c \ + portaudio-v19/test/patest_in_overflow.c \ + portaudio-v19/test/patest_jack_wasapi.c \ + portaudio-v19/test/patest_latency.c \ + portaudio-v19/test/patest_leftright.c \ + portaudio-v19/test/patest_longsine.c \ + portaudio-v19/test/patest_many.c \ + portaudio-v19/test/patest_maxsines.c \ + portaudio-v19/test/patest_mono.c \ + portaudio-v19/test/patest_multi_sine.c \ + portaudio-v19/test/patest_out_underflow.c \ + portaudio-v19/test/patest_prime.c \ + portaudio-v19/test/patest_read_record.c \ + portaudio-v19/test/patest_ringmix.c \ + portaudio-v19/test/patest_sine8.c \ + portaudio-v19/test/patest_sine_channelmaps.c \ + portaudio-v19/test/patest_sine_formats.c \ + portaudio-v19/test/patest_sine_srate.c \ + portaudio-v19/test/patest_sine_time.c \ + portaudio-v19/test/patest_start_stop.c \ + portaudio-v19/test/patest_stop.c \ + portaudio-v19/test/patest_stop_playout.c \ + portaudio-v19/test/patest_suggested_vs_streaminfo_latency.c \ + portaudio-v19/test/patest_suggested_vs_streaminfo_latency.py \ + portaudio-v19/test/patest_sync.c \ + portaudio-v19/test/patest_timing.c \ + portaudio-v19/test/patest_toomanysines.c \ + portaudio-v19/test/patest_two_rates.c \ + portaudio-v19/test/patest_underflow.c \ + portaudio-v19/test/patest_wire.c \ + portaudio-v19/test/patest_wmme_find_best_latency_params.c \ + portaudio-v19/test/patest_wmme_low_level_latency_params.c \ + portaudio-v19/test/patest_write_stop.c \ + portaudio-v19/test/README.txt \ + portaudio-v19/wasapi-fix.patch \ + portaudio-v19/wasapi-loopback.patch \ + $(NULL) diff --git a/locale/LINGUAS b/locale/LINGUAS new file mode 100644 index 000000000..0388fe4e1 --- /dev/null +++ b/locale/LINGUAS @@ -0,0 +1,52 @@ +af +ar +be +bg +bn +bs +ca +ca@valencia +cs +cy +da +de +el +es +eu +fa +fi +fr +ga +gl +he +hi +hr +hu +id +it +ja +ka +km +ko +lt +mk +my +nb +nl +oc +pl +pt +pt_BR +ro +ru +sk +sl +sr_RS +sr_RS@latin +sv +tg +tr +uk +vi +zh +zh_TW diff --git a/locale/Makevars b/locale/Makevars new file mode 100644 index 000000000..8d25a8a96 --- /dev/null +++ b/locale/Makevars @@ -0,0 +1,41 @@ +# Makefile variables for PO directory in any package using GNU gettext. + +# Usually the message domain is the same as the package name. +DOMAIN = $(PACKAGE) + +# These two variables depend on the location of this directory. +subdir = po +top_builddir = .. + +# These options get passed to xgettext. +XGETTEXT_OPTIONS = --keyword=_ --keyword=N_ + +# This is the copyright holder that gets inserted into the header of the +# $(DOMAIN).pot file. Set this to the copyright holder of the surrounding +# package. (Note that the msgstr strings, extracted from the package's +# sources, belong to the copyright holder of the package.) Translators are +# expected to transfer the copyright for their translations to this person +# or entity, or to disclaim their copyright. The empty string stands for +# the public domain; in this case the translators are expected to disclaim +# their copyright. +COPYRIGHT_HOLDER = Audacity Team + +# This is the email address or URL to which the translators shall report +# bugs in the untranslated strings: +# - Strings which are not entire sentences, see the maintainer guidelines +# in the GNU gettext documentation, section 'Preparing Strings'. +# - Strings which use unclear terms or require additional context to be +# understood. +# - Strings which make invalid assumptions about notation of date, time or +# money. +# - Pluralisation problems. +# - Incorrect English spelling. +# - Incorrect formatting. +# It can be your email address, or a mailing list address where translators +# can write to without being subscribed, or the URL of a web page through +# which the translators can contact you. +MSGID_BUGS_ADDRESS = audacity-translation@lists.sourceforge.net + +# This is the list of locale categories, beyond LC_MESSAGES, for which the +# message catalogs shall be used. It is usually empty. +EXTRA_LOCALE_CATEGORIES = diff --git a/locale/POTFILES.in b/locale/POTFILES.in new file mode 100644 index 000000000..4f0df3889 --- /dev/null +++ b/locale/POTFILES.in @@ -0,0 +1,503 @@ +# List of source files which contain translatable strings. +src/AboutDialog.cpp +src/AboutDialog.h +src/AColor.cpp +src/AColor.h +src/AudacityApp.cpp +src/AudacityApp.h +src/AudacityLogger.cpp +src/AudacityLogger.h +src/AudioIO.cpp +src/AudioIO.h +src/AutoRecovery.cpp +src/AutoRecovery.h +src/BatchCommandDialog.cpp +src/BatchCommandDialog.h +src/BatchCommands.cpp +src/BatchCommands.h +src/BatchProcessDialog.cpp +src/BatchProcessDialog.h +src/Benchmark.cpp +src/Benchmark.h +src/BlockFile.cpp +src/BlockFile.h +src/CaptureEvents.cpp +src/CaptureEvents.h +src/Dependencies.cpp +src/Dependencies.h +src/DeviceManager.cpp +src/DeviceManager.h +src/DirManager.cpp +src/DirManager.h +src/Dither.cpp +src/Dither.h +src/Envelope.cpp +src/Envelope.h +src/Experimental.h +src/FFmpeg.cpp +src/FFmpeg.h +src/FFT.cpp +src/FFT.h +src/FileFormats.cpp +src/FileFormats.h +src/FileIO.cpp +src/FileIO.h +src/FileNames.cpp +src/FileNames.h +src/FreqWindow.cpp +src/FreqWindow.h +src/HelpText.cpp +src/HelpText.h +src/HistoryWindow.cpp +src/HistoryWindow.h +src/ImageManipulation.cpp +src/ImageManipulation.h +src/Internat.cpp +src/Internat.h +src/InterpolateAudio.cpp +src/InterpolateAudio.h +src/LabelDialog.cpp +src/LabelDialog.h +src/LabelTrack.cpp +src/LabelTrack.h +src/LangChoice.cpp +src/LangChoice.h +src/Languages.cpp +src/Languages.h +src/Legacy.cpp +src/Legacy.h +src/LoadModules.cpp +src/LoadModules.h +src/Lyrics.cpp +src/Lyrics.h +src/LyricsWindow.cpp +src/LyricsWindow.h +src/Matrix.cpp +src/Matrix.h +src/Menus.cpp +src/Menus.h +src/Mix.cpp +src/Mix.h +src/MixerBoard.cpp +src/MixerBoard.h +src/NoteTrack.cpp +src/NoteTrack.h +src/PitchName.cpp +src/PitchName.h +src/PlatformCompatibility.cpp +src/PlatformCompatibility.h +src/PluginManager.cpp +src/PluginManager.h +src/Prefs.cpp +src/Prefs.h +src/Printing.cpp +src/Printing.h +src/Profiler.cpp +src/Profiler.h +src/Project.cpp +src/Project.h +src/RealFFTf.cpp +src/RealFFTf.h +src/Resample.cpp +src/Resample.h +src/RingBuffer.cpp +src/RingBuffer.h +src/SampleFormat.cpp +src/SampleFormat.h +src/Screenshot.cpp +src/Screenshot.h +src/Sequence.cpp +src/Sequence.h +src/Shuttle.cpp +src/Shuttle.h +src/ShuttleGui.cpp +src/ShuttleGui.h +src/ShuttlePrefs.cpp +src/ShuttlePrefs.h +src/Snap.cpp +src/Snap.h +src/SoundActivatedRecord.cpp +src/SoundActivatedRecord.h +src/Spectrum.cpp +src/Spectrum.h +src/SplashDialog.cpp +src/SplashDialog.h +src/Tags.cpp +src/Tags.h +src/Theme.cpp +src/Theme.h +src/TimeDialog.cpp +src/TimeDialog.h +src/TimerRecordDialog.cpp +src/TimerRecordDialog.h +src/TimeTrack.cpp +src/TimeTrack.h +src/Track.cpp +src/Track.h +src/TrackArtist.cpp +src/TrackArtist.h +src/TrackPanel.cpp +src/TrackPanel.h +src/TrackPanelAx.cpp +src/TrackPanelAx.h +src/UndoManager.cpp +src/UndoManager.h +src/UploadDialog.cpp +src/UploadDialog.h +src/ViewInfo.h +src/VoiceKey.cpp +src/VoiceKey.h +src/WaveClip.cpp +src/WaveClip.h +src/WaveTrack.cpp +src/WaveTrack.h +src/WrappedType.cpp +src/WrappedType.h +src/blockfile/LegacyAliasBlockFile.cpp +src/blockfile/LegacyAliasBlockFile.h +src/blockfile/LegacyBlockFile.cpp +src/blockfile/LegacyBlockFile.h +src/blockfile/ODDecodeBlockFile.cpp +src/blockfile/ODDecodeBlockFile.h +src/blockfile/ODPCMAliasBlockFile.cpp +src/blockfile/ODPCMAliasBlockFile.h +src/blockfile/PCMAliasBlockFile.cpp +src/blockfile/PCMAliasBlockFile.h +src/blockfile/SilentBlockFile.cpp +src/blockfile/SilentBlockFile.h +src/blockfile/SimpleBlockFile.cpp +src/blockfile/SimpleBlockFile.h +src/commands/AppCommandEvent.cpp +src/commands/AppCommandEvent.h +src/commands/BatchEvalCommand.cpp +src/commands/BatchEvalCommand.h +src/commands/Command.cpp +src/commands/Command.h +src/commands/CommandBuilder.cpp +src/commands/CommandBuilder.h +src/commands/CommandDirectory.cpp +src/commands/CommandDirectory.h +src/commands/CommandHandler.cpp +src/commands/CommandHandler.h +src/commands/CommandManager.cpp +src/commands/CommandManager.h +src/commands/CommandMisc.h +src/commands/CommandSignature.cpp +src/commands/CommandSignature.h +src/commands/CommandTargets.h +src/commands/CommandType.cpp +src/commands/CommandType.h +src/commands/CompareAudioCommand.cpp +src/commands/CompareAudioCommand.h +src/commands/ExecMenuCommand.cpp +src/commands/ExecMenuCommand.h +src/commands/GetAllMenuCommands.cpp +src/commands/GetAllMenuCommands.h +src/commands/GetProjectInfoCommand.cpp +src/commands/GetProjectInfoCommand.h +src/commands/GetTrackInfoCommand.cpp +src/commands/GetTrackInfoCommand.h +src/commands/HelpCommand.cpp +src/commands/HelpCommand.h +src/commands/ImportExportCommands.cpp +src/commands/ImportExportCommands.h +src/commands/Keyboard.cpp +src/commands/Keyboard.h +src/commands/MessageCommand.cpp +src/commands/MessageCommand.h +src/commands/PreferenceCommands.cpp +src/commands/PreferenceCommands.h +src/commands/ResponseQueue.cpp +src/commands/ResponseQueue.h +src/commands/ScreenshotCommand.cpp +src/commands/ScreenshotCommand.h +src/commands/ScriptCommandRelay.cpp +src/commands/ScriptCommandRelay.h +src/commands/SelectCommand.cpp +src/commands/SelectCommand.h +src/commands/SetProjectInfoCommand.cpp +src/commands/SetProjectInfoCommand.h +src/commands/SetTrackInfoCommand.cpp +src/commands/SetTrackInfoCommand.h +src/commands/Validators.h +src/effects/Amplify.cpp +src/effects/Amplify.h +src/effects/AutoDuck.cpp +src/effects/AutoDuck.h +src/effects/BassTreble.cpp +src/effects/BassTreble.h +src/effects/Biquad.cpp +src/effects/Biquad.h +src/effects/ChangePitch.cpp +src/effects/ChangePitch.h +src/effects/ChangeSpeed.cpp +src/effects/ChangeSpeed.h +src/effects/ChangeTempo.cpp +src/effects/ChangeTempo.h +src/effects/ClickRemoval.cpp +src/effects/ClickRemoval.h +src/effects/Compressor.cpp +src/effects/Compressor.h +src/effects/Contrast.cpp +src/effects/Contrast.h +src/effects/DtmfGen.cpp +src/effects/DtmfGen.h +src/effects/Echo.cpp +src/effects/Echo.h +src/effects/Effect.cpp +src/effects/Effect.h +src/effects/EffectCategory.cpp +src/effects/EffectCategory.h +src/effects/EffectManager.cpp +src/effects/EffectManager.h +src/effects/Equalization.cpp +src/effects/Equalization.h +src/effects/Fade.cpp +src/effects/Fade.h +src/effects/FindClipping.cpp +src/effects/FindClipping.h +src/effects/Generator.cpp +src/effects/Generator.h +src/effects/Invert.cpp +src/effects/Invert.h +src/effects/Leveller.cpp +src/effects/Leveller.h +src/effects/LoadEffects.cpp +src/effects/LoadEffects.h +src/effects/Noise.cpp +src/effects/Noise.h +src/effects/NoiseRemoval.cpp +src/effects/NoiseRemoval.h +src/effects/Normalize.cpp +src/effects/Normalize.h +src/effects/Paulstretch.cpp +src/effects/Paulstretch.h +src/effects/Phaser.cpp +src/effects/Phaser.h +src/effects/Repair.cpp +src/effects/Repair.h +src/effects/Repeat.cpp +src/effects/Repeat.h +src/effects/Reverb.cpp +src/effects/Reverb.h +src/effects/Reverb_libSoX.h +src/effects/Reverse.cpp +src/effects/Reverse.h +src/effects/SBSMSEffect.cpp +src/effects/SBSMSEffect.h +src/effects/ScienFilter.cpp +src/effects/ScienFilter.h +src/effects/Silence.cpp +src/effects/Silence.h +src/effects/SimpleMono.cpp +src/effects/SimpleMono.h +src/effects/SoundTouchEffect.cpp +src/effects/SoundTouchEffect.h +src/effects/StereoToMono.cpp +src/effects/StereoToMono.h +src/effects/TimeScale.cpp +src/effects/TimeScale.h +src/effects/TimeWarper.cpp +src/effects/TimeWarper.h +src/effects/ToneGen.cpp +src/effects/ToneGen.h +src/effects/TruncSilence.cpp +src/effects/TruncSilence.h +src/effects/TwoPassSimpleMono.cpp +src/effects/TwoPassSimpleMono.h +src/effects/Wahwah.cpp +src/effects/Wahwah.h +src/effects/audiounits/LoadAudioUnits.cpp +src/effects/audiounits/LoadAudioUnits.h +src/effects/audiounits/AudioUnitEffect.cpp +src/effects/audiounits/AudioUnitEffect.h +src/effects/ladspa/LadspaEffect.cpp +src/effects/ladspa/LadspaEffect.h +src/effects/ladspa/LoadLadspa.cpp +src/effects/ladspa/LoadLadspa.h +src/effects/lv2/LoadLV2.cpp +src/effects/lv2/LoadLV2.h +src/effects/lv2/LV2Effect.cpp +src/effects/lv2/LV2Effect.h +src/effects/lv2/LV2PortGroup.cpp +src/effects/lv2/LV2PortGroup.h +src/effects/nyquist/LoadNyquist.cpp +src/effects/nyquist/LoadNyquist.h +src/effects/nyquist/Nyquist.cpp +src/effects/nyquist/Nyquist.h +src/effects/vamp/LoadVamp.cpp +src/effects/vamp/LoadVamp.h +src/effects/vamp/VampEffect.cpp +src/effects/vamp/VampEffect.h +src/effects/VST/aeffectx.h +src/effects/VST/VSTEffect.cpp +src/effects/VST/VSTEffect.h +src/export/Export.cpp +src/export/Export.h +src/export/ExportCL.cpp +src/export/ExportCL.h +src/export/ExportFFmpeg.cpp +src/export/ExportFFmpeg.h +src/export/ExportFFmpegDialogs.cpp +src/export/ExportFFmpegDialogs.h +src/export/ExportFLAC.cpp +src/export/ExportFLAC.h +src/export/ExportMP2.cpp +src/export/ExportMP2.h +src/export/ExportMP3.cpp +src/export/ExportMP3.h +src/export/ExportMultiple.cpp +src/export/ExportMultiple.h +src/export/ExportOGG.cpp +src/export/ExportOGG.h +src/export/ExportPCM.cpp +src/export/ExportPCM.h +src/import/Import.cpp +src/import/Import.h +src/import/ImportFFmpeg.cpp +src/import/ImportFFmpeg.h +src/import/ImportFLAC.cpp +src/import/ImportFLAC.h +src/import/ImportLOF.cpp +src/import/ImportLOF.h +src/import/ImportMIDI.cpp +src/import/ImportMIDI.h +src/import/ImportMP3.cpp +src/import/ImportMP3.h +src/import/ImportOGG.cpp +src/import/ImportOGG.h +src/import/ImportPCM.cpp +src/import/ImportPCM.h +src/import/ImportPlugin.h +src/import/ImportQT.cpp +src/import/ImportQT.h +src/import/ImportRaw.cpp +src/import/ImportRaw.h +src/import/RawAudioGuess.cpp +src/import/RawAudioGuess.h +src/ondemand/ODComputeSummaryTask.cpp +src/ondemand/ODComputeSummaryTask.h +src/ondemand/ODDecodeFFmpegTask.cpp +src/ondemand/ODDecodeFFmpegTask.h +src/ondemand/ODDecodeFlacTask.cpp +src/ondemand/ODDecodeFlacTask.h +src/ondemand/ODDecodeTask.cpp +src/ondemand/ODDecodeTask.h +src/ondemand/ODManager.cpp +src/ondemand/ODManager.h +src/ondemand/ODTask.cpp +src/ondemand/ODTask.h +src/ondemand/ODTaskThread.cpp +src/ondemand/ODTaskThread.h +src/ondemand/ODWaveTrackTaskQueue.cpp +src/ondemand/ODWaveTrackTaskQueue.h +src/prefs/BatchPrefs.cpp +src/prefs/BatchPrefs.h +src/prefs/DevicePrefs.cpp +src/prefs/DevicePrefs.h +src/prefs/DirectoriesPrefs.cpp +src/prefs/DirectoriesPrefs.h +src/prefs/EffectsPrefs.cpp +src/prefs/EffectsPrefs.h +src/prefs/ExtImportPrefs.cpp +src/prefs/ExtImportPrefs.h +src/prefs/GUIPrefs.cpp +src/prefs/GUIPrefs.h +src/prefs/ImportExportPrefs.cpp +src/prefs/ImportExportPrefs.h +src/prefs/KeyConfigPrefs.cpp +src/prefs/KeyConfigPrefs.h +src/prefs/LibraryPrefs.cpp +src/prefs/LibraryPrefs.h +src/prefs/MidiIOPrefs.cpp +src/prefs/MidiIOPrefs.h +src/prefs/ModulePrefs.cpp +src/prefs/ModulePrefs.h +src/prefs/MousePrefs.cpp +src/prefs/MousePrefs.h +src/prefs/PlaybackPrefs.cpp +src/prefs/PlaybackPrefs.h +src/prefs/PrefsDialog.cpp +src/prefs/PrefsDialog.h +src/prefs/ProjectsPrefs.cpp +src/prefs/ProjectsPrefs.h +src/prefs/QualityPrefs.cpp +src/prefs/QualityPrefs.h +src/prefs/RecordingPrefs.cpp +src/prefs/RecordingPrefs.h +src/prefs/SpectrumPrefs.cpp +src/prefs/SpectrumPrefs.h +src/prefs/ThemePrefs.cpp +src/prefs/ThemePrefs.h +src/prefs/TracksPrefs.cpp +src/prefs/TracksPrefs.h +src/prefs/WarningsPrefs.cpp +src/prefs/WarningsPrefs.h +src/toolbars/ControlToolBar.cpp +src/toolbars/ControlToolBar.h +src/toolbars/DeviceToolBar.cpp +src/toolbars/DeviceToolBar.h +src/toolbars/EditToolBar.cpp +src/toolbars/EditToolBar.h +src/toolbars/MeterToolBar.cpp +src/toolbars/MeterToolBar.h +src/toolbars/MixerToolBar.cpp +src/toolbars/MixerToolBar.h +src/toolbars/SelectionBar.cpp +src/toolbars/SelectionBar.h +src/toolbars/ToolBar.cpp +src/toolbars/ToolBar.h +src/toolbars/ToolDock.cpp +src/toolbars/ToolDock.h +src/toolbars/ToolManager.cpp +src/toolbars/ToolManager.h +src/toolbars/ToolsToolBar.cpp +src/toolbars/ToolsToolBar.h +src/toolbars/TranscriptionToolBar.cpp +src/toolbars/TranscriptionToolBar.h +src/widgets/AButton.cpp +src/widgets/AButton.h +src/widgets/ASlider.cpp +src/widgets/ASlider.h +src/widgets/AttachableScrollBar.cpp +src/widgets/AttachableScrollBar.h +src/widgets/ErrorDialog.cpp +src/widgets/ErrorDialog.h +src/widgets/ExpandingToolBar.cpp +src/widgets/ExpandingToolBar.h +src/widgets/FileHistory.cpp +src/widgets/FileHistory.h +src/widgets/Grabber.cpp +src/widgets/Grabber.h +src/widgets/Grid.cpp +src/widgets/Grid.h +src/widgets/HtmlWindow.cpp +src/widgets/HtmlWindow.h +src/widgets/ImageRoll.cpp +src/widgets/ImageRoll.h +src/widgets/KeyView.cpp +src/widgets/KeyView.h +src/widgets/LinkingHtmlWindow.cpp +src/widgets/LinkingHtmlWindow.h +src/widgets/Meter.cpp +src/widgets/Meter.h +src/widgets/MultiDialog.cpp +src/widgets/MultiDialog.h +src/widgets/numformatter.cpp +src/widgets/numformatter.h +src/widgets/ProgressDialog.cpp +src/widgets/ProgressDialog.h +src/widgets/Ruler.cpp +src/widgets/Ruler.h +src/widgets/TimeTextCtrl.cpp +src/widgets/TimeTextCtrl.h +src/widgets/valnum.cpp +src/widgets/valnum.h +src/widgets/Warning.cpp +src/widgets/Warning.h +src/xml/XMLFileReader.cpp +src/xml/XMLFileReader.h +src/xml/XMLTagHandler.cpp +src/xml/XMLTagHandler.h +src/xml/XMLWriter.cpp +src/xml/XMLWriter.h diff --git a/m4/audacity_checklib_ffmpeg.m4 b/m4/audacity_checklib_ffmpeg.m4 index 3e221694b..b98110f99 100644 --- a/m4/audacity_checklib_ffmpeg.m4 +++ b/m4/audacity_checklib_ffmpeg.m4 @@ -2,7 +2,7 @@ dnl Todo: Add Audacity / FFmpeg license dnl dnl Please increment the serial number below whenever you alter this macro dnl for the benefit of automatic macro update systems -# audacity_checklib_ffmpeg.m4 serial 1 +# audacity_checklib_ffmpeg.m4 serial 2 dnl Check for a copy of ffmpeg, whoose headers we will use for the importer AC_DEFUN([AUDACITY_CHECKLIB_FFMPEG], [ AC_ARG_WITH(ffmpeg, @@ -11,11 +11,6 @@ AC_DEFUN([AUDACITY_CHECKLIB_FFMPEG], [ FFMPEG_ARGUMENT=$withval, FFMPEG_ARGUMENT="unspecified") - if false ; then - AC_DEFINE(USE_FFMPEG, 1, - [Define if ffmpeg (multi-format import and export) support should be enabled]) - fi - dnl Check for a system copy of ffmpeg to use. For now I'm insiting on a dnl current version to make maintenance easier. We need both avcodec and dnl avformat, so I'm going to check for both @@ -30,28 +25,16 @@ AC_DEFUN([AUDACITY_CHECKLIB_FFMPEG], [ libavutil_available_system="yes", libavutil_available_system="no") - FFMPEG_SYSTEM_AVAILABLE="no" if test "$avcodec_available_system" = "yes" -a "$avformat_available_system" = "yes" -a "$libavutil_available_system" = "yes"; then FFMPEG_SYSTEM_AVAILABLE="yes" - FFMPEG_SYSTEM_CXXFLAGS="$AVCODEC_CFLAGS $AVFORMAT_CFLAGS $AVUTIL_CFLAGS" - FFMPEG_SYSTEM_CPPSYMBOLS="USE_FFMPEG" - if test "x$dynamic_loading" = "xno"; then - FFMPEG_SYSTEM_LIBS="$AVCODEC_LIBS $AVFORMAT_LIBS $AVUTIL_LIBS" - AC_DEFINE(DISABLE_DYNAMIC_LOADING_FFMPEG, 1, [Use system FFmpeg library and disable dynamic loading of it.]) - fi - dnl build the extra object files needed to use FFmpeg. Paths inside - dnl the audacity src/ dir, as this is subsitiuted into src/Makefile.in - FFMPEG_SYSTEM_OPTOBJS="import/ImportFFmpeg.o export/ExportFFmpeg.o \ - export/ExportFFmpegDialogs.o" AC_MSG_NOTICE([FFmpeg library available as system library]) - fi - if test "x$FFMPEG_SYSTEM_AVAILABLE" = "xno" ; then + else + FFMPEG_SYSTEM_AVAILABLE="no" AC_MSG_NOTICE([FFmpeg library NOT available as system library]) fi dnl see if ffmpeg is available locally, or rather that we have some headers dnl in lib-src/ffmpeg/ we can use. - FFMPEG_LOCAL_AVAILABLE="no" AC_CHECK_FILE(${srcdir}/lib-src/ffmpeg/libavcodec/avcodec.h, avcodec_h_found="yes", avcodec_h_found="no") @@ -60,22 +43,41 @@ AC_DEFUN([AUDACITY_CHECKLIB_FFMPEG], [ avformat_h_found="yes", avformat_h_found="no") - if test "x$avcodec_h_found" = "xyes" ; then - if test "x$avformat_h_found" = "xyes" ; then - FFMPEG_LOCAL_AVAILABLE="yes" - FFMPEG_LOCAL_LIBS="" - FFMPEG_LOCAL_CXXFLAGS='-I$(top_srcdir)/lib-src/ffmpeg' - FFMPEG_LOCAL_CPPSYMBOLS="USE_FFMPEG" - dnl build the extra object files needed to use FFmpeg. Paths inside - dnl the audacity src/ dir, as this is subsitiuted into src/Makefile.in - FFMPEG_LOCAL_OPTOBJS="import/ImportFFmpeg.o export/ExportFFmpeg.o \ - export/ExportFFmpegDialogs.o" - AC_MSG_NOTICE([FFmpeg headers are available in the local tree]) - fi - fi - if test "x$FFMPEG_LOCAL_AVAILABLE" = "xno" ; then + if test "$avcodec_h_found" = "yes" -a "$avformat_h_found" = "yes"; then + FFMPEG_LOCAL_AVAILABLE="yes" + AC_MSG_NOTICE([FFmpeg headers are available in the local tree]) + else + FFMPEG_LOCAL_AVAILABLE="no" AC_MSG_NOTICE([ffmpeg library is NOT available in the local tree]) fi FFMPEG_MIMETYPES="audio/aac;audio/ac3;audio/mp4;audio/x-ms-wma;video/mpeg;" ]) + +AC_DEFUN([AUDACITY_CONFIG_FFMPEG], [ + if test "$FFMPEG_USE_LOCAL" = yes; then + FFMPEG_CFLAGS='-I$(top_srcdir)/lib-src/ffmpeg' + FFMPEG_LIBS="" + fi + if test "$FFMPEG_USE_SYSTEM" = yes; then + FFMPEG_CFLAGS="$AVCODEC_CFLAGS $AVFORMAT_CFLAGS $AVUTIL_CFLAGS" + if test "$dynamic_loading" = "no"; then + FFMPEG_LIBS="$AVCODEC_LIBS $AVFORMAT_LIBS $AVUTIL_LIBS" + AC_DEFINE(DISABLE_DYNAMIC_LOADING_FFMPEG, 1, + [Use system FFmpeg library and disable dynamic loading of it.]) + else + FFMPEG_LIBS="" + fi + fi + + AC_SUBST([FFMPEG_CFLAGS]) + AC_SUBST([FFMPEG_LIBS]) + + AM_CONDITIONAL([USE_FFMPEG], [test "$FFMPEG_USE_LOCAL" = yes -o "$FFMPEG_USE_SYSTEM" = yes]) + AM_CONDITIONAL([USE_LOCAL_FFMPEG], [test "$FFMPEG_USE_LOCAL" = yes]) + + if test "$FFMPEG_USE_LOCAL" = yes -o "$FFMPEG_USE_SYSTEM" = yes; then + AC_DEFINE(USE_FFMPEG, 1, + [Define if ffmpeg (multi-format import and export) support should be enabled]) + fi +]) diff --git a/m4/audacity_checklib_lame.m4 b/m4/audacity_checklib_lame.m4 index 2cec7ddfa..28ecd7731 100644 --- a/m4/audacity_checklib_lame.m4 +++ b/m4/audacity_checklib_lame.m4 @@ -2,7 +2,7 @@ dnl Todo: Add Audacity / LAME license dnl dnl Please increment the serial number below whenever you alter this macro dnl for the benefit of automatic macro update systems -# audacity_checklib_lame.m4 serial 1 +# audacity_checklib_lame.m4 serial 2 dnl Check for a copy of lame, whoose headers we will use for the importer AC_DEFUN([AUDACITY_CHECKLIB_LAME], [ @@ -12,13 +12,6 @@ AC_DEFUN([AUDACITY_CHECKLIB_LAME], [ LAME_ARGUMENT=$withval, LAME_ARGUMENT="unspecified") - dnl These four lines are never executed, but they document the DISABLE_DYNAMIC_LOADING_LAME - dnl pre-processor directive (for configunix.h etc) - if false ; then - AC_DEFINE(DISABLE_DYNAMIC_LOADING_LAME, 1, - [Define if LAME should be linked at compile time]) - fi - dnl See if LAME is installed in the system AC_CHECK_LIB(mp3lame, @@ -30,13 +23,9 @@ AC_DEFUN([AUDACITY_CHECKLIB_LAME], [ header_found="yes", header_found="no") - if test "x$lib_found" = "xyes" && test "x$header_found" = "xyes" ; then + if test "$lib_found" = "yes" -a "$header_found" = "yes"; then LAME_SYSTEM_AVAILABLE="yes" AC_MSG_NOTICE([LAME library is available as system library.]) - if test "x$dynamic_loading" = "xno"; then - LAME_SYSTEM_LIBS="-lmp3lame" - LAME_SYSTEM_CPPSYMBOLS="DISABLE_DYNAMIC_LOADING_LAME" - fi else LAME_SYSTEM_AVAILABLE="no" AC_MSG_NOTICE([LAME library is NOT available as system library.]) @@ -49,9 +38,31 @@ AC_DEFUN([AUDACITY_CHECKLIB_LAME], [ LAME_LOCAL_AVAILABLE="no") if test "$LAME_LOCAL_AVAILABLE" = "yes"; then - LAME_LOCAL_CXXFLAGS='-I$(top_srcdir)/lib-src/lame' AC_MSG_NOTICE([LAME headers are available in this source tree.]) else AC_MSG_NOTICE([LAME headers are NOT available in this source tree.]) fi ]) + +AC_DEFUN([AUDACITY_CONFIG_LAME], [ + if test "$LAME_USE_LOCAL" = yes; then + LAME_CFLAGS='-I$(top_srcdir)/lib-src/lame' + LAME_LIBS="" + fi + if test "$LAME_USE_SYSTEM" = yes; then + LAME_CFLAGS="" + if test "$dynamic_loading" = "no"; then + LAME_LIBS="-lmp3lame" + AC_DEFINE(DISABLE_DYNAMIC_LOADING_LAME, 1, + [Define if LAME should be linked at compile time]) + else + LAME_LIBS="" + fi + fi + + AC_SUBST([LAME_CFLAGS]) + AC_SUBST([LAME_LIBS]) + + AM_CONDITIONAL([USE_LAME], [test "$LAME_USE_LOCAL" = yes -o "$LAME_USE_SYSTEM" = yes]) + AM_CONDITIONAL([USE_LOCAL_LAME], [test "$LAME_USE_LOCAL" = yes]) +]) diff --git a/m4/audacity_checklib_libexpat.m4 b/m4/audacity_checklib_libexpat.m4 index e2a196ceb..805674ace 100644 --- a/m4/audacity_checklib_libexpat.m4 +++ b/m4/audacity_checklib_libexpat.m4 @@ -12,49 +12,40 @@ AC_DEFUN([AUDACITY_CHECKLIB_EXPAT], [ EXPAT_ARGUMENT=$withval, EXPAT_ARGUMENT="unspecified") - dnl see if libexpat is installed on the system + dnl see if expat is installed on the system - AC_CHECK_LIB(expat, XML_ParserCreate, - libexpat_found="yes", - libexpat_found="no") + PKG_CHECK_MODULES(EXPAT, expat, + EXPAT_SYSTEM_AVAILABLE="yes", + EXPAT_SYSTEM_AVAILABLE="no") - expat_h_found="no" - - AC_CHECK_HEADER(expat.h, - expat_h_found="yes", - expat_h_found="no") - - if test "x$libexpat_found" = "xyes" && test "x$expat_h_found" = "xyes" ; then - EXPAT_SYSTEM_AVAILABLE="yes" - EXPAT_SYSTEM_LIBS="-lexpat" - EXPAT_SYSTEM_CPPSYMBOLS="USE_SYSTEM_EXPAT" + if test "$EXPAT_SYSTEM_AVAILABLE" = "yes"; then AC_MSG_NOTICE([Expat libraries are available as system libraries]) else - EXPAT_SYSTEM_AVAILABLE="no" AC_MSG_NOTICE([Expat libraries are NOT available as system libraries]) fi dnl see if expat is available in the local tree AC_CHECK_FILE(${srcdir}/lib-src/expat/lib/expat.h, - xmlparse_h_found="yes", - xmlparse_h_found="no") - - if test "x$xmlparse_h_found" = "xyes" ; then - EXPAT_LOCAL_AVAILABLE="yes" - EXPAT_LOCAL_LIBS="libexpat.a" - EXPAT_LOCAL_CXXFLAGS='-I$(top_srcdir)/lib-src/expat' - EXPAT_LOCAL_CPPSYMBOLS="USE_LOCAL_EXPAT" + EXPAT_LOCAL_AVAILABLE="yes", + EXPAT_LOCAL_AVAILABLE="no") + if test "$EXPAT_LOCAL_AVAILABLE" = "yes"; then AC_MSG_NOTICE([Expat libraries are available in the local tree]) else - EXPAT_LOCAL_AVAILABLE="no" AC_MSG_NOTICE([Expat libraries are NOT available in the local tree]) fi ]) -AC_DEFUN([AUDACITY_CONFIG_SUBDIRS_EXPAT], [ +AC_DEFUN([AUDACITY_CONFIG_EXPAT], [ if test "$EXPAT_USE_LOCAL" = yes; then + EXPAT_CFLAGS='-I$(top_srcdir)/lib-src/expat' + EXPAT_LIBS='$(top_builddir)/lib-src/expat/libexpat.la' AC_CONFIG_SUBDIRS([lib-src/expat]) fi + + AC_SUBST([EXPAT_CFLAGS]) + AC_SUBST([EXPAT_LIBS]) + + AM_CONDITIONAL([USE_LOCAL_EXPAT], [test "$EXPAT_USE_LOCAL" = yes]) ]) diff --git a/m4/audacity_checklib_libflac.m4 b/m4/audacity_checklib_libflac.m4 index 31bf8f763..10029862f 100644 --- a/m4/audacity_checklib_libflac.m4 +++ b/m4/audacity_checklib_libflac.m4 @@ -2,15 +2,9 @@ dnl add audacity / flac license? dnl dnl Please increment the serial number below whenever you alter this macro dnl for the benefit of automatic macro update systems -# audacity_checklib_libflac.m4 serial 2 +# audacity_checklib_libflac.m4 serial 3 AC_DEFUN([AUDACITY_CHECKLIB_LIBFLAC], [ - - if false ; then - AC_DEFINE(USE_LIBFLAC, 1, - [Define if the FLAC library is present]) - fi - AC_ARG_WITH(libflac, [AS_HELP_STRING([--with-libflac], [use libFLAC for FLAC support])], @@ -19,25 +13,26 @@ AC_DEFUN([AUDACITY_CHECKLIB_LIBFLAC], [ dnl See if FLAC is installed in the system - AC_CHECK_LIB(FLAC, - FLAC__stream_decoder_new, - lib_found="yes", - lib_found="no", - -lFLAC++ -lFLAC) + PKG_CHECK_MODULES([FLAC], [flac >= 1.3.0 flac++ >= 1.3.0], + [LIBFLAC_SYSTEM_AVAILABLE="yes"], + [LIBFLAC_SYSTEM_AVAILABLE="no"]) - AC_CHECK_HEADER(FLAC/format.h, - header_found="yes", - header_found="no") + dnl Check for flac < 1.3.0 + if test "$LIBFLAC_SYSTEM_AVAILABLE" = "no"; then + PKG_CHECK_MODULES([FLAC], [flac flac++], + [LIBFLAC_SYSTEM_AVAILABLE="yes"], + [LIBFLAC_SYSTEM_AVAILABLE="no"]) + dnl flac < 1.3.0 adds its own FLAC and FLAC++ subdirectories to the search + dnl path and ships a assert.h file there. This assert.h overwrites the + dnl assert.h header from the C standard library. We need to strip /FLAC + dnl and /FLAC++ from the include paths to make the assert.h from the C + dnl standard library available again. + [FLAC_CFLAGS=$(echo "$FLAC_CFLAGS" | sed 's@-I\([^ ]*\)/FLAC\(++\)\? @-I\1 @g')] + fi - if test "x$lib_found" = "xyes" && test "x$header_found" = "xyes" ; then - LIBFLAC_SYSTEM_AVAILABLE="yes" - LIBFLAC_SYSTEM_LIBS="-lFLAC++ -lFLAC" - LIBFLAC_SYSTEM_CPPSYMBOLS="USE_LIBFLAC" - # this file shouldn't be built at if no libflac is available - LIBFLAC_SYSTEM_OPTOBJS="ondemand/ODDecodeFlacTask.o" + if test "$LIBFLAC_SYSTEM_AVAILABLE" = "yes"; then AC_MSG_NOTICE([FLAC libraries are available as system libraries]) else - LIBFLAC_SYSTEM_AVAILABLE="no" AC_MSG_NOTICE([FLAC/FLAC++ libraries are NOT available as system libraries]) fi @@ -51,29 +46,33 @@ AC_DEFUN([AUDACITY_CHECKLIB_LIBFLAC], [ flacpp_h_available="yes", flacpp_h_available="no") - if test "x$flac_h_available" = "xyes" && test "x$flacpp_h_available" = "xyes" ; then + if test "$flac_h_available" = "yes" -a "$flacpp_h_available" = "yes"; then LIBFLAC_LOCAL_AVAILABLE="yes" - - LIBFLAC_LOCAL_LIBS="libFLAC++.a libFLAC.a" - - LIBFLAC_LOCAL_CXXFLAGS='-I$(top_srcdir)/lib-src/libflac/include' - LIBFLAC_LOCAL_CXXFLAGS="$LIBFLAC_LOCAL_CXXFLAGS -I\$(top_srcdir)/lib-src/libflac/include" - - LIBFLAC_LOCAL_CPPSYMBOLS="USE_LIBFLAC" - # this file shouldn't be built at if no libflac is available - LIBFLAC_LOCAL_OPTOBJS="ondemand/ODDecodeFlacTask.o" LIBFLAC_LOCAL_CONFIGURE_ARGS="--disable-xmms-plugin --disable-doxygen-docs --disable-thorough-tests" - AC_MSG_NOTICE([FLAC libraries are available in this source tree]) else + LIBFLAC_LOCAL_AVAILABLE="no" AC_MSG_NOTICE([FLAC libraries are NOT available in this source tree]) fi LIBFLAC_MIMETYPES="audio/flac;audio/x-flac;" ]) -AC_DEFUN([AUDACITY_CONFIG_SUBDIRS_LIBFLAC], [ +AC_DEFUN([AUDACITY_CONFIG_LIBFLAC], [ if test "$LIBFLAC_USE_LOCAL" = yes; then + FLAC_CFLAGS='-I$(top_srcdir)/lib-src/libflac/include' + FLAC_LIBS='$(top_builddir)/lib-src/libflac/src/libFLAC++/libFLAC++.la $(top_builddir)/lib-src/libflac/src/libFLAC/libFLAC.la' AC_CONFIG_SUBDIRS([lib-src/libflac]) fi + + AC_SUBST([FLAC_CFLAGS]) + AC_SUBST([FLAC_LIBS]) + + AM_CONDITIONAL([USE_LIBFLAC], [test "$LIBFLAC_USE_LOCAL" = yes -o "$LIBFLAC_USE_SYSTEM" = yes]) + AM_CONDITIONAL([USE_LOCAL_LIBFLAC], [test "$LIBFLAC_USE_LOCAL" = yes]) + + if test "$LIBFLAC_USE_LOCAL" = yes -o "$LIBFLAC_USE_SYSTEM" = yes; then + AC_DEFINE(USE_LIBFLAC, 1, + [Define if the FLAC library is present]) + fi ]) diff --git a/m4/audacity_checklib_libid3tag.m4 b/m4/audacity_checklib_libid3tag.m4 index af4a0d831..b69c2cbf3 100644 --- a/m4/audacity_checklib_libid3tag.m4 +++ b/m4/audacity_checklib_libid3tag.m4 @@ -1,7 +1,7 @@ dnl Add audacity / libmad licence? dnl Please increment the serial number below whenever you alter this macro dnl for the benefit of automatic macro update systems -# audacity_checklib_libid3tag.m4 serial 1 +# audacity_checklib_libid3tag.m4 serial 2 AC_DEFUN([AUDACITY_CHECKLIB_LIBID3TAG], [ @@ -11,54 +11,46 @@ AC_DEFUN([AUDACITY_CHECKLIB_LIBID3TAG], [ LIBID3TAG_ARGUMENT=$withval, LIBID3TAG_ARGUMENT="unspecified") - if false ; then - AC_DEFINE(USE_LIBID3TAG, 1, - [Define if libid3tag is present]) - fi - dnl see if libid3tag is installed on the system - AC_CHECK_LIB(id3tag, id3_file_open, - libid3tag_found="yes", - libid3tag_found="no", - -lz) + PKG_CHECK_MODULES(ID3TAG, id3tag, + LIBID3TAG_SYSTEM_AVAILABLE="yes", + LIBID3TAG_SYSTEM_AVAILABLE="no") - AC_CHECK_HEADER(id3tag.h, - id3tag_h_found="yes", - id3tag_h_found="no") - - if test "x$libid3tag_found" = "xyes" && test "x$id3tag_h_found" = "xyes" ; then - LIBID3TAG_SYSTEM_AVAILABLE="yes" - LIBID3TAG_SYSTEM_LIBS=-lid3tag - LIBID3TAG_SYSTEM_CPPSYMBOLS="USE_LIBID3TAG" + if test "$LIBID3TAG_SYSTEM_AVAILABLE" = "yes"; then AC_MSG_NOTICE([Libid3tag libraries are available as system libraries]) else - LIBID3TAG_SYSTEM_AVAILABLE="no" AC_MSG_NOTICE([Libid3tag libraries are NOT available as system libraries]) fi dnl see if libid3tag is available in the local tree AC_CHECK_FILE(${srcdir}/lib-src/libid3tag/frame.h, - frame_h_found="yes", - frame_h_found="no") + LIBID3TAG_LOCAL_AVAILABLE="yes", + LIBID3TAG_LOCAL_AVAILABLE="no") - - if test "x$frame_h_found" = "xyes" ; then - LIBID3TAG_LOCAL_AVAILABLE="yes" - LIBID3TAG_LOCAL_LIBS="libid3tag.a" - LIBID3TAG_LOCAL_CXXFLAGS='-I$(top_srcdir)/lib-src/libid3tag' - LIBID3TAG_LOCAL_CPPSYMBOLS="USE_LIBID3TAG" - LIBS="${LIBS} -lz" + if test "$LIBID3TAG_LOCAL_AVAILABLE" = "yes"; then AC_MSG_NOTICE([libid3tag libraries are available in the local tree]) else - LIBID3TAG_LOCAL_AVAILABLE="no" AC_MSG_NOTICE([libid3tag libraries are NOT available in the local tree]) fi ]) -AC_DEFUN([AUDACITY_CONFIG_SUBDIRS_LIBID3TAG], [ +AC_DEFUN([AUDACITY_CONFIG_LIBID3TAG], [ if test "$LIBID3TAG_USE_LOCAL" = yes; then + ID3TAG_CFLAGS='-I$(top_srcdir)/lib-src/libid3tag' + ID3TAG_LIBS='$(top_builddir)/lib-src/libid3tag/libid3tag.la' AC_CONFIG_SUBDIRS([lib-src/libid3tag]) fi + + AC_SUBST([ID3TAG_CFLAGS]) + AC_SUBST([ID3TAG_LIBS]) + + AM_CONDITIONAL([USE_LIBID3TAG], [test "$LIBID3TAG_USE_LOCAL" = yes -o "$LIBID3TAG_USE_SYSTEM" = yes]) + AM_CONDITIONAL([USE_LOCAL_LIBID3TAG], [test "$LIBID3TAG_USE_LOCAL" = yes]) + + if test "$LIBID3TAG_USE_LOCAL" = yes -o "$LIBID3TAG_USE_SYSTEM" = yes; then + AC_DEFINE(USE_LIBID3TAG, 1, + [Define if libid3tag is present]) + fi ]) diff --git a/m4/audacity_checklib_libmad.m4 b/m4/audacity_checklib_libmad.m4 index af5e9a4c0..3554155fd 100644 --- a/m4/audacity_checklib_libmad.m4 +++ b/m4/audacity_checklib_libmad.m4 @@ -1,15 +1,9 @@ dnl Add audacity / libmad license? dnl Please increment the serial number below whenever you alter this macro dnl for the benefit of automatic macro update systems -# audacity_checklib_libmad.m4 serial 1 +# audacity_checklib_libmad.m4 serial 2 AC_DEFUN([AUDACITY_CHECKLIB_LIBMAD], [ - - if false ; then - AC_DEFINE(USE_LIBMAD, 1, - [Define if mp3 support is implemented with the libmad library]) - fi - AC_ARG_WITH(libmad, [AS_HELP_STRING([--with-libmad], [use libmad for mp2/3 decoding support])], @@ -19,8 +13,8 @@ AC_DEFUN([AUDACITY_CHECKLIB_LIBMAD], [ dnl see if libmad is installed in the system >= 0.14.2b PKG_CHECK_MODULES(LIBMAD, mad >= 0.14.2b, - libmad_available_system="yes", - libmad_available_system="no") + LIBMAD_SYSTEM_AVAILABLE="yes", + LIBMAD_SYSTEM_AVAILABLE="no") dnl if we don't have the version we want, do we have any at all? @@ -28,15 +22,11 @@ AC_DEFUN([AUDACITY_CHECKLIB_LIBMAD], [ libmad_found="yes", libmad_found="no") - if test "x$libmad_available_system" = "xyes" && test "x$libmad_found" = "xno" ; then + if test "$LIBMAD_SYSTEM_AVAILABLE" = "yes" -a "$libmad_found" = "no"; then AC_MSG_WARN([system installation of libmad found, but it is too old. Upgrade to at least 0.14.2b to use with Audacity]) fi - if test "x$libmad_available_system" = "xyes" ; then - LIBMAD_SYSTEM_AVAILABLE="yes" - LIBMAD_SYSTEM_LIBS="$LIBMAD_LIBS" - LIBMAD_SYSTEM_CXXFLAGS="$LIBMAD_CFLAGS" - LIBMAD_SYSTEM_CPPSYMBOLS="USE_LIBMAD" + if test "$LIBMAD_SYSTEM_AVAILABLE" = "yes"; then AC_MSG_NOTICE([libmad libraries are available as system libraries]) else AC_MSG_NOTICE([libmad libraries are NOT available as system libraries]) @@ -45,24 +35,32 @@ AC_DEFUN([AUDACITY_CHECKLIB_LIBMAD], [ dnl see if libmad is available in the local tree AC_CHECK_FILE(${srcdir}/lib-src/libmad/frame.h, - frame_h_found="yes", - frame_h_found="no") + LIBMAD_LOCAL_AVAILABLE="yes", + LIBMAD_LOCAL_AVAILABLE="no") - if test "x$frame_h_found" = "xyes" ; then - LIBMAD_LOCAL_AVAILABLE="yes" - LIBMAD_LOCAL_LIBS="libmad.a" - LIBMAD_LOCAL_CXXFLAGS='-I$(top_srcdir)/lib-src/libmad' - LIBMAD_LOCAL_CPPSYMBOLS="USE_LIBMAD" + if test "$LIBMAD_LOCAL_AVAILABLE" = "yes"; then AC_MSG_NOTICE([libmad libraries are available in the local tree]) else - LIBMAD_LOCAL_AVAILABLE="no" AC_MSG_NOTICE([libmad libraries are NOT available in the local tree]) fi LIBMAD_MIMETYPES="audio/mpeg;" ]) -AC_DEFUN([AUDACITY_CONFIG_SUBDIRS_LIBMAD], [ +AC_DEFUN([AUDACITY_CONFIG_LIBMAD], [ if test "$LIBMAD_USE_LOCAL" = yes; then + LIBMAD_CFLAGS='-I$(top_srcdir)/lib-src/libmad' + LIBMAD_LIBS='$(top_builddir)/lib-src/libmad/libmad.la' AC_CONFIG_SUBDIRS([lib-src/libmad]) fi + + AC_SUBST([LIBMAD_CFLAGS]) + AC_SUBST([LIBMAD_LIBS]) + + AM_CONDITIONAL([USE_LIBMAD], [test "$LIBMAD_USE_LOCAL" = yes -o "$LIBMAD_USE_SYSTEM" = yes]) + AM_CONDITIONAL([USE_LOCAL_LIBMAD], [test "$LIBMAD_USE_LOCAL" = yes]) + + if test "$LIBMAD_USE_LOCAL" = yes -o "$LIBMAD_USE_SYSTEM" = yes; then + AC_DEFINE(USE_LIBMAD, 1, + [Define if mp3 support is implemented with the libmad library]) + fi ]) diff --git a/m4/audacity_checklib_libnyquist.m4 b/m4/audacity_checklib_libnyquist.m4 index e21608fa7..3f1c98fdd 100644 --- a/m4/audacity_checklib_libnyquist.m4 +++ b/m4/audacity_checklib_libnyquist.m4 @@ -1,7 +1,7 @@ dnl add Audacity / Nyquist license? dnl Please increment the serial number below whenever you alter this macro dnl for the benefit of automatic macro update systems -# audacity_checklib_libnyquist.m4 serial 1 +# audacity_checklib_libnyquist.m4 serial 2 dnl Check for Nyquist as a library AC_DEFUN([AUDACITY_CHECKLIB_LIBNYQUIST], [ @@ -11,11 +11,6 @@ AC_DEFUN([AUDACITY_CHECKLIB_LIBNYQUIST], [ LIBNYQUIST_ARGUMENT=$enableval, LIBNYQUIST_ARGUMENT="unspecified") - if false ; then - AC_DEFINE(USE_NYQUIST, 1, - [Define if Nyquist support should be enabled]) - fi - dnl Nyquist is never installed on the system dnl nyx is home-cooked by us, so system copy is unlikely LIBNYQUIST_SYSTEM_AVAILABLE="no" @@ -23,26 +18,31 @@ AC_DEFUN([AUDACITY_CHECKLIB_LIBNYQUIST], [ dnl see if Nyquist is available locally AC_CHECK_FILE(${srcdir}/lib-src/libnyquist/nyx.h, - nyx_h_found="yes", - nyx_h_found="no") - - if test "x$nyx_h_found" = "xyes" ; then - LIBNYQUIST_LOCAL_AVAILABLE="yes" - LIBNYQUIST_LOCAL_LIBS="libnyquist.a" - LIBNYQUIST_LOCAL_CXXFLAGS='-I$(top_srcdir)/lib-src/libnyquist' - LIBNYQUIST_LOCAL_CPPSYMBOLS="USE_NYQUIST" - LIBNYQUIST_LOCAL_OPTOBJS="effects/nyquist/Nyquist.o" - LIBNYQUIST_LOCAL_OPTOBJS="$LIBNYQUIST_LOCAL_OPTOBJS effects/nyquist/LoadNyquist.o" + LIBNYQUIST_LOCAL_AVAILABLE="yes", + LIBNYQUIST_LOCAL_AVAILABLE="no") + if test "$LIBNYQUIST_LOCAL_AVAILABLE" = "yes" ; then AC_MSG_NOTICE([nyquist libraries are available in the local tree]) else - LIBNYQUIST_LOCAL_AVAILABLE="no" AC_MSG_NOTICE([nyquist libraries are NOT available in the local tree]) fi ]) -AC_DEFUN([AUDACITY_CONFIG_SUBDIRS_LIBNYQUIST], [ +AC_DEFUN([AUDACITY_CONFIG_LIBNYQUIST], [ if test "$LIBNYQUIST_USE_LOCAL" = yes; then + LIBNYQUIST_CFLAGS='-I$(top_srcdir)/lib-src/libnyquist' + LIBNYQUIST_LIBS='$(top_builddir)/lib-src/libnyquist/libnyquist.a' AC_CONFIG_SUBDIRS([lib-src/libnyquist]) fi + + AC_SUBST([LIBNYQUIST_CFLAGS]) + AC_SUBST([LIBNYQUIST_LIBS]) + + AM_CONDITIONAL([USE_LIBNYQUIST], [test "$LIBNYQUIST_USE_LOCAL" = yes -o "$LIBNYQUIST_USE_SYSTEM" = yes]) + AM_CONDITIONAL([USE_LOCAL_LIBNYQUIST], [test "$LIBNYQUIST_USE_LOCAL" = yes]) + + if test "$LIBNYQUIST_USE_LOCAL" = yes -o "$LIBNYQUIST_USE_SYSTEM" = yes; then + AC_DEFINE(USE_NYQUIST, 1, + [Define if Nyquist support should be enabled]) + fi ]) diff --git a/m4/audacity_checklib_libresample.m4 b/m4/audacity_checklib_libresample.m4 index 0f78071fb..01329db1d 100644 --- a/m4/audacity_checklib_libresample.m4 +++ b/m4/audacity_checklib_libresample.m4 @@ -1,7 +1,7 @@ dnl Add Audacity license? dnl Please increment the serial number below whenever you alter this macro dnl for the benefit of automatic macro update systems -# audacity_checklib_libresample.m4 serial 2 +# audacity_checklib_libresample.m4 serial 3 AC_DEFUN([AUDACITY_CHECKLIB_LIBRESAMPLE], [ @@ -11,11 +11,6 @@ AC_DEFUN([AUDACITY_CHECKLIB_LIBRESAMPLE], [ LIBRESAMPLE_ARGUMENT=$withval, LIBRESAMPLE_ARGUMENT="unspecified") - if false ; then - AC_DEFINE(USE_LIBRESAMPLE, 1, - [Define if libresample support should be enabled]) - fi - dnl see if libresample is installed on the system dnl ... but libresample isn't generally installed as a system library... @@ -25,24 +20,31 @@ AC_DEFUN([AUDACITY_CHECKLIB_LIBRESAMPLE], [ dnl see if libresample is available locally AC_CHECK_FILE(${srcdir}/lib-src/libresample/include/libresample.h, - resample_h_found="yes", - resample_h_found="no") - - if test "x$resample_h_found" = "xyes" ; then - LIBRESAMPLE_LOCAL_AVAILABLE="yes" - LIBRESAMPLE_LOCAL_LIBS="libresample.a" - LIBRESAMPLE_LOCAL_CXXFLAGS='-I$(top_srcdir)/lib-src/libresample/include' - LIBRESAMPLE_LOCAL_CPPSYMBOLS="USE_LIBRESAMPLE" + LIBRESAMPLE_LOCAL_AVAILABLE="yes", + LIBRESAMPLE_LOCAL_AVAILABLE="no") + if test "$LIBRESAMPLE_LOCAL_AVAILABLE" = "yes"; then AC_MSG_NOTICE([libresample libraries are available in the local tree]) else - LIBRESAMPLE_LOCAL_AVAILABLE="no" AC_MSG_NOTICE([libresample libraries are NOT available in the local tree]) fi ]) -AC_DEFUN([AUDACITY_CONFIG_SUBDIRS_LIBRESAMPLE], [ +AC_DEFUN([AUDACITY_CONFIG_LIBRESAMPLE], [ if test "$LIBRESAMPLE_USE_LOCAL" = yes; then + LIBRESAMPLE_CFLAGS='-I$(top_srcdir)/lib-src/libresample/include' + LIBRESAMPLE_LIBS='$(top_builddir)/lib-src/libresample/libresample.a' AC_CONFIG_SUBDIRS([lib-src/libresample]) fi + + AC_SUBST([LIBRESAMPLE_CFLAGS]) + AC_SUBST([LIBRESAMPLE_LIBS]) + + AM_CONDITIONAL([USE_LIBRESAMPLE], [test "$LIBRESAMPLE_USE_LOCAL" = yes -o "$LIBRESAMPLE_USE_SYSTEM" = yes]) + AM_CONDITIONAL([USE_LOCAL_LIBRESAMPLE], [test "$LIBRESAMPLE_USE_LOCAL" = yes]) + + if test "$LIBRESAMPLE_USE_LOCAL" = yes -o "$LIBRESAMPLE_USE_SYSTEM" = yes; then + AC_DEFINE(USE_LIBRESAMPLE, 1, + [Define if libresample support should be enabled]) + fi ]) diff --git a/m4/audacity_checklib_libsamplerate.m4 b/m4/audacity_checklib_libsamplerate.m4 index 95802d67d..da946e9d6 100644 --- a/m4/audacity_checklib_libsamplerate.m4 +++ b/m4/audacity_checklib_libsamplerate.m4 @@ -1,7 +1,7 @@ dnl Add Audacity / libsamplerate license? dnl Please increment the serial number below whenever you alter this macro dnl for the benefit of automatic macro update systems -# audacity_checklib_libsamplerate.m4 serial 2 +# audacity_checklib_libsamplerate.m4 serial 3 AC_DEFUN([AUDACITY_CHECKLIB_LIBSAMPLERATE], [ @@ -11,48 +11,46 @@ AC_DEFUN([AUDACITY_CHECKLIB_LIBSAMPLERATE], [ LIBSAMPLERATE_ARGUMENT=$withval, LIBSAMPLERATE_ARGUMENT="unspecified") - if false ; then - AC_DEFINE(USE_LIBSAMPLERATE, 1, - [Define if libsamplerate support should be enabled]) - fi - dnl see if libsamplerate is installed on the system PKG_CHECK_MODULES(SAMPLERATE, samplerate >= 0.1.2, - samplerate_available_system="yes", - samplerate_available_system="no") + LIBSAMPLERATE_SYSTEM_AVAILABLE="yes", + LIBSAMPLERATE_SYSTEM_AVAILABLE="no") - if test "x$samplerate_available_system" = "xyes" ; then - LIBSAMPLERATE_SYSTEM_AVAILABLE="yes" - LIBSAMPLERATE_SYSTEM_LIBS=$SAMPLERATE_LIBS - LIBSAMPLERATE_SYSTEM_CXXFLAGS=$SAMPLERATE_CFLAGS - LIBSAMPLERATE_SYSTEM_CPPSYMBOLS="USE_LIBSAMPLERATE" + if test "$LIBSAMPLERATE_SYSTEM_AVAILABLE" = "yes" ; then AC_MSG_NOTICE([Libsamplerate libraries are available as system libraries]) else - LIBSAMPLERATE_SYSTEM_AVAILABLE="no" AC_MSG_NOTICE([Libsamplerate libraries are NOT available as system libraries]) fi dnl see if libsamplerate is available in the local tree AC_CHECK_FILE(${srcdir}/lib-src/libsamplerate/src/samplerate.h, - samplerate_h_found="yes", - samplerate_h_found="no") + LIBSAMPLERATE_LOCAL_AVAILABLE="yes", + LIBSAMPLERATE_LOCAL_AVAILABLE="no") - if test "x$samplerate_h_found" = "xyes" ; then - LIBSAMPLERATE_LOCAL_AVAILABLE="yes" - LIBSAMPLERATE_LOCAL_LIBS="libsamplerate.a" - LIBSAMPLERATE_LOCAL_CXXFLAGS='-I$(top_srcdir)/lib-src/libsamplerate/src' - LIBSAMPLERATE_LOCAL_CPPSYMBOLS="USE_LIBSAMPLERATE" + if test "$LIBSAMPLERATE_LOCAL_AVAILABLE" = "yes" ; then AC_MSG_NOTICE([libsamplerate libraries are available in the local tree]) else - LIBSAMPLERATE_LOCAL_AVAILABLE="no" AC_MSG_NOTICE([libsamplerate libraries are NOT available in the local tree]) fi ]) -AC_DEFUN([AUDACITY_CONFIG_SUBDIRS_LIBSAMPLERATE], [ +AC_DEFUN([AUDACITY_CONFIG_LIBSAMPLERATE], [ if test "$LIBSAMPLERATE_USE_LOCAL" = yes; then + SAMPLERATE_CFLAGS='-I$(top_srcdir)/lib-src/libsamplerate/src' + SAMPLERATE_LIBS='$(top_builddir)/lib-src/libsamplerate/libsamplerate.a' AC_CONFIG_SUBDIRS([lib-src/libsamplerate]) fi + + AC_SUBST([SAMPLERATE_CFLAGS]) + AC_SUBST([SAMPLERATE_LIBS]) + + AM_CONDITIONAL([USE_LIBSAMPLERATE], [test "$LIBSAMPLERATE_USE_LOCAL" = yes -o "$LIBSAMPLERATE_USE_SYSTEM" = yes]) + AM_CONDITIONAL([USE_LOCAL_LIBSAMPLERATE], [test "$LIBSAMPLERATE_USE_LOCAL" = yes]) + + if test "$LIBSAMPLERATE_USE_LOCAL" = yes -o "$LIBSAMPLERATE_USE_SYSTEM" = yes; then + AC_DEFINE(USE_LIBSAMPLERATE, 1, + [Define if libsamplerate support should be enabled]) + fi ]) diff --git a/m4/audacity_checklib_libsbsms.m4 b/m4/audacity_checklib_libsbsms.m4 index a423a84f2..f4210a6d1 100644 --- a/m4/audacity_checklib_libsbsms.m4 +++ b/m4/audacity_checklib_libsbsms.m4 @@ -1,6 +1,6 @@ dnl Please increment the serial number below whenever you alter this macro dnl for the benefit of automatic macro update systems -# audacity_checklib_libsbsms.m4 serial 1 +# audacity_checklib_libsbsms.m4 serial 2 AC_DEFUN([AUDACITY_CHECKLIB_LIBSBSMS], [ @@ -10,54 +10,50 @@ AC_DEFUN([AUDACITY_CHECKLIB_LIBSBSMS], [ LIBSBSMS_ARGUMENT=$withval, LIBSBSMS_ARGUMENT="unspecified") - if false ; then - AC_DEFINE(USE_SBSMS, 1, - [Define if SBSMS support should be enabled]) - fi - dnl see if sbsms is installed on the system PKG_CHECK_MODULES(SBSMS, sbsms >= 1.6.0, - sbsms_available_system="yes", - sbsms_available_system="no") + LIBSBSMS_SYSTEM_AVAILABLE="yes", + LIBSBSMS_SYSTEM_AVAILABLE="no") - if test "x$sbsms_available_system" = "xyes" ; then - LIBSBSMS_SYSTEM_AVAILABLE="yes" - LIBSBSMS_SYSTEM_LIBS=$SBSMS_LIBS - LIBSBSMS_SYSTEM_CXXFLAGS=$SBSMS_CFLAGS - LIBSBSMS_SYSTEM_CPPSYMBOLS="USE_SBSMS" + if test "$LIBSBSMS_SYSTEM_AVAILABLE" = "yes"; then AC_MSG_NOTICE([Libsbsms libraries are available as system libraries]) else - LIBSBSMS_SYSTEM_AVAILABLE="no" AC_MSG_NOTICE([Libsbsms libraries are NOT available as system libraries]) fi dnl see if libsbsms is available locally AC_CHECK_FILE(${srcdir}/lib-src/sbsms/include/sbsms.h, - sbsms_h_found="yes", - sbsms_h_found="no") - - if test "x$sbsms_h_found" = "xyes" ; then - LIBSBSMS_LOCAL_AVAILABLE="yes" - LIBSBSMS_LOCAL_LIBS="libsbsms.a" - LIBSBSMS_LOCAL_CXXFLAGS='-I$(top_srcdir)/lib-src/sbsms/include' - LIBSBSMS_LOCAL_CPPSYMBOLS="USE_SBSMS" + LIBSBSMS_LOCAL_AVAILABLE="yes", + LIBSBSMS_LOCAL_AVAILABLE="no") + if test "$LIBSBSMS_LOCAL_AVAILABLE" = "yes"; then dnl do not build programs we don't need LIBSBSMS_LOCAL_CONFIGURE_ARGS="--disable-programs" - AC_MSG_NOTICE([libsbsms libraries are available in the local tree]) else - LIBSBSMS_LOCAL_AVAILABLE="no" AC_MSG_NOTICE([libsbsms libraries are NOT available in the local tree]) fi ]) -AC_DEFUN([AUDACITY_CONFIG_SUBDIRS_LIBSBSMS], [ +AC_DEFUN([AUDACITY_CONFIG_LIBSBSMS], [ if test "$LIBSBSMS_USE_LOCAL" = yes; then + SBSMS_CFLAGS='-I$(top_srcdir)/lib-src/sbsms/include' + SBSMS_LIBS='$(top_builddir)/lib-src/sbsms/src/.libs/libsbsms.a' AC_CONFIG_SUBDIRS([lib-src/sbsms]) fi + + AC_SUBST([SBSMS_CFLAGS]) + AC_SUBST([SBSMS_LIBS]) + + AM_CONDITIONAL([USE_SBSMS], [test "$LIBSBSMS_USE_LOCAL" = yes -o "$LIBSBSMS_USE_SYSTEM" = yes]) + AM_CONDITIONAL([USE_LOCAL_SBSMS], [test "$LIBSBSMS_USE_LOCAL" = yes]) + + if test "$LIBSBSMS_USE_LOCAL" = yes -o "$LIBSBSMS_USE_SYSTEM" = yes; then + AC_DEFINE(USE_SBSMS, 1, + [Define if SBSMS support should be enabled]) + fi ]) diff --git a/m4/audacity_checklib_libsndfile.m4 b/m4/audacity_checklib_libsndfile.m4 index 27a20c76b..b0d04110f 100644 --- a/m4/audacity_checklib_libsndfile.m4 +++ b/m4/audacity_checklib_libsndfile.m4 @@ -1,7 +1,7 @@ dnl Add audacity / libsndfile license? dnl Please increment the serial number below whenever you alter this macro dnl for the benefit of automatic macro update systems -# audacity_checklib_libsndfile.m4 serial 2 +# audacity_checklib_libsndfile.m4 serial 3 AC_DEFUN([AUDACITY_CHECKLIB_LIBSNDFILE], [ @@ -14,29 +14,22 @@ AC_DEFUN([AUDACITY_CHECKLIB_LIBSNDFILE], [ dnl see if libsndfile is installed in the system PKG_CHECK_MODULES(SNDFILE, sndfile >= 1.0.0, - sndfile_available_system="yes", - sndfile_available_system="no") + LIBSNDFILE_SYSTEM_AVAILABLE="yes", + LIBSNDFILE_SYSTEM_AVAILABLE="no") - if test "x$sndfile_available_system" = "xyes" ; then - LIBSNDFILE_SYSTEM_AVAILABLE="yes" - LIBSNDFILE_SYSTEM_LIBS=$SNDFILE_LIBS - LIBSNDFILE_SYSTEM_CXXFLAGS=$SNDFILE_CFLAGS + if test "$LIBSNDFILE_SYSTEM_AVAILABLE" = "yes"; then AC_MSG_NOTICE([Libsndfile libraries are available as system libraries]) else - LIBSNDFILE_SYSTEM_AVAILABLE="no" AC_MSG_NOTICE([Libsndfile libraries are NOT available as system libraries]) fi dnl see if libsndfile is available in the local tree AC_CHECK_FILE(${srcdir}/lib-src/libsndfile/src/sndfile.h.in, - libsndfile_found="yes", - libsndfile_found="no") + LIBSNDFILE_LOCAL_AVAILABLE="yes", + LIBSNDFILE_LOCAL_AVAILABLE="no") - if test "x$libsndfile_found" = "xyes" ; then - LIBSNDFILE_LOCAL_AVAILABLE="yes" - LIBSNDFILE_LOCAL_LIBS="libsndfile.a" - LIBSNDFILE_LOCAL_CXXFLAGS='-I$(top_srcdir)/lib-src/libsndfile/src' + if test "$LIBSNDFILE_LOCAL_AVAILABLE" = "yes"; then AC_MSG_NOTICE([libsndfile libraries are available in this source tree]) dnl These must be visible so libvamp and sbsms can find us @@ -46,14 +39,20 @@ AC_DEFUN([AUDACITY_CHECKLIB_LIBSNDFILE], [ dnl Temporary fix for bug #248 LIBSNDFILE_LOCAL_CONFIGURE_ARGS="--disable-sqlite --disable-external-libs --disable-alsa" else - LIBSNDFILE_LOCAL_AVAILABLE="no" AC_MSG_NOTICE([libsndfile libraries are NOT available in this source tree]) fi LIBSNDFILE_MIMETYPES="audio/basic;audio/x-aiff;audio/x-wav;" ]) -AC_DEFUN([AUDACITY_CONFIG_SUBDIRS_LIBSNDFILE], [ +AC_DEFUN([AUDACITY_CONFIG_LIBSNDFILE], [ if test "$LIBSNDFILE_USE_LOCAL" = yes; then + SNDFILE_CFLAGS='-I$(top_srcdir)/lib-src/libsndfile/src' + SNDFILE_LIBS='$(top_builddir)/lib-src/libsndfile/src/.libs/libsndfile.a' AC_CONFIG_SUBDIRS([lib-src/libsndfile]) fi + + AC_SUBST([SNDFILE_CFLAGS]) + AC_SUBST([SNDFILE_LIBS]) + + AM_CONDITIONAL([USE_LOCAL_LIBSNDFILE], [test "$LIBSNDFILE_USE_LOCAL" = yes]) ]) diff --git a/m4/audacity_checklib_libsoundtouch.m4 b/m4/audacity_checklib_libsoundtouch.m4 index fdbf8f510..0e045d359 100644 --- a/m4/audacity_checklib_libsoundtouch.m4 +++ b/m4/audacity_checklib_libsoundtouch.m4 @@ -1,7 +1,7 @@ dnl Add Audacity / Soundtouch license? dnl Please increment the serial number below whenever you alter this macro dnl for the benefit of automatic macro update systems -# audacity_checklib_libsoundtouch.m4 serial 2 +# audacity_checklib_libsoundtouch.m4 serial 3 AC_DEFUN([AUDACITY_CHECKLIB_LIBSOUNDTOUCH], [ AC_ARG_WITH(soundtouch, @@ -10,65 +10,63 @@ AC_DEFUN([AUDACITY_CHECKLIB_LIBSOUNDTOUCH], [ LIBSOUNDTOUCH_ARGUMENT=$withval, LIBSOUNDTOUCH_ARGUMENT="unspecified") - if false ; then - AC_DEFINE(USE_SOUNDTOUCH, 1, - [Define if SoundTouch support should be enabled]) - fi - dnl see if soundtouch is installed on the system dnl Fustratingly, the name of the pkg-config file keeps being changed dnl by upstream, despite the fact that they don't need to and shouldn't. dnl as a result (given that 1.3.x and 1.4.0 seem to have idenditcal APIs) dnl we have to check for two possible pkg-config files for the same package. - dnl check for 1.4.x first - PKG_CHECK_MODULES(SOUNDTOUCH, soundtouch-1.4 >= 1.3.0, - soundtouch_available_system="yes", - soundtouch_available_system="no") - dnl if not there, check for 1.3.x - if test "x$soundtouch_available_system" = "xno" ; then - PKG_CHECK_MODULES(SOUNDTOUCH, soundtouch-1.0 >= 1.3.0, - soundtouch_available_system="yes", - soundtouch_available_system="no") + PKG_CHECK_MODULES(SOUNDTOUCH, soundtouch >= 1.3.0, + LIBSOUNDTOUCH_SYSTEM_AVAILABLE="yes", + LIBSOUNDTOUCH_SYSTEM_AVAILABLE="no") + dnl if not there, check for 1.4.x + if test "$LIBSOUNDTOUCH_SYSTEM_AVAILABLE" = "no"; then + PKG_CHECK_MODULES(SOUNDTOUCH, soundtouch-1.4 >= 1.3.0, + LIBSOUNDTOUCH_SYSTEM_AVAILABLE="yes", + LIBSOUNDTOUCH_SYSTEM_AVAILABLE="no") fi - if test "x$soundtouch_available_system" = "xno" ; then - PKG_CHECK_MODULES(SOUNDTOUCH, soundtouch >= 1.3.0, - soundtouch_available_system="yes", - soundtouch_available_system="no") + dnl if not there, check for 1.3.x + if test "$LIBSOUNDTOUCH_SYSTEM_AVAILABLE" = "no"; then + PKG_CHECK_MODULES(SOUNDTOUCH, soundtouch-1.0 >= 1.3.0, + LIBSOUNDTOUCH_SYSTEM_AVAILABLE="yes", + LIBSOUNDTOUCH_SYSTEM_AVAILABLE="no") fi - if test "x$soundtouch_available_system" = "xyes" ; then - LIBSOUNDTOUCH_SYSTEM_AVAILABLE="yes" - LIBSOUNDTOUCH_SYSTEM_LIBS=$SOUNDTOUCH_LIBS - LIBSOUNDTOUCH_SYSTEM_CXXFLAGS=$SOUNDTOUCH_CFLAGS - LIBSOUNDTOUCH_SYSTEM_CPPSYMBOLS="USE_SOUNDTOUCH" + if test "$LIBSOUNDTOUCH_SYSTEM_AVAILABLE" = "yes"; then AC_MSG_NOTICE([Libsoundtouch libraries are available as system libraries]) else - LIBSOUNDTOUCH_SYSTEM_AVAILABLE="no" AC_MSG_NOTICE([Libsoundtouch libraries are NOT available as system libraries]) fi dnl see if libsoundtouch is available locally AC_CHECK_FILE(${srcdir}/lib-src/soundtouch/include/SoundTouch.h, - soundtouch_h_found="yes", - soundtouch_h_found="no") + LIBSOUNDTOUCH_LOCAL_AVAILABLE="yes", + LIBSOUNDTOUCH_LOCAL_AVAILABLE="no") - if test "x$soundtouch_h_found" = "xyes" ; then - LIBSOUNDTOUCH_LOCAL_AVAILABLE="yes" - LIBSOUNDTOUCH_LOCAL_LIBS="libSoundTouch.a" - LIBSOUNDTOUCH_LOCAL_CXXFLAGS='-I$(top_srcdir)/lib-src/soundtouch/include' - LIBSOUNDTOUCH_LOCAL_CPPSYMBOLS="USE_SOUNDTOUCH" + if test "$LIBSOUNDTOUCH_LOCAL_AVAILABLE" = "yes"; then AC_MSG_NOTICE([libsoundtouch libraries are available in the local tree]) else - LIBSOUNDTOUCH_LOCAL_AVAILABLE="no" AC_MSG_NOTICE([libsoundtouch libraries are NOT available in the local tree]) fi ]) -AC_DEFUN([AUDACITY_CONFIG_SUBDIRS_LIBSOUNDTOUCH], [ +AC_DEFUN([AUDACITY_CONFIG_LIBSOUNDTOUCH], [ if test "$LIBSOUNDTOUCH_USE_LOCAL" = yes; then + SOUNDTOUCH_CFLAGS='-I$(top_srcdir)/lib-src/soundtouch/include' + SOUNDTOUCH_LIBS='$(top_builddir)/lib-src/soundtouch/source/SoundTouch/.libs/libSoundTouch.a' AC_CONFIG_SUBDIRS([lib-src/soundtouch]) fi + + AC_SUBST([SOUNDTOUCH_CFLAGS]) + AC_SUBST([SOUNDTOUCH_LIBS]) + + AM_CONDITIONAL([USE_LIBSOUNDTOUCH], [test "$LIBSOUNDTOUCH_USE_LOCAL" = yes -o "$LIBSOUNDTOUCH_USE_SYSTEM" = yes]) + AM_CONDITIONAL([USE_LOCAL_LIBSOUNDTOUCH], [test "$LIBSOUNDTOUCH_USE_LOCAL" = yes]) + + if test "$LIBSOUNDTOUCH_USE_LOCAL" = yes -o "$LIBSOUNDTOUCH_USE_SYSTEM" = yes; then + AC_DEFINE(USE_SOUNDTOUCH, 1, + [Define if SoundTouch support should be enabled]) + fi ]) diff --git a/m4/audacity_checklib_libsoxr.m4 b/m4/audacity_checklib_libsoxr.m4 index 1b0896bc2..910e7ed22 100644 --- a/m4/audacity_checklib_libsoxr.m4 +++ b/m4/audacity_checklib_libsoxr.m4 @@ -1,17 +1,9 @@ dnl Add Audacity license? dnl Please increment the serial number below whenever you alter this macro dnl for the benefit of automatic macro update systems -# audacity_checklib_libsoxr.m4 serial 2 +# audacity_checklib_libsoxr.m4 serial 3 AC_DEFUN([AUDACITY_CHECKLIB_LIBSOXR], [ - - dnl These four lines are never executed, but they document the USE_LIBSOXR - dnl pre-processor directive (for configunix.h etc) - if false ; then - AC_DEFINE(USE_LIBSOXR, 1, - [Define if libsoxr support should be enabled]) - fi - AC_ARG_WITH(libsoxr, [AS_HELP_STRING([--with-libsoxr], [use libsoxr for sample rate conversion])], @@ -22,44 +14,46 @@ AC_DEFUN([AUDACITY_CHECKLIB_LIBSOXR], [ dnl more recent) PKG_CHECK_MODULES(SOXR, soxr >= 0.0.5, - soxr_available_system="yes", - soxr_available_system="no") + LIBSOXR_SYSTEM_AVAILABLE="yes", + LIBSOXR_SYSTEM_AVAILABLE="no") - if test "x$soxr_available_system" = "xyes" ; then - LIBSOXR_SYSTEM_AVAILABLE="yes" - LIBSOXR_SYSTEM_LIBS=$SOXR_LIBS - LIBSOXR_SYSTEM_CXXFLAGS=$SOXR_CFLAGS - LIBSOXR_SYSTEM_CPPSYMBOLS="USE_LIBSOXR" + if test "$LIBSOXR_SYSTEM_AVAILABLE" = "yes"; then AC_MSG_NOTICE([Soxr libraries are available as system libraries]) else - LIBSOXR_SYSTEM_AVAILABLE="no" AC_MSG_NOTICE([Soxr libraries are NOT available as system libraries]) fi dnl see if libsoxr is available locally AC_CHECK_FILE(${srcdir}/lib-src/libsoxr/src/soxr.h, - soxr_h_found="yes", - soxr_h_found="no") - - if test "x$soxr_h_found" = "xyes" ; then - LIBSOXR_LOCAL_AVAILABLE="yes" - LIBSOXR_LOCAL_LIBS="libsoxr.a" - LIBSOXR_LOCAL_CXXFLAGS='-I$(top_srcdir)/lib-src/libsoxr/src' - LIBSOXR_LOCAL_CPPSYMBOLS="USE_LIBSOXR" + LIBSOXR_LOCAL_AVAILABLE="yes", + LIBSOXR_LOCAL_AVAILABLE="no") + if test "$LIBSOXR_LOCAL_AVAILABLE" = "yes"; then # Breaks other other libraries in Audacity tree; but why is ./configure # passing options specific to this library to other libraries? #LIBSOXR_LOCAL_CONFIGURE_ARGS="\"-DBUILD_SHARED_LIBS=OFF -DWITH_OPENMP=OFF\"" AC_MSG_NOTICE([libsoxr libraries are available in the local tree]) else - LIBSOXR_LOCAL_AVAILABLE="no" AC_MSG_NOTICE([libsoxr libraries are NOT available in the local tree]) fi ]) -AC_DEFUN([AUDACITY_CONFIG_SUBDIRS_LIBSOXR], [ +AC_DEFUN([AUDACITY_CONFIG_LIBSOXR], [ if test "$LIBSOXR_USE_LOCAL" = yes; then + SOXR_CFLAGS='-I$(top_srcdir)/lib-src/libsoxr/src' + SOXR_LIBS='$(top_builddir)/lib-src/libsoxr/src/libsoxr.a' AC_CONFIG_SUBDIRS([lib-src/libsoxr]) fi + + AC_SUBST([SOXR_CFLAGS]) + AC_SUBST([SOXR_LIBS]) + + AM_CONDITIONAL([USE_LIBSOXR], [test "$LIBSOXR_USE_LOCAL" = yes -o "$LIBSOXR_USE_SYSTEM" = yes]) + AM_CONDITIONAL([USE_LOCAL_LIBSOXR], [test "$LIBSOXR_USE_LOCAL" = yes]) + + if test "$LIBSOXR_USE_LOCAL" = yes -o "$LIBSOXR_USE_SYSTEM" = yes; then + AC_DEFINE(USE_LIBSOXR, 1, + [Define if libsoxr support should be enabled]) + fi ]) diff --git a/m4/audacity_checklib_libtwolame.m4 b/m4/audacity_checklib_libtwolame.m4 index 28f209d30..2d28b07e0 100644 --- a/m4/audacity_checklib_libtwolame.m4 +++ b/m4/audacity_checklib_libtwolame.m4 @@ -1,7 +1,7 @@ dnl add Audacity / Twolame license ? dnl Please increment the serial number below whenever you alter this macro dnl for the benefit of automatic macro update systems -# audacity_checklib_libtwolame.m4 serial 1 +# audacity_checklib_libtwolame.m4 serial 2 AC_DEFUN([AUDACITY_CHECKLIB_LIBTWOLAME], [ AC_ARG_WITH(libtwolame, @@ -10,53 +10,49 @@ AC_DEFUN([AUDACITY_CHECKLIB_LIBTWOLAME], [ LIBTWOLAME_ARGUMENT=$withval, LIBTWOLAME_ARGUMENT="unspecified") - if false ; then - AC_DEFINE(USE_LIBTWOLAME, 1, - [Define if libtwolame (MP2 export) support should be enabled]) - fi - dnl Check for a system copy of libtwolame to use, which needs to be dnl pretty current to work PKG_CHECK_MODULES(LIBTWOLAME, twolame >= 0.3.9, - twolame_available_system="yes", - twolame_available_system="no") + LIBTWOLAME_SYSTEM_AVAILABLE="yes", + LIBTWOLAME_SYSTEM_AVAILABLE="no") - if test "x$twolame_available_system" = "xyes" ; then - LIBTWOLAME_SYSTEM_AVAILABLE="yes" - LIBTWOLAME_SYSTEM_LIBS=$LIBTWOLAME_LIBS - LIBTWOLAME_SYSTEM_CXXFLAGS=$LIBTWOLAME_CFLAGS - LIBTWOLAME_SYSTEM_CPPSYMBOLS="USE_LIBTWOLAME" + if test "$LIBTWOLAME_SYSTEM_AVAILABLE" = "yes"; then AC_MSG_NOTICE([Libtwolame library available as system library]) else - LIBTWOLAME_SYSTEM_AVAILABLE="no" AC_MSG_NOTICE([Libtwolame library NOT available as system library]) fi dnl see if libtwolame is available locally AC_CHECK_FILE(${srcdir}/lib-src/twolame/libtwolame/twolame.h, - twolame_h_found="yes", - twolame_h_found="no") - - if test "x$twolame_h_found" = "xyes" ; then - LIBTWOLAME_LOCAL_AVAILABLE="yes" - LIBTWOLAME_LOCAL_LIBS="libtwolame.a" - LIBTWOLAME_LOCAL_CXXFLAGS='-I$(top_srcdir)/lib-src/twolame/libtwolame' - LIBTWOLAME_LOCAL_CPPSYMBOLS="USE_LIBTWOLAME" + LIBTWOLAME_LOCAL_AVAILABLE="yes", + LIBTWOLAME_LOCAL_AVAILABLE="no") + if test "$LIBTWOLAME_LOCAL_AVAILABLE" = "yes"; then dnl disable programs we don't need to build LIBTWOLAME_LOCAL_CONFIGURE_ARGS="--disable-programs" - AC_MSG_NOTICE([libtwolame library is available in the local tree]) else - LIBTWOLAME_LOCAL_AVAILABLE="no" AC_MSG_NOTICE([libtwolame library is NOT available in the local tree]) fi ]) -AC_DEFUN([AUDACITY_CONFIG_SUBDIRS_LIBTWOLAME], [ +AC_DEFUN([AUDACITY_CONFIG_LIBTWOLAME], [ if test "$LIBTWOLAME_USE_LOCAL" = yes; then + LIBTWOLAME_CFLAGS='-I$(top_srcdir)/lib-src/twolame/libtwolame' + LIBTWOLAME_LIBS='$(top_builddir)/lib-src/twolame/libtwolame/.libs/libtwolame.a' AC_CONFIG_SUBDIRS([lib-src/twolame]) fi + + AC_SUBST([LIBTWOLAME_CFLAGS]) + AC_SUBST([LIBTWOLAME_LIBS]) + + AM_CONDITIONAL([USE_LIBTWOLAME], [test "$LIBTWOLAME_USE_LOCAL" = yes -o "$LIBTWOLAME_USE_SYSTEM" = yes]) + AM_CONDITIONAL([USE_LOCAL_LIBTWOLAME], [test "$LIBTWOLAME_USE_LOCAL" = yes]) + + if test "$LIBTWOLAME_USE_LOCAL" = yes -o "$LIBTWOLAME_USE_SYSTEM" = yes; then + AC_DEFINE(USE_LIBTWOLAME, 1, + [Define if libtwolame (MP2 export) support should be enabled]) + fi ]) diff --git a/m4/audacity_checklib_libvamp.m4 b/m4/audacity_checklib_libvamp.m4 index f4d5e1320..8a1e0e1c6 100644 --- a/m4/audacity_checklib_libvamp.m4 +++ b/m4/audacity_checklib_libvamp.m4 @@ -1,7 +1,7 @@ dnl Todo: add Vamp / Audacity license? dnl Please increment the serial number below whenever you alter this macro dnl for the benefit of automatic macro update systems -# audacity_checklib_libvamp.m4 serial 2 +# audacity_checklib_libvamp.m4 serial 3 dnl Check for system copy of libvamp we can use for Vamp plug-in support AC_DEFUN([AUDACITY_CHECKLIB_LIBVAMP], [ @@ -11,60 +11,47 @@ AC_DEFUN([AUDACITY_CHECKLIB_LIBVAMP], [ LIBVAMP_ARGUMENT=$withval, LIBVAMP_ARGUMENT="unspecified") - if false ; then - AC_DEFINE(USE_VAMP, 1, - [Define if Vamp analysis plugin support should be enabled]) - fi - dnl System may include Vamp headers and library, though we prefer local ones PKG_CHECK_MODULES(VAMP, vamp-hostsdk >= 2.0, - vamp_available_system="yes", - vamp_available_system="no") + LIBVAMP_SYSTEM_AVAILABLE="yes", + LIBVAMP_SYSTEM_AVAILABLE="no") - if test "x$vamp_available_system" = "xyes" ; then - LIBVAMP_SYSTEM_AVAILABLE="yes" - LIBVAMP_SYSTEM_LIBS=$VAMP_LIBS - LIBVAMP_SYSTEM_CXXFLAGS=$VAMP_CFLAGS - dnl still need these local objects for the support in audacity - LIBVAMP_SYSTEM_OPTOBJS="effects/vamp/VampEffect.o effects/vamp/LoadVamp.o" - LIBVAMP_SYSTEM_CPPSYMBOLS="USE_VAMP" + if test "$LIBVAMP_SYSTEM_AVAILABLE" = "yes"; then AC_MSG_NOTICE([Vamp libraries are available as system libraries]) else - LIBVAMP_SYSTEM_AVAILABLE="no" AC_MSG_NOTICE([Vamp libraries are NOT available as system libraries]) fi dnl see if Vamp is available locally AC_CHECK_FILE(${srcdir}/lib-src/libvamp/vamp-hostsdk/PluginLoader.h, - vamp_h_found="yes", - vamp_h_found="no") + LIBVAMP_LOCAL_AVAILABLE="yes", + LIBVAMP_LOCAL_AVAILABLE="no") - if test "x$vamp_h_found" = "xyes" ; then - LIBVAMP_LOCAL_AVAILABLE="yes" - dnl Add vamp to the list of things to build in lib-src - LIBVAMP_LOCAL_BUILD="vamp-sdk" - dnl compiler and linker flags - LIBVAMP_LOCAL_CXXFLAGS='-I$(top_srcdir)/lib-src/libvamp' - LIBVAMP_LOCAL_LIBS="libvamp-hostsdk.a" - dnl add some extra object files we can build - LIBVAMP_LOCAL_OPTOBJS="effects/vamp/VampEffect.o effects/vamp/LoadVamp.o" - dnl define a pre-processor symbol to tell other code that the vamp host - dnl SDK is available - LIBVAMP_LOCAL_CPPSYMBOLS="USE_VAMP" - dnl do not build programs we don't need + if test "$LIBVAMP_LOCAL_AVAILABLE" = "yes"; then LIBVAMP_LOCAL_CONFIGURE_ARGS="--disable-programs" - AC_MSG_NOTICE([Vamp libraries are available in the local tree]) else - LIBVAMP_LOCAL_AVAILABLE="no" AC_MSG_NOTICE([Vamp libraries are NOT available in the local tree]) fi ]) -AC_DEFUN([AUDACITY_CONFIG_SUBDIRS_LIBVAMP], [ +AC_DEFUN([AUDACITY_CONFIG_LIBVAMP], [ if test "$LIBVAMP_USE_LOCAL" = yes; then + VAMP_CFLAGS='-I$(top_srcdir)/lib-src/libvamp' + VAMP_LIBS='$(top_builddir)/lib-src/libvamp/libvamp-hostsdk.a' AC_CONFIG_SUBDIRS([lib-src/libvamp]) fi + + AC_SUBST([VAMP_CFLAGS]) + AC_SUBST([VAMP_LIBS]) + + AM_CONDITIONAL([USE_VAMP], [test "$LIBVAMP_USE_LOCAL" = yes -o "$LIBVAMP_USE_SYSTEM" = yes]) + AM_CONDITIONAL([USE_LOCAL_VAMP], [test "$LIBVAMP_USE_LOCAL" = yes]) + + if test "$LIBVAMP_USE_LOCAL" = yes -o "$LIBVAMP_USE_SYSTEM" = yes; then + AC_DEFINE(USE_VAMP, 1, + [Define if Vamp analysis plugin support should be enabled]) + fi ]) diff --git a/m4/audacity_checklib_libvorbis.m4 b/m4/audacity_checklib_libvorbis.m4 index d825ad165..11b2afdd1 100644 --- a/m4/audacity_checklib_libvorbis.m4 +++ b/m4/audacity_checklib_libvorbis.m4 @@ -2,15 +2,9 @@ dnl Add audacity / vorbis license? dnl dnl Please increment the serial number below whenever you alter this macro dnl for the benefit of automatic macro update systems -# audacity_checklib_libvorbis.m4 serial 3 +# audacity_checklib_libvorbis.m4 serial 4 AC_DEFUN([AUDACITY_CHECKLIB_LIBVORBIS], [ - - if false ; then - AC_DEFINE(USE_LIBVORBIS, 1, - [Define if the ogg vorbis decoding library is present]) - fi - AC_ARG_WITH(libvorbis, [AS_HELP_STRING([--with-libvorbis], [use libvorbis for Ogg Vorbis support])], @@ -19,23 +13,13 @@ AC_DEFUN([AUDACITY_CHECKLIB_LIBVORBIS], [ dnl See if Vorbis is installed in the system - AC_CHECK_LIB(vorbisfile, - vorbis_bitrate_addblock, - lib_found="yes", - lib_found="no", - -lvorbis -logg) + PKG_CHECK_MODULES(LIBVORBIS, vorbisenc vorbisfile, + LIBVORBIS_SYSTEM_AVAILABLE="yes", + LIBVORBIS_SYSTEM_AVAILABLE="no") - AC_CHECK_HEADER(vorbis/vorbisfile.h, - header_found="yes", - header_found="no") - - if test "x$lib_found" = "xyes" && test "x$header_found" = "xyes" ; then - LIBVORBIS_SYSTEM_AVAILABLE="yes" - LIBVORBIS_SYSTEM_LIBS="-lvorbisenc -lvorbisfile -lvorbis -logg" - LIBVORBIS_SYSTEM_CPPSYMBOLS="USE_LIBVORBIS" + if test "$LIBVORBIS_SYSTEM_AVAILABLE" = "yes"; then AC_MSG_NOTICE([Vorbis libraries are available as system libraries]) else - LIBVORBIS_SYSTEM_AVAILABLE="no" AC_MSG_NOTICE([Vorbis libraries are NOT available as system libraries]) fi @@ -49,20 +33,13 @@ AC_DEFUN([AUDACITY_CHECKLIB_LIBVORBIS], [ ogg_h_available="yes", ogg_h_available="no") - if test "x$vorbisenc_h_available" = "xyes" && test "x$ogg_h_available" = "xyes" ; then + if test "$vorbisenc_h_available" = "yes" -a "$ogg_h_available" = "yes"; then LIBVORBIS_LOCAL_AVAILABLE="yes" - LIBVORBIS_LOCAL_LIBS="libvorbisenc.a libvorbisfile.a libvorbis.a libogg.a" - - LIBVORBIS_LOCAL_CXXFLAGS='-I$(top_srcdir)/lib-src/libogg/include' - LIBVORBIS_LOCAL_CXXFLAGS="$LIBVORBIS_LOCAL_CXXFLAGS -I\$(top_srcdir)/lib-src/libvorbis/include" - - LIBVORBIS_LOCAL_CPPSYMBOLS="USE_LIBVORBIS" - dnl We need to override the pkg-config check for libogg by passing dnl OGG_CFLAGS and OGG_LIBS to the configure script of libvorbis. libogg_dir="$(pwd)/lib-src/libogg" - LIBVORBIS_LOCAL_CONFIGURE_ARGS="--disable-oggtest OGG_CFLAGS=-I${libogg_dir}/include OGG_LIBS=${libogg_dir}/src/.libs/libogg.a" + LIBVORBIS_LOCAL_CONFIGURE_ARGS="--disable-oggtest OGG_CFLAGS=-I${libogg_dir}/include OGG_LIBS=${libogg_dir}/src/libogg.la" dnl libflac needs libogg too. So we need to pass these flags to the dnl configure script of libflac, because it does not use pkg-config. @@ -75,8 +52,21 @@ AC_DEFUN([AUDACITY_CHECKLIB_LIBVORBIS], [ LIBVORBIS_MIMETYPES="application/ogg;audio/x-vorbis+ogg;" ]) -AC_DEFUN([AUDACITY_CONFIG_SUBDIRS_LIBVORBIS], [ +AC_DEFUN([AUDACITY_CONFIG_LIBVORBIS], [ if test "$LIBVORBIS_USE_LOCAL" = yes; then + LIBVORBIS_CFLAGS='-I$(top_srcdir)/lib-src/libogg/include -I$(top_srcdir)/lib-src/libvorbis/include' + LIBVORBIS_LIBS='$(top_builddir)/lib-src/libvorbis/lib/libvorbisenc.la $(top_builddir)/lib-src/libvorbis/lib/libvorbisfile.la' AC_CONFIG_SUBDIRS([lib-src/libogg lib-src/libvorbis]) fi + + AC_SUBST([LIBVORBIS_CFLAGS]) + AC_SUBST([LIBVORBIS_LIBS]) + + AM_CONDITIONAL([USE_LIBVORBIS], [test "$LIBVORBIS_USE_LOCAL" = yes -o "$LIBVORBIS_USE_SYSTEM" = yes]) + AM_CONDITIONAL([USE_LOCAL_LIBVORBIS], [test "$LIBVORBIS_USE_LOCAL" = yes]) + + if test "$LIBVORBIS_USE_LOCAL" = yes -o "$LIBVORBIS_USE_SYSTEM" = yes; then + AC_DEFINE(USE_LIBVORBIS, 1, + [Define if the ogg vorbis decoding library is present]) + fi ]) diff --git a/m4/audacity_checklib_lv2.m4 b/m4/audacity_checklib_lv2.m4 index c63dd260f..ba18542d5 100644 --- a/m4/audacity_checklib_lv2.m4 +++ b/m4/audacity_checklib_lv2.m4 @@ -1,6 +1,6 @@ dnl Please increment the serial number below whenever you alter this macro dnl for the benefit of automatic macro update systems -# audacity_checklib_lv2.m4 serial 1 +# audacity_checklib_lv2.m4 serial 2 AC_DEFUN([AUDACITY_CHECKLIB_LV2], [ @@ -10,54 +10,48 @@ AC_DEFUN([AUDACITY_CHECKLIB_LV2], [ LV2_ARGUMENT=$withval, LV2_ARGUMENT="unspecified") - if false ; then - AC_DEFINE(USE_LV2, 1, - [Define if LV2 support should be enabled]) - fi - dnl see if lv2 is installed on the system PKG_CHECK_MODULES(LV2, [lv2 lilv-0 >= 0.16], - lv2_available_system="yes", - lv2_available_system="no") + LV2_SYSTEM_AVAILABLE="yes", + LV2_SYSTEM_AVAILABLE="no") - if test "x$lv2_available_system" = "xyes" ; then - LV2_SYSTEM_AVAILABLE="yes" - LV2_SYSTEM_LIBS=$LV2_LIBS - LV2_SYSTEM_CXXFLAGS=$LV2_CFLAGS - LV2_SYSTEM_CPPSYMBOLS="USE_LV2" - LV2_SYSTEM_OPTOBJS="effects/lv2/LoadLV2.o effects/lv2/LV2Effect.o effects/lv2/LV2PortGroup.o" - + if test "$LV2_SYSTEM_AVAILABLE" = "yes"; then AC_MSG_NOTICE([LV2 libraries are available as system libraries]) else - LV2_SYSTEM_AVAILABLE="no" AC_MSG_NOTICE([LV2 libraries are NOT available as system libraries]) fi dnl see if LV2 is available locally AC_CHECK_FILE(${srcdir}/lib-src/lv2/configure, - lv2_configure_found="yes", - lv2_configure_found="no") - - if test "x$lv2_configure_found" = "xyes" ; then - LV2_LOCAL_AVAILABLE="yes" - LV2_LOCAL_LIBS="liblv2.a" - LV2_LOCAL_CXXFLAGS='-I$(top_srcdir)/lib-src/lv2/include' - LV2_LOCAL_CPPSYMBOLS="USE_LV2" - LV2_LOCAL_OPTOBJS="effects/lv2/LoadLV2.o effects/lv2/LV2Effect.o effects/lv2/LV2PortGroup.o" + LV2_LOCAL_AVAILABLE="yes", + LV2_LOCAL_AVAILABLE="no") + if test "$LV2_LOCAL_AVAILABLE" = "yes"; then AC_MSG_NOTICE([LV2 libraries are available in the local tree]) else - LV2_LOCAL_AVAILABLE="no" AC_MSG_NOTICE([LV2 libraries are NOT available in the local tree]) fi ]) -AC_DEFUN([AUDACITY_CONFIG_SUBDIRS_LV2], [ +AC_DEFUN([AUDACITY_CONFIG_LV2], [ if test "$LV2_USE_LOCAL" = yes; then + LV2_CFLAGS='-I$(top_srcdir)/lib-src/lv2/include' + LV2_LIBS='$(top_builddir)/lib-src/lv2/liblv2.a' AC_CONFIG_SUBDIRS([lib-src/lv2]) fi + + AC_SUBST([LV2_CFLAGS]) + AC_SUBST([LV2_LIBS]) + + AM_CONDITIONAL([USE_LV2], [test "$LV2_USE_LOCAL" = yes -o "$LV2_USE_SYSTEM" = yes]) + AM_CONDITIONAL([USE_LOCAL_LV2], [test "$LV2_USE_LOCAL" = yes]) + + if test "$LV2_USE_LOCAL" = yes -o "$LV2_USE_SYSTEM" = yes; then + AC_DEFINE(USE_LV2, 1, + [Define if LV2 support should be enabled]) + fi ]) diff --git a/m4/audacity_checklib_portaudio.m4 b/m4/audacity_checklib_portaudio.m4 index 7fc36d652..455d38b74 100644 --- a/m4/audacity_checklib_portaudio.m4 +++ b/m4/audacity_checklib_portaudio.m4 @@ -1,6 +1,6 @@ dnl Please increment the serial number below whenever you alter this macro dnl for the benefit of automatic macro update systems -# audacity_checklib_portaudio.m4 serial 1 +# audacity_checklib_portaudio.m4 serial 2 AC_DEFUN([AUDACITY_CHECKLIB_PORTAUDIO], [ AC_ARG_WITH(portaudio, @@ -11,53 +11,51 @@ AC_DEFUN([AUDACITY_CHECKLIB_PORTAUDIO], [ dnl see if portaudio is installed on the system PKG_CHECK_MODULES(PORTAUDIO, portaudio-2.0 >= 19, - portaudio_available_system="yes", - portaudio_available_system="no") + PORTAUDIO_SYSTEM_AVAILABLE="yes", + PORTAUDIO_SYSTEM_AVAILABLE="no") - if test "x$portaudio_available_system" = "xyes" ; then + if test "$PORTAUDIO_SYSTEM_AVAILABLE" = "yes"; then AC_EGREP_HEADER([Pa_GetStreamHostApiType], [portaudio.h], [have_portaudio_support=yes], [have_portaudio_support=no]) - if test "x$have_portaudio_support" = "xyes" ; then + if test "$have_portaudio_support" = "yes"; then PORTAUDIO_SYSTEM_AVAILABLE="yes" - PORTAUDIO_SYSTEM_LIBS=$PORTAUDIO_LIBS - PORTAUDIO_SYSTEM_CXXFLAGS=$PORTAUDIO_CFLAGS AC_MSG_NOTICE([portaudio19 library is available as system library]) else PORTAUDIO_SYSTEM_AVAILABLE="no" AC_MSG_NOTICE([portaudio19 library is available as system library, but does not have the Pa_GetStreamHostApiType function.]) fi else - PORTAUDIO_SYSTEM_AVAILABLE="no" AC_MSG_NOTICE([portaudio19 library is NOT available as system library]) fi dnl see if portaudio is available locally AC_CHECK_FILE(${srcdir}/lib-src/portaudio-v19/include/portaudio.h, - portaudio_h_found="yes", - portaudio_h_found="no") - - if test "x$portaudio_h_found" = "xyes" ; then - PORTAUDIO_LOCAL_AVAILABLE="yes" - PORTAUDIO_LOCAL_LIBS="libportaudio.a" - PORTAUDIO_LOCAL_CXXFLAGS='-I$(top_srcdir)/lib-src/portaudio-v19/include' + PORTAUDIO_LOCAL_AVAILABLE="yes", + PORTAUDIO_LOCAL_AVAILABLE="no") + if test "$PORTAUDIO_LOCAL_AVAILABLE" = "yes"; then dnl We need to override the pkg-config check for portmixer by passing dnl PORTAUDIO_CFLAGS and PORTAUDIO_LIBS to the configure script of portmixer. portaudio_dir="$(pwd)/lib-src/portaudio-v19" - PORTAUDIO_LOCAL_CONFIGURE_ARGS="PORTAUDIO_CFLAGS=-I${portaudio_dir}/include PORTAUDIO_LIBS=${portaudio_dir}/lib/.libs/libportaudio.a" - + PORTAUDIO_LOCAL_CONFIGURE_ARGS="PORTAUDIO_CFLAGS=-I${portaudio_dir}/include PORTAUDIO_LIBS=${portaudio_dir}/lib/libportaudio.la" AC_MSG_NOTICE([portaudio19 library is available in the local tree]) else - PORTAUDIO_LOCAL_AVAILABLE="no" AC_MSG_NOTICE([portaudio19 library is NOT available in the local tree]) fi ]) -AC_DEFUN([AUDACITY_CONFIG_SUBDIRS_PORTAUDIO], [ +AC_DEFUN([AUDACITY_CONFIG_PORTAUDIO], [ if test "$PORTAUDIO_USE_LOCAL" = yes; then + PORTAUDIO_CFLAGS='-I$(top_srcdir)/lib-src/portaudio-v19/include' + PORTAUDIO_LIBS='$(top_builddir)/lib-src/portaudio-v19/lib/libportaudio.la' AC_CONFIG_SUBDIRS([lib-src/portaudio-v19]) fi + + AC_SUBST([PORTAUDIO_CFLAGS]) + AC_SUBST([PORTAUDIO_LIBS]) + + AM_CONDITIONAL([USE_LOCAL_PORTAUDIO], [test "$PORTAUDIO_USE_LOCAL" = yes]) ]) diff --git a/m4/audacity_checklib_portsmf.m4 b/m4/audacity_checklib_portsmf.m4 index 6bc4dbc32..9c336d829 100644 --- a/m4/audacity_checklib_portsmf.m4 +++ b/m4/audacity_checklib_portsmf.m4 @@ -2,7 +2,7 @@ dnl Add Audacity / portSMF license? dnl dnl Please increment the serial number below whenever you alter this macro dnl for the benefit of automatic macro update systems -# audacity_checklib_portsmf.m4 serial 1 +# audacity_checklib_portsmf.m4 serial 2 AC_DEFUN([AUDACITY_CHECKLIB_PORTSMF], [ @@ -12,48 +12,44 @@ AC_DEFUN([AUDACITY_CHECKLIB_PORTSMF], [ PORTSMF_ARGUMENT=$withval, PORTSMF_ARGUMENT="unspecified") - if false ; then - AC_DEFINE(USE_MIDI, 1, - [Define if midi support should be enabled]) - fi - dnl see if libportsmf is installed on the system PKG_CHECK_MODULES(PORTSMF, portSMF, - portsmf_available_system="yes", - portsmf_available_system="no") + PORTSMF_SYSTEM_AVAILABLE="yes", + PORTSMF_SYSTEM_AVAILABLE="no") - if test "x$portsmf_available_system" = "xyes" ; then - PORTSMF_SYSTEM_AVAILABLE="yes" - PORTSMF_SYSTEM_LIBS="$PORTSMF_LIBS" - PORTSMF_SYSTEM_CXXFLAGS="$PORTSMF_CFLAGS" - PORTSMF_SYSTEM_CPPSYMBOLS="USE_MIDI" - dnl extra objects we can now compile - PORTSMF_SYSTEM_OPTOBJS="NoteTrack.o import/ImportMIDI.o" + if test "$PORTSMF_SYSTEM_AVAILABLE" = "yes"; then AC_MSG_NOTICE([portSMF library is available as system library]) else - PORTSMF_SYSTEM_AVAILABLE="no" AC_MSG_NOTICE([portSMF library is NOT available as system library]) fi AC_CHECK_FILE(${srcdir}/lib-src/portsmf/allegro.h, - allegro_h_available="yes", - allegro_h_available="no") + PORTSMF_LOCAL_AVAILABLE="yes", + PORTSMF_LOCAL_AVAILABLE="no") - if test "x$allegro_h_available" = "xyes" ; then - PORTSMF_LOCAL_AVAILABLE="yes" - PORTSMF_LOCAL_LIBS="libportSMF.a" - PORTSMF_LOCAL_CXXFLAGS='-I$(top_srcdir)/lib-src/portsmf' - PORTSMF_LOCAL_CPPSYMBOLS="USE_MIDI" - dnl extra objects we can now compile - PORTSMF_LOCAL_OPTOBJS="NoteTrack.o import/ImportMIDI.o" + if test "$PORTSMF_LOCAL_AVAILABLE" = "yes"; then + AC_MSG_NOTICE([portSMF library is available in the local tree]) else - PORTSMF_LOCAL_AVAILABLE="no" + AC_MSG_NOTICE([portSMF library is NOT available in the local tree]) fi ]) -AC_DEFUN([AUDACITY_CONFIG_SUBDIRS_PORTSMF], [ +AC_DEFUN([AUDACITY_CONFIG_PORTSMF], [ if test "$PORTSMF_USE_LOCAL" = yes; then + PORTSMF_CFLAGS='-I$(top_srcdir)/lib-src/portsmf' + PORTSMF_LIBS='$(top_builddir)/lib-src/portsmf/libportSMF.a' AC_CONFIG_SUBDIRS([lib-src/portsmf]) fi + + AC_SUBST([PORTSMF_CFLAGS]) + AC_SUBST([PORTSMF_LIBS]) + + AM_CONDITIONAL([USE_PORTSMF], [test "$PORTSMF_USE_LOCAL" = yes -o "$PORTSMF_USE_SYSTEM" = yes]) + AM_CONDITIONAL([USE_LOCAL_PORTSMF], [test "$PORTSMF_USE_LOCAL" = yes]) + + if test "$PORTSMF_USE_LOCAL" = yes -o "$PORTSMF_USE_SYSTEM" = yes; then + AC_DEFINE(USE_MIDI, 1, + [Define if midi support should be enabled]) + fi ]) diff --git a/m4/audacity_checklib_taglib.m4 b/m4/audacity_checklib_taglib.m4 index 52d4010c1..04760f95d 100644 --- a/m4/audacity_checklib_taglib.m4 +++ b/m4/audacity_checklib_taglib.m4 @@ -1,58 +1,55 @@ dnl add Audacity / TagLib license ? dnl Please increment the serial number below whenever you alter this macro dnl for the benefit of automatic macro update systems -# audacity_checklib_taglib.m4 serial 1 +# audacity_checklib_taglib.m4 serial 2 AC_DEFUN([AUDACITY_CHECKLIB_TAGLIB], [ - AC_ARG_WITH(taglib, + AC_ARG_WITH([taglib], [AS_HELP_STRING([--with-taglib], [use TagLib for metadata support ])], TAGLIB_ARGUMENT=$withval, TAGLIB_ARGUMENT="unspecified") - if false ; then - AC_DEFINE(USE_TAGLIB, 1, - [Define if TagLib (metadata export) support should be enabled]) - fi - dnl Check for a system copy of TagLib to use - PKG_CHECK_MODULES(TAGLIB, taglib >= 1.5, - taglib_available_system="yes", - taglib_available_system="no") + PKG_CHECK_MODULES([TAGLIB], [taglib >= 1.5], + [TAGLIB_SYSTEM_AVAILABLE="yes"], + [TAGLIB_SYSTEM_AVAILABLE="no"]) - if test "x$taglib_available_system" = "xyes" ; then - TAGLIB_SYSTEM_AVAILABLE="yes" - TAGLIB_SYSTEM_LIBS=$TAGLIB_LIBS - TAGLIB_SYSTEM_CXXFLAGS=$TAGLIB_CFLAGS - TAGLIB_SYSTEM_CPPSYMBOLS="USE_TAGLIB" + if test "$TAGLIB_SYSTEM_AVAILABLE" = "yes"; then AC_MSG_NOTICE([TagLib library available as system library]) else - TAGLIB_SYSTEM_AVAILABLE="no" AC_MSG_NOTICE([TagLib library NOT available as system library]) fi dnl see if TagLib is available locally - AC_CHECK_FILE(${srcdir}/lib-src/taglib/taglib/tag.h, - tag_h_found="yes", - tag_h_found="no") - - if test "x$tag_h_found" = "xyes" ; then - TAGLIB_LOCAL_AVAILABLE="yes" - TAGLIB_LOCAL_LIBS="taglib.a" - TAGLIB_LOCAL_CXXFLAGS='-I$(top_srcdir)/lib-src/taglib/taglib' - TAGLIB_LOCAL_CPPSYMBOLS="USE_TAGLIB" + AC_CHECK_FILE([${srcdir}/lib-src/taglib/taglib/tag.h], + [TAGLIB_LOCAL_AVAILABLE="yes"], + [TAGLIB_LOCAL_AVAILABLE="no"]) + if test "$TAGLIB_LOCAL_AVAILABLE" = "yes"; then AC_MSG_NOTICE([TagLib library is available in the local tree]) else - TAGLIB_LOCAL_AVAILABLE="no" AC_MSG_NOTICE([TagLib library is NOT available in the local tree]) fi ]) -AC_DEFUN([AUDACITY_CONFIG_SUBDIRS_TAGLIB], [ +AC_DEFUN([AUDACITY_CONFIG_TAGLIB], [ if test "$TAGLIB_USE_LOCAL" = yes; then + TAGLIB_CFLAGS='-I$(top_srcdir)/lib-src/taglib/taglib' + TAGLIB_LIBS='$(top_builddir)/lib-src/taglib/taglib/.libs/libtag.a' AC_CONFIG_SUBDIRS([lib-src/taglib]) fi + + AC_SUBST([TAGLIB_CFLAGS]) + AC_SUBST([TAGLIB_LIBS]) + + AM_CONDITIONAL([USE_TAGLIB], [test "$TAGLIB_USE_LOCAL" = yes -o "$TAGLIB_USE_SYSTEM" = yes]) + AM_CONDITIONAL([USE_LOCAL_TAGLIB], [test "$TAGLIB_USE_LOCAL" = yes]) + + if test "$TAGLIB_USE_LOCAL" = yes -o "$TAGLIB_USE_SYSTEM" = yes; then + AC_DEFINE(USE_TAGLIB, 1, + [Define if TagLib (metadata export) support should be enabled]) + fi ]) diff --git a/m4/audacity_checklib_widgetextra.m4 b/m4/audacity_checklib_widgetextra.m4 index 6f09d6132..4ef0f9774 100644 --- a/m4/audacity_checklib_widgetextra.m4 +++ b/m4/audacity_checklib_widgetextra.m4 @@ -1,7 +1,7 @@ dnl Add Audacity/WX license? dnl Please increment the serial number below whenever you alter this macro dnl for the benefit of automatic macro update systems -# audacity_checklib_widgetextra.m4 serial 2 +# audacity_checklib_widgetextra.m4 serial 3 dnl A function to check for the correct presence of lib-widget-extra in the dnl lib-src tree. Note that this is a mandatory library, and @@ -21,8 +21,6 @@ AC_DEFUN([AUDACITY_CHECKLIB_WIDGETEXTRA], [ WIDGETEXTRA_SYSTEM_AVAILABLE="no") if test "$WIDGETEXTRA_SYSTEM_AVAILABLE" = "yes"; then - WIDGETEXTRA_SYSTEM_LIBS=$WIDGETEXTRA_LIBS - WIDGETEXTRA_SYSTEM_CXXFLAGS=$WIDGETEXTRA_CFLAGS AC_MSG_NOTICE([libwidgetextra library is available as system library.]) else AC_MSG_NOTICE([libwidgetextra library is NOT available as system library.]) @@ -35,16 +33,21 @@ AC_DEFUN([AUDACITY_CHECKLIB_WIDGETEXTRA], [ WIDGETEXTRA_LOCAL_AVAILABLE="no") if test "$WIDGETEXTRA_LOCAL_AVAILABLE" = "yes"; then - WIDGETEXTRA_LOCAL_LIBS="libwidgetextra.a" - WIDGETEXTRA_LOCAL_CXXFLAGS='-I$(top_srcdir)/lib-src/lib-widget-extra' AC_MSG_NOTICE([libwidgetextra library is available in the local tree]) else AC_MSG_NOTICE([libwidgetextra library is NOT available in the local tree]) fi ]) -AC_DEFUN([AUDACITY_CONFIG_SUBDIRS_WIDGETEXTRA], [ +AC_DEFUN([AUDACITY_CONFIG_WIDGETEXTRA], [ if test "$WIDGETEXTRA_USE_LOCAL" = yes; then + WIDGETEXTRA_CFLAGS='-I$(top_srcdir)/lib-src/lib-widget-extra' + WIDGETEXTRA_LIBS='$(top_builddir)/lib-src/lib-widget-extra/libwidgetextra.la' AC_CONFIG_SUBDIRS([lib-src/lib-widget-extra]) fi + + AC_SUBST([WIDGETEXTRA_CFLAGS]) + AC_SUBST([WIDGETEXTRA_LIBS]) + + AM_CONDITIONAL([USE_LOCAL_WIDGETEXTRA], [test "$WIDGETEXTRA_USE_LOCAL" = yes]) ]) diff --git a/src/Makefile.am b/src/Makefile.am new file mode 100644 index 000000000..9b1efa40b --- /dev/null +++ b/src/Makefile.am @@ -0,0 +1,670 @@ +bin_PROGRAMS = audacity + +desktopdir = $(datadir)/applications +desktop_DATA = audacity.desktop + +mimedir = $(datarootdir)/mime/packages +dist_mime_DATA = audacity.xml + +check_LTLIBRARIES = libaudacity.la + +libaudacity_la_CPPFLAGS = $(WX_CXXFLAGS) +libaudacity_la_LIBADD = $(WX_LIBS) + +libaudacity_la_SOURCES = \ + BlockFile.cpp \ + BlockFile.h \ + DirManager.cpp \ + DirManager.h \ + Dither.cpp \ + Dither.h \ + FileFormats.cpp \ + FileFormats.h \ + Internat.cpp \ + Internat.h \ + Prefs.cpp \ + Prefs.h \ + SampleFormat.cpp \ + SampleFormat.h \ + Sequence.cpp \ + Sequence.h \ + blockfile/LegacyAliasBlockFile.cpp \ + blockfile/LegacyAliasBlockFile.h \ + blockfile/LegacyBlockFile.cpp \ + blockfile/LegacyBlockFile.h \ + blockfile/ODDecodeBlockFile.cpp \ + blockfile/ODDecodeBlockFile.h \ + blockfile/ODPCMAliasBlockFile.cpp \ + blockfile/ODPCMAliasBlockFile.h \ + blockfile/PCMAliasBlockFile.cpp \ + blockfile/PCMAliasBlockFile.h \ + blockfile/SilentBlockFile.cpp \ + blockfile/SilentBlockFile.h \ + blockfile/SimpleBlockFile.cpp \ + blockfile/SimpleBlockFile.h \ + xml/XMLTagHandler.cpp \ + xml/XMLTagHandler.h \ + $(NULL) + +audacity_CPPFLAGS = \ + -D__STDC_CONSTANT_MACROS \ + -DLIBDIR=\"$(libdir)\" \ + $(EXPAT_CFLAGS) \ + $(FILEDIALOG_CFLAGS) \ + $(PORTAUDIO_CFLAGS) \ + $(PORTMIXER_CFLAGS) \ + $(SNDFILE_CFLAGS) \ + $(WIDGETEXTRA_CFLAGS) \ + $(WX_CXXFLAGS) \ + $(NULL) + +audacity_LDADD = \ + $(EXPAT_LIBS) \ + $(FILEDIALOG_LIBS) \ + $(PORTAUDIO_LIBS) \ + $(PORTMIXER_LIBS) \ + $(SNDFILE_LIBS) \ + $(WIDGETEXTRA_LIBS) \ + $(WX_LIBS) \ + $(NULL) + +audacity_SOURCES = \ + $(libaudacity_la_SOURCES) \ + AboutDialog.cpp \ + AboutDialog.h \ + AColor.cpp \ + AColor.h \ + AllThemeResources.h \ + Audacity.h \ + AudacityApp.cpp \ + AudacityApp.h \ + AudacityLogger.cpp \ + AudacityLogger.h \ + AudioIO.cpp \ + AudioIO.h \ + AutoRecovery.cpp \ + AutoRecovery.h \ + BatchCommandDialog.cpp \ + BatchCommandDialog.h \ + BatchCommands.cpp \ + BatchCommands.h \ + BatchProcessDialog.cpp \ + BatchProcessDialog.h \ + Benchmark.cpp \ + Benchmark.h \ + CaptureEvents.cpp \ + CaptureEvents.h \ + Dependencies.cpp \ + Dependencies.h \ + DeviceManager.cpp \ + DeviceManager.h \ + Envelope.cpp \ + Envelope.h \ + Experimental.h \ + FFmpeg.cpp \ + FFmpeg.h \ + FFT.cpp \ + FFT.h \ + FileIO.cpp \ + FileIO.h \ + FileNames.cpp \ + FileNames.h \ + float_cast.h \ + FreqWindow.cpp \ + FreqWindow.h \ + HelpText.cpp \ + HelpText.h \ + HistoryWindow.cpp \ + HistoryWindow.h \ + ImageManipulation.cpp \ + ImageManipulation.h \ + InterpolateAudio.cpp \ + InterpolateAudio.h \ + LabelDialog.cpp \ + LabelDialog.h \ + LabelTrack.cpp \ + LabelTrack.h \ + LangChoice.cpp \ + LangChoice.h \ + Languages.cpp \ + Languages.h \ + Legacy.cpp \ + Legacy.h \ + LoadModules.cpp \ + LoadModules.h \ + Lyrics.cpp \ + Lyrics.h \ + LyricsWindow.cpp \ + LyricsWindow.h \ + MacroMagic.h \ + Matrix.cpp \ + Matrix.h \ + Menus.cpp \ + Menus.h \ + Mix.cpp \ + Mix.h \ + MixerBoard.cpp \ + MixerBoard.h \ + PitchName.cpp \ + PitchName.h \ + PlatformCompatibility.cpp \ + PlatformCompatibility.h \ + PluginManager.cpp \ + PluginManager.h \ + Printing.cpp \ + Printing.h \ + Profiler.cpp \ + Profiler.h \ + Project.cpp \ + Project.h \ + RealFFTf.cpp \ + RealFFTf.h \ + Resample.cpp \ + Resample.h \ + RingBuffer.cpp \ + RingBuffer.h \ + Screenshot.cpp \ + Screenshot.h \ + Shuttle.cpp \ + Shuttle.h \ + ShuttleGui.cpp \ + ShuttleGui.h \ + ShuttlePrefs.cpp \ + ShuttlePrefs.h \ + Snap.cpp \ + Snap.h \ + SoundActivatedRecord.cpp \ + SoundActivatedRecord.h \ + Spectrum.cpp \ + Spectrum.h \ + SplashDialog.cpp \ + SplashDialog.h \ + Tags.cpp \ + Tags.h \ + Theme.cpp \ + Theme.h \ + ThemeAsCeeCode.h \ + TimeDialog.cpp \ + TimeDialog.h \ + TimerRecordDialog.cpp \ + TimerRecordDialog.h \ + TimeTrack.cpp \ + TimeTrack.h \ + Track.cpp \ + Track.h \ + TrackArtist.cpp \ + TrackArtist.h \ + TrackPanel.cpp \ + TrackPanel.h \ + TrackPanelAx.cpp \ + TrackPanelAx.h \ + UndoManager.cpp \ + UndoManager.h \ + UploadDialog.cpp \ + UploadDialog.h \ + ViewInfo.h \ + VoiceKey.cpp \ + VoiceKey.h \ + WaveClip.cpp \ + WaveClip.h \ + WaveTrack.cpp \ + WaveTrack.h \ + WrappedType.cpp \ + WrappedType.h \ + commands/AppCommandEvent.cpp \ + commands/AppCommandEvent.h \ + commands/BatchEvalCommand.cpp \ + commands/BatchEvalCommand.h \ + commands/Command.cpp \ + commands/Command.h \ + commands/CommandBuilder.cpp \ + commands/CommandBuilder.h \ + commands/CommandDirectory.cpp \ + commands/CommandDirectory.h \ + commands/CommandHandler.cpp \ + commands/CommandHandler.h \ + commands/CommandManager.cpp \ + commands/CommandManager.h \ + commands/CommandMisc.h \ + commands/CommandSignature.cpp \ + commands/CommandSignature.h \ + commands/CommandTargets.h \ + commands/CommandType.cpp \ + commands/CommandType.h \ + commands/CompareAudioCommand.cpp \ + commands/CompareAudioCommand.h \ + commands/ExecMenuCommand.cpp \ + commands/ExecMenuCommand.h \ + commands/GetAllMenuCommands.cpp \ + commands/GetAllMenuCommands.h \ + commands/GetProjectInfoCommand.cpp \ + commands/GetProjectInfoCommand.h \ + commands/GetTrackInfoCommand.cpp \ + commands/GetTrackInfoCommand.h \ + commands/HelpCommand.cpp \ + commands/HelpCommand.h \ + commands/ImportExportCommands.cpp \ + commands/ImportExportCommands.h \ + commands/Keyboard.cpp \ + commands/Keyboard.h \ + commands/MessageCommand.cpp \ + commands/MessageCommand.h \ + commands/PreferenceCommands.cpp \ + commands/PreferenceCommands.h \ + commands/ResponseQueue.cpp \ + commands/ResponseQueue.h \ + commands/ScreenshotCommand.cpp \ + commands/ScreenshotCommand.h \ + commands/ScriptCommandRelay.cpp \ + commands/ScriptCommandRelay.h \ + commands/SelectCommand.cpp \ + commands/SelectCommand.h \ + commands/SetProjectInfoCommand.cpp \ + commands/SetProjectInfoCommand.h \ + commands/SetTrackInfoCommand.cpp \ + commands/SetTrackInfoCommand.h \ + commands/Validators.h \ + effects/Amplify.cpp \ + effects/Amplify.h \ + effects/AutoDuck.cpp \ + effects/AutoDuck.h \ + effects/BassTreble.cpp \ + effects/BassTreble.h \ + effects/Biquad.cpp \ + effects/Biquad.h \ + effects/ChangePitch.cpp \ + effects/ChangePitch.h \ + effects/ChangeSpeed.cpp \ + effects/ChangeSpeed.h \ + effects/ChangeTempo.cpp \ + effects/ChangeTempo.h \ + effects/ClickRemoval.cpp \ + effects/ClickRemoval.h \ + effects/Compressor.cpp \ + effects/Compressor.h \ + effects/Contrast.cpp \ + effects/Contrast.h \ + effects/DtmfGen.cpp \ + effects/DtmfGen.h \ + effects/Echo.cpp \ + effects/Echo.h \ + effects/Effect.cpp \ + effects/Effect.h \ + effects/EffectCategory.cpp \ + effects/EffectCategory.h \ + effects/EffectManager.cpp \ + effects/EffectManager.h \ + effects/Equalization.cpp \ + effects/Equalization.h \ + effects/Fade.cpp \ + effects/Fade.h \ + effects/FindClipping.cpp \ + effects/FindClipping.h \ + effects/Generator.cpp \ + effects/Generator.h \ + effects/Invert.cpp \ + effects/Invert.h \ + effects/Leveller.cpp \ + effects/Leveller.h \ + effects/LoadEffects.cpp \ + effects/LoadEffects.h \ + effects/Noise.cpp \ + effects/Noise.h \ + effects/NoiseRemoval.cpp \ + effects/NoiseRemoval.h \ + effects/Normalize.cpp \ + effects/Normalize.h \ + effects/Paulstretch.cpp \ + effects/Paulstretch.h \ + effects/Phaser.cpp \ + effects/Phaser.h \ + effects/Repair.cpp \ + effects/Repair.h \ + effects/Repeat.cpp \ + effects/Repeat.h \ + effects/Reverb.cpp \ + effects/Reverb.h \ + effects/Reverb_libSoX.h \ + effects/Reverse.cpp \ + effects/Reverse.h \ + effects/SBSMSEffect.cpp \ + effects/SBSMSEffect.h \ + effects/ScienFilter.cpp \ + effects/ScienFilter.h \ + effects/Silence.cpp \ + effects/Silence.h \ + effects/SimpleMono.cpp \ + effects/SimpleMono.h \ + effects/SoundTouchEffect.cpp \ + effects/SoundTouchEffect.h \ + effects/StereoToMono.cpp \ + effects/StereoToMono.h \ + effects/TimeScale.cpp \ + effects/TimeScale.h \ + effects/TimeWarper.cpp \ + effects/TimeWarper.h \ + effects/ToneGen.cpp \ + effects/ToneGen.h \ + effects/TruncSilence.cpp \ + effects/TruncSilence.h \ + effects/TwoPassSimpleMono.cpp \ + effects/TwoPassSimpleMono.h \ + effects/Wahwah.cpp \ + effects/Wahwah.h \ + effects/VST/aeffectx.h \ + effects/VST/VSTEffect.cpp \ + effects/VST/VSTEffect.h \ + export/Export.cpp \ + export/Export.h \ + export/ExportCL.cpp \ + export/ExportCL.h \ + export/ExportFLAC.cpp \ + export/ExportFLAC.h \ + export/ExportMP2.cpp \ + export/ExportMP2.h \ + export/ExportMP3.cpp \ + export/ExportMP3.h \ + export/ExportMultiple.cpp \ + export/ExportMultiple.h \ + export/ExportOGG.cpp \ + export/ExportOGG.h \ + export/ExportPCM.cpp \ + export/ExportPCM.h \ + import/Import.cpp \ + import/Import.h \ + import/ImportFLAC.cpp \ + import/ImportFLAC.h \ + import/ImportLOF.cpp \ + import/ImportLOF.h \ + import/ImportMP3.cpp \ + import/ImportMP3.h \ + import/ImportOGG.cpp \ + import/ImportOGG.h \ + import/ImportPCM.cpp \ + import/ImportPCM.h \ + import/ImportPlugin.h \ + import/ImportRaw.cpp \ + import/ImportRaw.h \ + import/RawAudioGuess.cpp \ + import/RawAudioGuess.h \ + ondemand/ODComputeSummaryTask.cpp \ + ondemand/ODComputeSummaryTask.h \ + ondemand/ODDecodeFFmpegTask.cpp \ + ondemand/ODDecodeFFmpegTask.h \ + ondemand/ODDecodeTask.cpp \ + ondemand/ODDecodeTask.h \ + ondemand/ODManager.cpp \ + ondemand/ODManager.h \ + ondemand/ODTask.cpp \ + ondemand/ODTask.h \ + ondemand/ODTaskThread.cpp \ + ondemand/ODTaskThread.h \ + ondemand/ODWaveTrackTaskQueue.cpp \ + ondemand/ODWaveTrackTaskQueue.h \ + prefs/BatchPrefs.cpp \ + prefs/BatchPrefs.h \ + prefs/DevicePrefs.cpp \ + prefs/DevicePrefs.h \ + prefs/DirectoriesPrefs.cpp \ + prefs/DirectoriesPrefs.h \ + prefs/EffectsPrefs.cpp \ + prefs/EffectsPrefs.h \ + prefs/ExtImportPrefs.cpp \ + prefs/ExtImportPrefs.h \ + prefs/GUIPrefs.cpp \ + prefs/GUIPrefs.h \ + prefs/ImportExportPrefs.cpp \ + prefs/ImportExportPrefs.h \ + prefs/KeyConfigPrefs.cpp \ + prefs/KeyConfigPrefs.h \ + prefs/LibraryPrefs.cpp \ + prefs/LibraryPrefs.h \ + prefs/MidiIOPrefs.cpp \ + prefs/MidiIOPrefs.h \ + prefs/ModulePrefs.cpp \ + prefs/ModulePrefs.h \ + prefs/MousePrefs.cpp \ + prefs/MousePrefs.h \ + prefs/PlaybackPrefs.cpp \ + prefs/PlaybackPrefs.h \ + prefs/PrefsDialog.cpp \ + prefs/PrefsDialog.h \ + prefs/PrefsPanel.h \ + prefs/ProjectsPrefs.cpp \ + prefs/ProjectsPrefs.h \ + prefs/QualityPrefs.cpp \ + prefs/QualityPrefs.h \ + prefs/RecordingPrefs.cpp \ + prefs/RecordingPrefs.h \ + prefs/SpectrumPrefs.cpp \ + prefs/SpectrumPrefs.h \ + prefs/ThemePrefs.cpp \ + prefs/ThemePrefs.h \ + prefs/TracksPrefs.cpp \ + prefs/TracksPrefs.h \ + prefs/WarningsPrefs.cpp \ + prefs/WarningsPrefs.h \ + toolbars/ControlToolBar.cpp \ + toolbars/ControlToolBar.h \ + toolbars/DeviceToolBar.cpp \ + toolbars/DeviceToolBar.h \ + toolbars/EditToolBar.cpp \ + toolbars/EditToolBar.h \ + toolbars/MeterToolBar.cpp \ + toolbars/MeterToolBar.h \ + toolbars/MixerToolBar.cpp \ + toolbars/MixerToolBar.h \ + toolbars/SelectionBar.cpp \ + toolbars/SelectionBar.h \ + toolbars/ToolBar.cpp \ + toolbars/ToolBar.h \ + toolbars/ToolDock.cpp \ + toolbars/ToolDock.h \ + toolbars/ToolManager.cpp \ + toolbars/ToolManager.h \ + toolbars/ToolsToolBar.cpp \ + toolbars/ToolsToolBar.h \ + toolbars/TranscriptionToolBar.cpp \ + toolbars/TranscriptionToolBar.h \ + widgets/AButton.cpp \ + widgets/AButton.h \ + widgets/ASlider.cpp \ + widgets/ASlider.h \ + widgets/AttachableScrollBar.cpp \ + widgets/AttachableScrollBar.h \ + widgets/ErrorDialog.cpp \ + widgets/ErrorDialog.h \ + widgets/ExpandingToolBar.cpp \ + widgets/ExpandingToolBar.h \ + widgets/FileHistory.cpp \ + widgets/FileHistory.h \ + widgets/Grabber.cpp \ + widgets/Grabber.h \ + widgets/Grid.cpp \ + widgets/Grid.h \ + widgets/HtmlWindow.cpp \ + widgets/HtmlWindow.h \ + widgets/ImageRoll.cpp \ + widgets/ImageRoll.h \ + widgets/KeyView.cpp \ + widgets/KeyView.h \ + widgets/LinkingHtmlWindow.cpp \ + widgets/LinkingHtmlWindow.h \ + widgets/Meter.cpp \ + widgets/Meter.h \ + widgets/MultiDialog.cpp \ + widgets/MultiDialog.h \ + widgets/numformatter.cpp \ + widgets/numformatter.h \ + widgets/ProgressDialog.cpp \ + widgets/ProgressDialog.h \ + widgets/Ruler.cpp \ + widgets/Ruler.h \ + widgets/TimeTextCtrl.cpp \ + widgets/TimeTextCtrl.h \ + widgets/valnum.cpp \ + widgets/valnum.h \ + widgets/Warning.cpp \ + widgets/Warning.h \ + xml/XMLFileReader.cpp \ + xml/XMLFileReader.h \ + xml/XMLWriter.cpp \ + xml/XMLWriter.h \ + $(NULL) + +if USE_AUDIO_UNITS +audacity_CPPFLAGS += $(AUDIOUNITS_CFLAGS) +audacity_LDADD += $(AUDIOUNITS_LIBS) +audacity_SOURCES += \ + effects/audiounits/LoadAudioUnits.cpp \ + effects/audiounits/LoadAudioUnits.h \ + effects/audiounits/AudioUnitEffect.cpp \ + effects/audiounits/AudioUnitEffect.h \ + $(NULL) +endif + +if USE_FFMPEG +audacity_CPPFLAGS += $(FFMPEG_CFLAGS) +audacity_LDADD += $(FFMPEG_LIBS) +audacity_SOURCES += \ + export/ExportFFmpeg.cpp \ + export/ExportFFmpeg.h \ + export/ExportFFmpegDialogs.cpp \ + export/ExportFFmpegDialogs.h \ + import/ImportFFmpeg.cpp \ + import/ImportFFmpeg.h \ + $(NULL) +endif + +if USE_LADSPA +audacity_CPPFLAGS += $(LADSPA_CFLAGS) +audacity_LDADD += $(LADSPA_LIBS) +audacity_SOURCES += \ + effects/ladspa/ladspa.h \ + effects/ladspa/LadspaEffect.cpp \ + effects/ladspa/LadspaEffect.h \ + effects/ladspa/LoadLadspa.cpp \ + effects/ladspa/LoadLadspa.h \ + $(NULL) +endif + +if USE_LAME +audacity_CPPFLAGS += $(LAME_CFLAGS) +audacity_LDADD += $(LAME_LIBS) +endif + +if USE_LIBFLAC +audacity_CPPFLAGS += $(FLAC_CFLAGS) +audacity_LDADD += $(FLAC_LIBS) +audacity_SOURCES += \ + ondemand/ODDecodeFlacTask.cpp \ + ondemand/ODDecodeFlacTask.h \ + $(NULL) +endif + +if USE_LIBID3TAG +audacity_CPPFLAGS += $(ID3TAG_CFLAGS) +audacity_LDADD += $(ID3TAG_LIBS) +endif + +if USE_LIBMAD +audacity_CPPFLAGS += $(LIBMAD_CFLAGS) +audacity_LDADD += $(LIBMAD_LIBS) +endif + +if USE_LIBNYQUIST +audacity_CPPFLAGS += $(LIBNYQUIST_CFLAGS) +audacity_LDADD += $(LIBNYQUIST_LIBS) +audacity_SOURCES += \ + effects/nyquist/LoadNyquist.cpp \ + effects/nyquist/LoadNyquist.h \ + effects/nyquist/Nyquist.cpp \ + effects/nyquist/Nyquist.h \ + $(NULL) +endif + +if USE_LIBSOUNDTOUCH +audacity_CPPFLAGS += $(SOUNDTOUCH_CFLAGS) +audacity_LDADD += $(SOUNDTOUCH_LIBS) +endif + +if USE_LIBSOXR +audacity_CPPFLAGS += $(SOXR_CFLAGS) +audacity_LDADD += $(SOXR_LIBS) +endif + +if USE_LIBTWOLAME +audacity_CPPFLAGS += $(LIBTWOLAME_CFLAGS) +audacity_LDADD += $(LIBTWOLAME_LIBS) +endif + +if USE_LIBVORBIS +audacity_CPPFLAGS += $(LIBVORBIS_CFLAGS) +audacity_LDADD += $(LIBVORBIS_LIBS) +endif + +if USE_LV2 +audacity_CPPFLAGS += $(LV2_CFLAGS) +audacity_LDADD += $(LV2_LIBS) +audacity_SOURCES += \ + effects/lv2/LoadLV2.cpp \ + effects/lv2/LoadLV2.h \ + effects/lv2/LV2Effect.cpp \ + effects/lv2/LV2Effect.h \ + effects/lv2/lv2_event.h \ + effects/lv2/lv2_event_helpers.h \ + effects/lv2/LV2PortGroup.cpp \ + effects/lv2/LV2PortGroup.h \ + effects/lv2/lv2_uri_map.h \ + $(NULL) +endif + +if USE_PORTSMF +audacity_CPPFLAGS += $(PORTSMF_CFLAGS) +audacity_LDADD += $(PORTSMF_LIBS) +audacity_SOURCES += \ + NoteTrack.cpp \ + NoteTrack.h \ + import/ImportMIDI.cpp \ + import/ImportMIDI.h \ + $(NULL) +endif + +if USE_QUICKTIME +audacity_CPPFLAGS += $(QUICKTIME_CFLAGS) +audacity_LDADD += $(QUICKTIME_LIBS) +audacity_SOURCES += \ + import/ImportQT.cpp \ + import/ImportQT.h \ + $(NULL) +endif + +if USE_SBSMS +audacity_CPPFLAGS += $(SBSMS_CFLAGS) +audacity_LDADD += $(SBSMS_LIBS) +endif + +if USE_VAMP +audacity_CPPFLAGS += $(VAMP_CFLAGS) +audacity_LDADD += $(VAMP_LIBS) +audacity_SOURCES += \ + effects/vamp/LoadVamp.cpp \ + effects/vamp/LoadVamp.h \ + effects/vamp/VampEffect.cpp \ + effects/vamp/VampEffect.h \ + $(NULL) +endif + +# TODO: Check *.cpp and *.h files if they are needed. +EXTRA_DIST = audacity.desktop.in xml/audacityproject.dtd \ + AudacityHeaders.cpp \ + AudacityHeaders.h \ + CrossFade.cpp \ + CrossFade.h \ + GStreamerLoader.cpp \ + GStreamerLoader.h \ + effects/ScoreAlignDialog.cpp \ + effects/ScoreAlignDialog.h \ + import/ImportGStreamer.cpp \ + import/ImportGStreamer.h \ + $(NULL) diff --git a/src/configtemplate.h b/src/configtemplate.h index 77b986304..a5c5905a9 100644 --- a/src/configtemplate.h +++ b/src/configtemplate.h @@ -13,18 +13,43 @@ /* Define if LAME should be linked at compile time */ #undef DISABLE_DYNAMIC_LOADING_LAME +/* Define to 1 if translation of program messages to the user's native + language is requested. */ +#undef ENABLE_NLS + /* Define to enable sse */ #undef ENABLE_SSE /* Define to 1 if you have the header file. */ #undef HAVE_ALLOCA_H +/* Define to 1 if you have the MacOS X function CFLocaleCopyCurrent in the + CoreFoundation framework. */ +#undef HAVE_CFLOCALECOPYCURRENT + +/* Define to 1 if you have the MacOS X function CFPreferencesCopyAppValue in + the CoreFoundation framework. */ +#undef HAVE_CFPREFERENCESCOPYAPPVALUE + /* Define to 1 if you have the `clock_gettime' function. */ #undef HAVE_CLOCK_GETTIME +/* Define if the GNU dcgettext() function is already present or preinstalled. + */ +#undef HAVE_DCGETTEXT + +/* Define to 1 if you have the header file. */ +#undef HAVE_DLFCN_H + +/* Define if the GNU gettext() function is already present or preinstalled. */ +#undef HAVE_GETTEXT + /* Define if GTK is available */ #undef HAVE_GTK +/* Define if you have the iconv() function and it works. */ +#undef HAVE_ICONV + /* Define to 1 if you have the header file. */ #undef HAVE_INTTYPES_H @@ -68,6 +93,13 @@ /* define as prefix where Audacity is installed */ #undef INSTALL_PREFIX +/* Define to the sub-directory in which libtool stores uninstalled libraries. + */ +#undef LT_OBJDIR + +/* Name of package */ +#undef PACKAGE + /* Define to the address where bug reports for this package should be sent. */ #undef PACKAGE_BUGREPORT @@ -147,6 +179,9 @@ /* Define if Vamp analysis plugin support should be enabled */ #undef USE_VAMP +/* Version number of package */ +#undef VERSION + /* Placeholder for large file support */ #undef _FILE_OFFSET_BITS diff --git a/tests/Makefile.am b/tests/Makefile.am new file mode 100644 index 000000000..557df3f76 --- /dev/null +++ b/tests/Makefile.am @@ -0,0 +1,23 @@ +check_PROGRAMS = SequenceTest SimpleBlockFileTest + +SequenceTest_CPPFLAGS = $(WX_CXXFLAGS) +SequenceTest_LDADD = $(top_srcdir)/src/libaudacity.la $(WX_LIBS) +SequenceTest_SOURCES = SequenceTest.cpp + +SimpleBlockFileTest_CPPFLAGS = $(WX_CXXFLAGS) +SimpleBlockFileTest_LDADD = $(top_srcdir)/src/libaudacity.la $(WX_LIBS) +SimpleBlockFileTest_SOURCES = SimpleBlockFileTest.cpp + +TESTS = $(check_PROGRAMS) + +EXTRA_DIST = \ + ProjectCheckTests/missing_aliased_and_auf_files_data/e00/d00 \ + ProjectCheckTests/missing_blockfile_data \ + ProjectCheckTests/orphaned_blockfiles_data/e00/d00/e000055a.au \ + ProjectCheckTests/orphaned_blockfiles_data/e00/d00/orphan1.au \ + ProjectCheckTests/orphaned_blockfiles_data/e00/d00/orphan2.au \ + ProjectCheckTests/missing_aliased_and_auf_files.aup \ + ProjectCheckTests/missing_blockfile.aup \ + ProjectCheckTests/orphaned_blockfiles.aup \ + ProjectCheckTests/readme.txt \ + $(NULL)