From 6f3aad2fe051577794857319f1a3783964e55a4c Mon Sep 17 00:00:00 2001 From: Steve Daulton Date: Wed, 23 Nov 2016 17:49:35 +0000 Subject: [PATCH] Update for Sample Data Import Makefile updated for Linux build --- Makefile.am | 1 + Makefile.in | 17 +++++++++++++++-- help/Makefile.in | 16 ++++++++++++++-- images/Makefile.in | 16 ++++++++++++++-- lib-src/Makefile.in | 16 ++++++++++++++-- plug-ins/sample-data-import.ny | 22 +++++++++++++--------- src/Makefile.in | 22 ++++++++++++++++++---- tests/Makefile.in | 16 ++++++++++++++-- 8 files changed, 103 insertions(+), 23 deletions(-) diff --git a/Makefile.am b/Makefile.am index daa3b404d..11482a879 100644 --- a/Makefile.am +++ b/Makefile.am @@ -73,6 +73,7 @@ nobase_dist_pkgdata_DATA = \ plug-ins/rhythmtrack.ny \ plug-ins/rissetdrum.ny \ plug-ins/sample-data-export.ny \ + plug-ins/sample-data-import.ny \ plug-ins/SilenceMarker.ny \ plug-ins/SoundFinder.ny \ plug-ins/SpectralEditMulti.ny \ diff --git a/Makefile.in b/Makefile.in index 484120405..90ffb523d 100644 --- a/Makefile.in +++ b/Makefile.in @@ -129,8 +129,9 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ac_c99_func_lrint.m4 \ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \ - $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \ - $(top_srcdir)/m4/visibility.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/po.m4 \ + $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/visibility.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ @@ -307,6 +308,12 @@ AUDACITY_NAME = @AUDACITY_NAME@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ +AVCODEC_CFLAGS = @AVCODEC_CFLAGS@ +AVCODEC_LIBS = @AVCODEC_LIBS@ +AVFORMAT_CFLAGS = @AVFORMAT_CFLAGS@ +AVFORMAT_LIBS = @AVFORMAT_LIBS@ +AVUTIL_CFLAGS = @AVUTIL_CFLAGS@ +AVUTIL_LIBS = @AVUTIL_LIBS@ AWK = @AWK@ BUILD_LDFLAGS = @BUILD_LDFLAGS@ CC = @CC@ @@ -347,6 +354,8 @@ GMSGFMT_015 = @GMSGFMT_015@ GREP = @GREP@ GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@ GSTREAMER_LIBS = @GSTREAMER_LIBS@ +GTK_CFLAGS = @GTK_CFLAGS@ +GTK_LIBS = @GTK_LIBS@ HAVE_GTK = @HAVE_GTK@ HAVE_PKG_CONFIG = @HAVE_PKG_CONFIG@ HAVE_VISIBILITY = @HAVE_VISIBILITY@ @@ -360,6 +369,8 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INTLLIBS = @INTLLIBS@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@ +JACK_CFLAGS = @JACK_CFLAGS@ +JACK_LIBS = @JACK_LIBS@ LAME_CFLAGS = @LAME_CFLAGS@ LAME_LIBS = @LAME_LIBS@ LD = @LD@ @@ -406,6 +417,7 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ +PKG_CONFIG = @PKG_CONFIG@ PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@ PORTAUDIO_LIBS = @PORTAUDIO_LIBS@ PORTMIXER_LIBS = @PORTMIXER_LIBS@ @@ -563,6 +575,7 @@ nobase_dist_pkgdata_DATA = \ plug-ins/rhythmtrack.ny \ plug-ins/rissetdrum.ny \ plug-ins/sample-data-export.ny \ + plug-ins/sample-data-import.ny \ plug-ins/SilenceMarker.ny \ plug-ins/SoundFinder.ny \ plug-ins/SpectralEditMulti.ny \ diff --git a/help/Makefile.in b/help/Makefile.in index c04f41ec0..527156799 100644 --- a/help/Makefile.in +++ b/help/Makefile.in @@ -116,8 +116,9 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ac_c99_func_lrint.m4 \ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \ - $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \ - $(top_srcdir)/m4/visibility.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/po.m4 \ + $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/visibility.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -186,6 +187,12 @@ AUDACITY_NAME = @AUDACITY_NAME@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ +AVCODEC_CFLAGS = @AVCODEC_CFLAGS@ +AVCODEC_LIBS = @AVCODEC_LIBS@ +AVFORMAT_CFLAGS = @AVFORMAT_CFLAGS@ +AVFORMAT_LIBS = @AVFORMAT_LIBS@ +AVUTIL_CFLAGS = @AVUTIL_CFLAGS@ +AVUTIL_LIBS = @AVUTIL_LIBS@ AWK = @AWK@ BUILD_LDFLAGS = @BUILD_LDFLAGS@ CC = @CC@ @@ -226,6 +233,8 @@ GMSGFMT_015 = @GMSGFMT_015@ GREP = @GREP@ GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@ GSTREAMER_LIBS = @GSTREAMER_LIBS@ +GTK_CFLAGS = @GTK_CFLAGS@ +GTK_LIBS = @GTK_LIBS@ HAVE_GTK = @HAVE_GTK@ HAVE_PKG_CONFIG = @HAVE_PKG_CONFIG@ HAVE_VISIBILITY = @HAVE_VISIBILITY@ @@ -239,6 +248,8 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INTLLIBS = @INTLLIBS@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@ +JACK_CFLAGS = @JACK_CFLAGS@ +JACK_LIBS = @JACK_LIBS@ LAME_CFLAGS = @LAME_CFLAGS@ LAME_LIBS = @LAME_LIBS@ LD = @LD@ @@ -285,6 +296,7 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ +PKG_CONFIG = @PKG_CONFIG@ PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@ PORTAUDIO_LIBS = @PORTAUDIO_LIBS@ PORTMIXER_LIBS = @PORTMIXER_LIBS@ diff --git a/images/Makefile.in b/images/Makefile.in index cbe5db54d..c8c7bdf5d 100644 --- a/images/Makefile.in +++ b/images/Makefile.in @@ -118,8 +118,9 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ac_c99_func_lrint.m4 \ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \ - $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \ - $(top_srcdir)/m4/visibility.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/po.m4 \ + $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/visibility.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -190,6 +191,12 @@ AUDACITY_NAME = @AUDACITY_NAME@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ +AVCODEC_CFLAGS = @AVCODEC_CFLAGS@ +AVCODEC_LIBS = @AVCODEC_LIBS@ +AVFORMAT_CFLAGS = @AVFORMAT_CFLAGS@ +AVFORMAT_LIBS = @AVFORMAT_LIBS@ +AVUTIL_CFLAGS = @AVUTIL_CFLAGS@ +AVUTIL_LIBS = @AVUTIL_LIBS@ AWK = @AWK@ BUILD_LDFLAGS = @BUILD_LDFLAGS@ CC = @CC@ @@ -230,6 +237,8 @@ GMSGFMT_015 = @GMSGFMT_015@ GREP = @GREP@ GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@ GSTREAMER_LIBS = @GSTREAMER_LIBS@ +GTK_CFLAGS = @GTK_CFLAGS@ +GTK_LIBS = @GTK_LIBS@ HAVE_GTK = @HAVE_GTK@ HAVE_PKG_CONFIG = @HAVE_PKG_CONFIG@ HAVE_VISIBILITY = @HAVE_VISIBILITY@ @@ -243,6 +252,8 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INTLLIBS = @INTLLIBS@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@ +JACK_CFLAGS = @JACK_CFLAGS@ +JACK_LIBS = @JACK_LIBS@ LAME_CFLAGS = @LAME_CFLAGS@ LAME_LIBS = @LAME_LIBS@ LD = @LD@ @@ -289,6 +300,7 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ +PKG_CONFIG = @PKG_CONFIG@ PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@ PORTAUDIO_LIBS = @PORTAUDIO_LIBS@ PORTMIXER_LIBS = @PORTMIXER_LIBS@ diff --git a/lib-src/Makefile.in b/lib-src/Makefile.in index bcefd8f94..e5f363a97 100644 --- a/lib-src/Makefile.in +++ b/lib-src/Makefile.in @@ -134,8 +134,9 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ac_c99_func_lrint.m4 \ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \ - $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \ - $(top_srcdir)/m4/visibility.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/po.m4 \ + $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/visibility.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -231,6 +232,12 @@ AUDACITY_NAME = @AUDACITY_NAME@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ +AVCODEC_CFLAGS = @AVCODEC_CFLAGS@ +AVCODEC_LIBS = @AVCODEC_LIBS@ +AVFORMAT_CFLAGS = @AVFORMAT_CFLAGS@ +AVFORMAT_LIBS = @AVFORMAT_LIBS@ +AVUTIL_CFLAGS = @AVUTIL_CFLAGS@ +AVUTIL_LIBS = @AVUTIL_LIBS@ AWK = @AWK@ BUILD_LDFLAGS = @BUILD_LDFLAGS@ CC = @CC@ @@ -271,6 +278,8 @@ GMSGFMT_015 = @GMSGFMT_015@ GREP = @GREP@ GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@ GSTREAMER_LIBS = @GSTREAMER_LIBS@ +GTK_CFLAGS = @GTK_CFLAGS@ +GTK_LIBS = @GTK_LIBS@ HAVE_GTK = @HAVE_GTK@ HAVE_PKG_CONFIG = @HAVE_PKG_CONFIG@ HAVE_VISIBILITY = @HAVE_VISIBILITY@ @@ -284,6 +293,8 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INTLLIBS = @INTLLIBS@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@ +JACK_CFLAGS = @JACK_CFLAGS@ +JACK_LIBS = @JACK_LIBS@ LAME_CFLAGS = @LAME_CFLAGS@ LAME_LIBS = @LAME_LIBS@ LD = @LD@ @@ -330,6 +341,7 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ +PKG_CONFIG = @PKG_CONFIG@ PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@ PORTAUDIO_LIBS = @PORTAUDIO_LIBS@ PORTMIXER_LIBS = @PORTMIXER_LIBS@ diff --git a/plug-ins/sample-data-import.ny b/plug-ins/sample-data-import.ny index 018a38e0c..f48ef5620 100644 --- a/plug-ins/sample-data-import.ny +++ b/plug-ins/sample-data-import.ny @@ -27,11 +27,10 @@ ;; be separated by spaces, tabs or line-breaks. ;; The file name must have a '.txt' file extension. ;; -;; *** WARNING *** -;; Nyquist is not able to safely determine character -;; encoding. Attempting to import data from a file that -;; is not plain ASCII text is NOT SUPPORTED and may -;; cause Audacity to crash. +;; *** ATTENTION *** +;; The file to be imported must contain +;; plain ASCII text only. +;; Files other than plain ASCII text are NOT SUPPORTED. ;; *************** ;; ;; Depending on the computer file system, the file name @@ -138,11 +137,16 @@ '~a~a~a' could not be opened.~%~ Check that file exists." path *file-separator* fname))) - ; File opened OK, so close it and return 'true' - (t (close fstream) + ; File opened OK, so check for normal ASCII, then close it and return 'true' + (t (do ((j 0 (1+ j))(b (read-byte fstream)(read-byte fstream))) + ((or (> j 100000)(not b))) + (when (> b 127) + (throw 'err (format nil "Error:~%~ + The file must contain only plain ASCII text.~%~ + (Invalid byte '~a' at byte number: ~a)" b (1+ j) )))) + (close fstream) t)))) - ;; ':new' creates a new class 'streamreader' ;; 'filestream' and 'chanel' are its instance variables. ;; (every objet of class 'streamreader' has it's own @@ -209,4 +213,4 @@ (close stream) audio-out)) -(catch 'err (sound-from-file filename)) \ No newline at end of file +(catch 'err (sound-from-file filename)) diff --git a/src/Makefile.in b/src/Makefile.in index 06fbaaf21..f8e1c1dad 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -226,8 +226,9 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ac_c99_func_lrint.m4 \ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \ - $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \ - $(top_srcdir)/m4/visibility.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/po.m4 \ + $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/visibility.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -387,7 +388,8 @@ am__audacity_SOURCES_DIST = BlockFile.cpp BlockFile.h DirManager.cpp \ 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/ImportFLAC.cpp import/ImportFLAC.h \ + import/ImportForwards.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 \ @@ -880,6 +882,12 @@ AUDACITY_NAME = @AUDACITY_NAME@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ +AVCODEC_CFLAGS = @AVCODEC_CFLAGS@ +AVCODEC_LIBS = @AVCODEC_LIBS@ +AVFORMAT_CFLAGS = @AVFORMAT_CFLAGS@ +AVFORMAT_LIBS = @AVFORMAT_LIBS@ +AVUTIL_CFLAGS = @AVUTIL_CFLAGS@ +AVUTIL_LIBS = @AVUTIL_LIBS@ AWK = @AWK@ BUILD_LDFLAGS = @BUILD_LDFLAGS@ CC = @CC@ @@ -920,6 +928,8 @@ GMSGFMT_015 = @GMSGFMT_015@ GREP = @GREP@ GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@ GSTREAMER_LIBS = @GSTREAMER_LIBS@ +GTK_CFLAGS = @GTK_CFLAGS@ +GTK_LIBS = @GTK_LIBS@ HAVE_GTK = @HAVE_GTK@ HAVE_PKG_CONFIG = @HAVE_PKG_CONFIG@ HAVE_VISIBILITY = @HAVE_VISIBILITY@ @@ -933,6 +943,8 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INTLLIBS = @INTLLIBS@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@ +JACK_CFLAGS = @JACK_CFLAGS@ +JACK_LIBS = @JACK_LIBS@ LAME_CFLAGS = @LAME_CFLAGS@ LAME_LIBS = @LAME_LIBS@ LD = @LD@ @@ -979,6 +991,7 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ +PKG_CONFIG = @PKG_CONFIG@ PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@ PORTAUDIO_LIBS = @PORTAUDIO_LIBS@ PORTMIXER_LIBS = @PORTMIXER_LIBS@ @@ -1263,7 +1276,8 @@ audacity_SOURCES = $(libaudacity_la_SOURCES) AboutDialog.cpp \ 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/ImportFLAC.cpp import/ImportFLAC.h \ + import/ImportForwards.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 \ diff --git a/tests/Makefile.in b/tests/Makefile.in index a1f91ca53..245e0660d 100644 --- a/tests/Makefile.in +++ b/tests/Makefile.in @@ -117,8 +117,9 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ac_c99_func_lrint.m4 \ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \ - $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \ - $(top_srcdir)/m4/visibility.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/po.m4 \ + $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/visibility.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -413,6 +414,12 @@ AUDACITY_NAME = @AUDACITY_NAME@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ +AVCODEC_CFLAGS = @AVCODEC_CFLAGS@ +AVCODEC_LIBS = @AVCODEC_LIBS@ +AVFORMAT_CFLAGS = @AVFORMAT_CFLAGS@ +AVFORMAT_LIBS = @AVFORMAT_LIBS@ +AVUTIL_CFLAGS = @AVUTIL_CFLAGS@ +AVUTIL_LIBS = @AVUTIL_LIBS@ AWK = @AWK@ BUILD_LDFLAGS = @BUILD_LDFLAGS@ CC = @CC@ @@ -453,6 +460,8 @@ GMSGFMT_015 = @GMSGFMT_015@ GREP = @GREP@ GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@ GSTREAMER_LIBS = @GSTREAMER_LIBS@ +GTK_CFLAGS = @GTK_CFLAGS@ +GTK_LIBS = @GTK_LIBS@ HAVE_GTK = @HAVE_GTK@ HAVE_PKG_CONFIG = @HAVE_PKG_CONFIG@ HAVE_VISIBILITY = @HAVE_VISIBILITY@ @@ -466,6 +475,8 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INTLLIBS = @INTLLIBS@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@ +JACK_CFLAGS = @JACK_CFLAGS@ +JACK_LIBS = @JACK_LIBS@ LAME_CFLAGS = @LAME_CFLAGS@ LAME_LIBS = @LAME_LIBS@ LD = @LD@ @@ -512,6 +523,7 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ +PKG_CONFIG = @PKG_CONFIG@ PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@ PORTAUDIO_LIBS = @PORTAUDIO_LIBS@ PORTMIXER_LIBS = @PORTMIXER_LIBS@