Update of /cvsroot/audacity/lib-src/soundtouch
In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv25958
Modified Files:
Makefile.am Makefile.in README.html aclocal.m4 bootstrap
configure configure.ac make-win.bat soundtouch.m4
Log Message:
Forced commit for version of soundtouch from 1.2 branch (update to version
1.3.1)
Index: configure
===================================================================
RCS file: /cvsroot/audacity/lib-src/soundtouch/configure,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- configure 12 Sep 2005 07:13:20 -0000 1.3
+++ configure 18 Sep 2006 07:31:35 -0000 1.4
@@ -1,8 +1,8 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59 for SoundTouch 1.2.1.
+# Generated by GNU Autoconf 2.59 for SoundTouch 1.3.1.
#
-# Report bugs to <http://www.iki.fi/oparviai/soundtouch>.
+# Report bugs to <http://www.surina.net/soundtouch>.
#
# Copyright (C) 2003 Free Software Foundation, Inc.
# This configure script is free software; the Free Software Foundation
@@ -280,15 +280,15 @@
[...10014 lines suppressed...]
- n
- /\\\\$/ b loop
- p
- }
- /^DEP_FILES = / s/^DEP_FILES = //p' < "$mf" | \
+ U=`sed -n 's/^U = //p' < "$mf"`
+ # Find all dependency output files, they are included files with
+ # $(DEPDIR) in their names. We invoke sed twice because it is the
+ # simplest approach to changing $(DEPDIR) to its actual value in the
+ # expansion.
+ for file in `sed -n "
+ s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
# Make sure the directory exists.
test -f "$dirpart/$file" && continue
@@ -21386,4 +21296,3 @@
fi
-
Index: soundtouch.m4
===================================================================
RCS file: /cvsroot/audacity/lib-src/soundtouch/soundtouch.m4,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- soundtouch.m4 14 Mar 2004 15:51:34 -0000 1.1.1.1
+++ soundtouch.m4 18 Sep 2006 07:31:36 -0000 1.2
@@ -1,70 +1,70 @@
-# m4 configure test script for the SoundTouch library
-# (c)2003 David W. Durham
-#
-# $Id$
-#
-# This file can be included with other packages that need to test
-# for libSoundTouch.
-#
-# It will #define HAVE_LIBSOUNDTOUCH iff the library is found
-# It will AC_SUBST SOUNDTOUCH_LIBS and SOUNDTOUCH_CXXFLAGS as well
-# It also defines some flags to the configure script for specifying
-# the location to search for libSoundTouch
-#
-# A user of libSoundTouch should add @SOUNDTOUCH_LIBS@ and
-# @SOUNDTOUCH_CXXFLAGS@ to the appropriate variables in his
-# Makefile.am files
-#
-# This script works with autoconf-2.5x and automake-1.6 but I have
-# not tested it with older versions.
-
-
-dnl min version not supported yet
-dnl AM_PATH_SOUNDTOUCH([MINMUM-VERSION, [(additional) ACTION-IF-FOUND] [,
ACTION-IF-NOT-FOUND]]])
-
-AH_TEMPLATE([HAVE_LIBSOUNDTOUCH], [defined by $0])
-SOUNDTOUCH_CXXFLAGS=""
-SOUNDTOUCH_LIBS=""
-
-AC_DEFUN(AM_PATH_SOUNDTOUCH,[
- AC_ARG_WITH(soundtouch-prefix,[ --with-soundtouch-prefix=DIR Prefix
where SoundTouch was installed (optional)],
[soundtouch_prefix="$withval"],[soundtouch_prefix=""])
-
- AC_ARG_ENABLE(soundtouch-check,[ --disable-soundtouch-check Do not
look for the SoundTouch
Library],[enable_soundtouch_check="$enableval"],[enable_soundtouch_check="yes"])
-
- if test "$enable_soundtouch_check" = "yes"
- then
- saved_CPPFLAGS="$CPPFLAGS"
- saved_LDFLAGS="$LDFLAGS"
-
- CPPFLAGS="$CPPFLAGS -I$soundtouch_prefix/include"
- LDFLAGS="$LDFLAGS -L$soundtouch_prefix/lib"
-
- dnl make sure SoundTouch.h header file exists
- dnl could use AC_CHECK_HEADERS to check for all of
them, but the supporting .h file names may change later
- AC_CHECK_HEADER([soundtouch/SoundTouch.h],[
- dnl SoundTouch.h found
- dnl make sure libSoundTouch is linkable
- AC_CHECK_LIB([SoundTouch],[soundtouch_ac_test],[
- dnl libSoundTouch found
-
SOUNDTOUCH_CXXFLAGS="-I$soundtouch_prefix/include"
-
SOUNDTOUCH_LIBS="-L$soundtouch_prefix/lib -lSoundTouch"
- AC_DEFINE([HAVE_LIBSOUNDTOUCH])
-
- dnl run action-if-found
- ifelse([$2], , :, [$2])
- ],[
- dnl run action-if-not-found
- ifelse([$3], , :, [$3])
- ])
- ],[
- dnl run action-if-not-found
- ifelse([$3], , :, [$3])
- ])
-
- CPPFLAGS="$saved_CPPFLAGS"
- LDFLAGS="$saved_LDFLAGS"
- fi
-
- AC_SUBST(SOUNDTOUCH_CXXFLAGS)
- AC_SUBST(SOUNDTOUCH_LIBS)
-])
+# m4 configure test script for the SoundTouch library
+# (c)2003 David W. Durham
+#
+# $Id$
+#
+# This file can be included with other packages that need to test
+# for libSoundTouch.
+#
+# It will #define HAVE_LIBSOUNDTOUCH iff the library is found
+# It will AC_SUBST SOUNDTOUCH_LIBS and SOUNDTOUCH_CXXFLAGS as well
+# It also defines some flags to the configure script for specifying
+# the location to search for libSoundTouch
+#
+# A user of libSoundTouch should add @SOUNDTOUCH_LIBS@ and
+# @SOUNDTOUCH_CXXFLAGS@ to the appropriate variables in his
+# Makefile.am files
+#
+# This script works with autoconf-2.5x and automake-1.6 but I have
+# not tested it with older versions.
+
+
+dnl min version not supported yet
+dnl AM_PATH_SOUNDTOUCH([MINMUM-VERSION, [(additional) ACTION-IF-FOUND] [,
ACTION-IF-NOT-FOUND]]])
+
+AH_TEMPLATE([HAVE_LIBSOUNDTOUCH], [defined by $0])
+SOUNDTOUCH_CXXFLAGS=""
+SOUNDTOUCH_LIBS=""
+
+AC_DEFUN([AM_PATH_SOUNDTOUCH],[
+ AC_ARG_WITH(soundtouch-prefix,[ --with-soundtouch-prefix=DIR Prefix
where SoundTouch was installed (optional)],
[soundtouch_prefix="$withval"],[soundtouch_prefix=""])
+
+ AC_ARG_ENABLE(soundtouch-check,[ --disable-soundtouch-check Do not
look for the SoundTouch
Library],[enable_soundtouch_check="$enableval"],[enable_soundtouch_check="yes"])
+
+ if test "$enable_soundtouch_check" = "yes"
+ then
+ saved_CPPFLAGS="$CPPFLAGS"
+ saved_LDFLAGS="$LDFLAGS"
+
+ CPPFLAGS="$CPPFLAGS -I$soundtouch_prefix/include"
+ LDFLAGS="$LDFLAGS -L$soundtouch_prefix/lib"
+
+ dnl make sure SoundTouch.h header file exists
+ dnl could use AC_CHECK_HEADERS to check for all of
them, but the supporting .h file names may change later
+ AC_CHECK_HEADER([soundtouch/SoundTouch.h],[
+ dnl SoundTouch.h found
+ dnl make sure libSoundTouch is linkable
+ AC_CHECK_LIB([SoundTouch],[soundtouch_ac_test],[
+ dnl libSoundTouch found
+
SOUNDTOUCH_CXXFLAGS="-I$soundtouch_prefix/include"
+
SOUNDTOUCH_LIBS="-L$soundtouch_prefix/lib -lSoundTouch"
+ AC_DEFINE([HAVE_LIBSOUNDTOUCH])
+
+ dnl run action-if-found
+ ifelse([$2], , :, [$2])
+ ],[
+ dnl run action-if-not-found
+ ifelse([$3], , :, [$3])
+ ])
+ ],[
+ dnl run action-if-not-found
+ ifelse([$3], , :, [$3])
+ ])
+
+ CPPFLAGS="$saved_CPPFLAGS"
+ LDFLAGS="$saved_LDFLAGS"
+ fi
+
+ AC_SUBST(SOUNDTOUCH_CXXFLAGS)
+ AC_SUBST(SOUNDTOUCH_LIBS)
+])
Index: Makefile.in
===================================================================
RCS file: /cvsroot/audacity/lib-src/soundtouch/Makefile.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- Makefile.in 12 Sep 2005 07:13:20 -0000 1.3
+++ Makefile.in 18 Sep 2006 07:31:34 -0000 1.4
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.7.6 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
# @configure_input@
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
-# Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -21,7 +21,6 @@
pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
top_builddir = .
-
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
INSTALL = @INSTALL@
install_sh_DATA = $(install_sh) -c -m 644
@@ -35,7 +34,57 @@
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
+build_triplet = @build@
host_triplet = @host@
+DIST_COMMON = $(am__configure_deps) $(srcdir)/Makefile.am \
+ $(srcdir)/Makefile.in $(srcdir)/soundtouch-1.0.pc.in \
+ $(top_srcdir)/config/am_include.mk $(top_srcdir)/configure \
+ config/config.guess config/config.sub config/depcomp \
+ config/install-sh config/ltmain.sh config/missing
+subdir = .
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(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 \
+ configure.lineno configure.status.lineno
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/include/soundtouch_config.h
+CONFIG_CLEAN_FILES = soundtouch-1.0.pc
+SOURCES =
+DIST_SOURCES =
+RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+ html-recursive info-recursive install-data-recursive \
+ install-exec-recursive install-info-recursive \
+ install-recursive installcheck-recursive installdirs-recursive \
+ pdf-recursive ps-recursive uninstall-info-recursive \
+ uninstall-recursive
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+ *) f=$$p;; \
+ esac;
+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__installdirs = "$(DESTDIR)$(m4datadir)" "$(DESTDIR)$(pkgconfigdir)" \
+ "$(DESTDIR)$(pkgdocdir)"
+m4dataDATA_INSTALL = $(INSTALL_DATA)
+pkgconfigDATA_INSTALL = $(INSTALL_DATA)
+pkgdocDATA_INSTALL = $(INSTALL_DATA)
+DATA = $(m4data_DATA) $(pkgconfig_DATA) $(pkgdoc_DATA)
+ETAGS = etags
+CTAGS = ctags
+DIST_SUBDIRS = $(SUBDIRS)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+distdir = $(PACKAGE)-$(VERSION)
+top_distdir = $(distdir)
+am__remove_distdir = \
+ { test ! -d $(distdir) \
+ || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \
+ && rm -fr $(distdir); }; }
+DIST_ARCHIVES = $(distdir).tar.gz
+GZIP_ENV = --best
+distuninstallcheck_listfiles = find . -type f -print
+distcleancheck_listfiles = find . -type f -print
ACLOCAL = @ACLOCAL@
AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
@@ -53,7 +102,6 @@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
-
CXXFLAGS = @CXXFLAGS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
@@ -70,16 +118,12 @@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-
LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
-MAINT = @MAINT@
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
@@ -107,6 +151,8 @@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
bindir = @bindir@
build = @build@
build_alias = @build_alias@
@@ -127,6 +173,7 @@
libexecdir = @libexecdir@
localstatedir = @localstatedir@
mandir = @mandir@
+mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
prefix = @prefix@
program_transform_name = @program_transform_name@
@@ -134,12 +181,10 @@
sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
-
INCLUDES = -I$(top_srcdir)/include
# doc directory
pkgdocdir = $(prefix)/doc/@PACKAGE@
-
SUBDIRS = include source
# list files that are documentation to be packaged in a release tarball and
installed
@@ -153,69 +198,60 @@
m4data_DATA = soundtouch.m4
# NOTE: wouldn't have to list the .TXT file if it were named without the .TXT
-EXTRA_DIST = soundtouch.m4 config/m4 bootstrap make-win.bat COPYING.TXT
README.html
+EXTRA_DIST = \
+ soundtouch.m4 \
+ config/m4 \
+ bootstrap \
+ make-win.bat \
+ COPYING.TXT \
+ README.html
+
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = soundtouch-1.0.pc
#distcleancheck:
# rm -rf files-that-may-also-need-to-be-deleted-on-'make distclean'
# flag to aclocal where to find m4 macros for tests
ACLOCAL_AMFLAGS = -I config/m4
-subdir = .
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config/config.h
-CONFIG_CLEAN_FILES =
-DIST_SOURCES =
-DATA = $(m4data_DATA) $(pkgdoc_DATA)
-
-
-RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
- ps-recursive install-info-recursive uninstall-info-recursive \
- all-recursive install-data-recursive install-exec-recursive \
- installdirs-recursive install-recursive uninstall-recursive \
- check-recursive installcheck-recursive
-DIST_COMMON = $(top_srcdir)/config/am_include.mk ./config/config.h.in \
- Makefile.am Makefile.in aclocal.m4 config/config.guess \
- config/config.sub config/depcomp config/install-sh \
- config/ltmain.sh config/missing config/mkinstalldirs configure \
- configure.ac
-DIST_SUBDIRS = $(SUBDIRS)
all: all-recursive
.SUFFIXES:
-
-am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
- configure.lineno
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am
$(top_srcdir)/config/am_include.mk $(top_srcdir)/configure.ac $(ACLOCAL_M4)
+am--refresh:
+ @:
+$(srcdir)/Makefile.in: $(srcdir)/Makefile.am
$(top_srcdir)/config/am_include.mk $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+ echo ' cd $(srcdir) && $(AUTOMAKE) --foreign '; \
+ cd $(srcdir) && $(AUTOMAKE) --foreign \
+ && exit 0; \
+ exit 1;; \
+ esac; \
+ done; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \
cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu Makefile
-Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in
$(top_builddir)/config.status
- cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)
+ $(AUTOMAKE) --foreign Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ @case '$?' in \
+ *config.status*) \
+ echo ' $(SHELL) ./config.status'; \
+ $(SHELL) ./config.status;; \
+ *) \
+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $@
$(am__depfiles_maybe)'; \
+ cd $(top_builddir) && $(SHELL) ./config.status $@
$(am__depfiles_maybe);; \
+ esac;
-$(top_builddir)/config.status: $(srcdir)/configure
$(CONFIG_STATUS_DEPENDENCIES)
+$(top_builddir)/config.status: $(top_srcdir)/configure
$(CONFIG_STATUS_DEPENDENCIES)
$(SHELL) ./config.status --recheck
-$(srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(srcdir)/configure.ac
$(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
- cd $(srcdir) && $(AUTOCONF)
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ configure.ac
+$(top_srcdir)/configure: $(am__configure_deps)
+ cd $(srcdir) && $(AUTOCONF)
+$(ACLOCAL_M4): $(am__aclocal_m4_deps)
cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
-
-config/config.h: config/stamp-h1
- @if test ! -f $@; then \
- rm -f config/stamp-h1; \
- $(MAKE) config/stamp-h1; \
- else :; fi
-
-config/stamp-h1: $(srcdir)/./config/config.h.in $(top_builddir)/config.status
- @rm -f config/stamp-h1
- cd $(top_builddir) && $(SHELL) ./config.status config/config.h
-
-$(srcdir)/./config/config.h.in: @MAINTAINER_MODE_TRUE@
$(top_srcdir)/configure.ac $(ACLOCAL_M4)
- cd $(top_srcdir) && $(AUTOHEADER)
- touch $(srcdir)/./config/config.h.in
-
-distclean-hdr:
- -rm -f config/config.h config/stamp-h1
+soundtouch-1.0.pc: $(top_builddir)/config.status $(srcdir)/soundtouch-1.0.pc.in
+ cd $(top_builddir) && $(SHELL) ./config.status $@
mostlyclean-libtool:
-rm -f *.lo
@@ -226,41 +262,56 @@
distclean-libtool:
-rm -f libtool
uninstall-info-am:
-m4dataDATA_INSTALL = $(INSTALL_DATA)
install-m4dataDATA: $(m4data_DATA)
@$(NORMAL_INSTALL)
- $(mkinstalldirs) $(DESTDIR)$(m4datadir)
+ test -z "$(m4datadir)" || $(mkdir_p) "$(DESTDIR)$(m4datadir)"
@list='$(m4data_DATA)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(m4dataDATA_INSTALL) $$d$$p $(DESTDIR)$(m4datadir)/$$f"; \
- $(m4dataDATA_INSTALL) $$d$$p $(DESTDIR)$(m4datadir)/$$f; \
+ f=$(am__strip_dir) \
+ echo " $(m4dataDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(m4datadir)/$$f'"; \
+ $(m4dataDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(m4datadir)/$$f"; \
done
uninstall-m4dataDATA:
@$(NORMAL_UNINSTALL)
@list='$(m4data_DATA)'; for p in $$list; do \
- f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " rm -f $(DESTDIR)$(m4datadir)/$$f"; \
- rm -f $(DESTDIR)$(m4datadir)/$$f; \
+ f=$(am__strip_dir) \
+ echo " rm -f '$(DESTDIR)$(m4datadir)/$$f'"; \
+ rm -f "$(DESTDIR)$(m4datadir)/$$f"; \
+ done
+install-pkgconfigDATA: $(pkgconfig_DATA)
+ @$(NORMAL_INSTALL)
+ test -z "$(pkgconfigdir)" || $(mkdir_p) "$(DESTDIR)$(pkgconfigdir)"
+ @list='$(pkgconfig_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ f=$(am__strip_dir) \
+ echo " $(pkgconfigDATA_INSTALL) '$$d$$p'
'$(DESTDIR)$(pkgconfigdir)/$$f'"; \
+ $(pkgconfigDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(pkgconfigdir)/$$f"; \
+ done
+
+uninstall-pkgconfigDATA:
+ @$(NORMAL_UNINSTALL)
+ @list='$(pkgconfig_DATA)'; for p in $$list; do \
+ f=$(am__strip_dir) \
+ echo " rm -f '$(DESTDIR)$(pkgconfigdir)/$$f'"; \
+ rm -f "$(DESTDIR)$(pkgconfigdir)/$$f"; \
done
-pkgdocDATA_INSTALL = $(INSTALL_DATA)
install-pkgdocDATA: $(pkgdoc_DATA)
@$(NORMAL_INSTALL)
- $(mkinstalldirs) $(DESTDIR)$(pkgdocdir)
+ test -z "$(pkgdocdir)" || $(mkdir_p) "$(DESTDIR)$(pkgdocdir)"
@list='$(pkgdoc_DATA)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(pkgdocDATA_INSTALL) $$d$$p $(DESTDIR)$(pkgdocdir)/$$f"; \
- $(pkgdocDATA_INSTALL) $$d$$p $(DESTDIR)$(pkgdocdir)/$$f; \
+ f=$(am__strip_dir) \
+ echo " $(pkgdocDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(pkgdocdir)/$$f'"; \
+ $(pkgdocDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(pkgdocdir)/$$f"; \
done
uninstall-pkgdocDATA:
@$(NORMAL_UNINSTALL)
@list='$(pkgdoc_DATA)'; for p in $$list; do \
- f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " rm -f $(DESTDIR)$(pkgdocdir)/$$f"; \
- rm -f $(DESTDIR)$(pkgdocdir)/$$f; \
+ f=$(am__strip_dir) \
+ echo " rm -f '$(DESTDIR)$(pkgdocdir)/$$f'"; \
+ rm -f "$(DESTDIR)$(pkgdocdir)/$$f"; \
done
# This directory's subdirectories are mostly independent; you can cd
@@ -270,7 +321,13 @@
# (which will cause the Makefiles to be regenerated when you run `make');
# (2) otherwise, pass the desired values on the `make' command line.
$(RECURSIVE_TARGETS):
- @set fnord $$MAKEFLAGS; amf=$$2; \
+ @failcom='exit 1'; \
+ for f in x $$MAKEFLAGS; do \
+ case $$f in \
+ *=* | --[!k]*);; \
+ *k*) failcom='fail=yes';; \
+ esac; \
+ done; \
dot_seen=no; \
target=`echo $@ | sed s/-recursive//`; \
list='$(SUBDIRS)'; for subdir in $$list; do \
@@ -282,7 +339,7 @@
local_target="$$target"; \
fi; \
(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
+ || eval $$failcom; \
done; \
if test "$$dot_seen" = "no"; then \
$(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
@@ -290,7 +347,13 @@
mostlyclean-recursive clean-recursive distclean-recursive \
maintainer-clean-recursive:
- @set fnord $$MAKEFLAGS; amf=$$2; \
+ @failcom='exit 1'; \
+ for f in x $$MAKEFLAGS; do \
+ case $$f in \
+ *=* | --[!k]*);; \
+ *k*) failcom='fail=yes';; \
+ esac; \
+ done; \
dot_seen=no; \
case "$@" in \
distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
@@ -311,7 +374,7 @@
local_target="$$target"; \
fi; \
(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
+ || eval $$failcom; \
done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
@@ -322,14 +385,6 @@
test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS)
ctags); \
done
-ETAGS = etags
-ETAGSFLAGS =
-
-CTAGS = ctags
-CTAGSFLAGS =
-
-tags: TAGS
-
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
@@ -338,19 +393,22 @@
$(AWK) ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
mkid -fID $$unique
+tags: TAGS
TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
here=`pwd`; \
- if (etags --etags-include --version) >/dev/null 2>&1; then \
+ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
include_option=--etags-include; \
+ empty_fix=.; \
else \
include_option=--include; \
+ empty_fix=; \
fi; \
list='$(SUBDIRS)'; for subdir in $$list; do \
if test "$$subdir" = .; then :; else \
- test -f $$subdir/TAGS && \
+ test ! -f $$subdir/TAGS || \
tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
fi; \
done; \
@@ -360,10 +418,11 @@
done | \
$(AWK) ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
- test -z "$(ETAGS_ARGS)$$tags$$unique" \
- || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
- $$tags $$unique
-
+ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+ test -n "$$unique" || unique=$$empty_fix; \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ $$tags $$unique; \
+ fi
ctags: CTAGS
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
@@ -386,24 +445,11 @@
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-
-top_distdir = .
-distdir = $(PACKAGE)-$(VERSION)
-
-am__remove_distdir = \
- { test ! -d $(distdir) \
- || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \
- && rm -fr $(distdir); }; }
-
-GZIP_ENV = --best
-distuninstallcheck_listfiles = find . -type f -print
-distcleancheck_listfiles = find . -type f -print
distdir: $(DISTFILES)
$(am__remove_distdir)
mkdir $(distdir)
- $(mkinstalldirs) $(distdir)/./config $(distdir)/config
+ $(mkdir_p) $(distdir)/. $(distdir)/config
@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
list='$(DISTFILES)'; for file in $$list; do \
@@ -415,7 +461,7 @@
dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
if test "$$dir" != "$$file" && test "$$dir" != "."; then \
dir="/$$dir"; \
- $(mkinstalldirs) "$(distdir)$$dir"; \
+ $(mkdir_p) "$(distdir)$$dir"; \
else \
dir=''; \
fi; \
@@ -430,15 +476,17 @@
|| exit 1; \
fi; \
done
- list='$(SUBDIRS)'; for subdir in $$list; do \
+ list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
if test "$$subdir" = .; then :; else \
- test -d $(distdir)/$$subdir \
- || mkdir $(distdir)/$$subdir \
+ test -d "$(distdir)/$$subdir" \
+ || $(mkdir_p) "$(distdir)/$$subdir" \
|| exit 1; \
+ distdir=`$(am__cd) $(distdir) && pwd`; \
+ top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
(cd $$subdir && \
$(MAKE) $(AM_MAKEFLAGS) \
- top_distdir="$(top_distdir)" \
- distdir=../$(distdir)/$$subdir \
+ top_distdir="$$top_distdir" \
+ distdir="$$distdir/$$subdir" \
distdir) \
|| exit 1; \
fi; \
@@ -452,19 +500,46 @@
! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {}
\; \
|| chmod -R a+r $(distdir)
dist-gzip: distdir
- $(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
+ tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c
>$(distdir).tar.gz
+ $(am__remove_distdir)
+
+dist-bzip2: distdir
+ tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
+ $(am__remove_distdir)
+
+dist-tarZ: distdir
+ tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
+ $(am__remove_distdir)
+
+dist-shar: distdir
+ shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
+ $(am__remove_distdir)
+
+dist-zip: distdir
+ -rm -f $(distdir).zip
+ zip -rq $(distdir).zip $(distdir)
$(am__remove_distdir)
dist dist-all: distdir
- $(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
+ tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c
>$(distdir).tar.gz
$(am__remove_distdir)
# This target untars the dist file and tries a VPATH configuration. Then
# it guarantees that the distribution is self-contained by making another
# tarfile.
distcheck: dist
- $(am__remove_distdir)
- GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(AMTAR) xf -
+ case '$(DIST_ARCHIVES)' in \
+ *.tar.gz*) \
+ GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\
+ *.tar.bz2*) \
+ bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
+ *.tar.Z*) \
+ uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
+ *.shar.gz*) \
+ GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\
+ *.zip*) \
+ unzip $(distdir).zip ;;\
+ esac
chmod -R a-w $(distdir); chmod a+w $(distdir)
mkdir $(distdir)/_build
mkdir $(distdir)/_inst
@@ -484,19 +559,20 @@
distuninstallcheck \
&& chmod -R a-w "$$dc_install_base" \
&& ({ \
- (cd ../.. && $(mkinstalldirs) "$$dc_destdir") \
+ (cd ../.. && umask 077 && mkdir "$$dc_destdir") \
&& $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" install \
&& $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" uninstall \
&& $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" \
distuninstallcheck_dir="$$dc_destdir" distuninstallcheck; \
} || { rm -rf "$$dc_destdir"; exit 1; }) \
&& rm -rf "$$dc_destdir" \
- && $(MAKE) $(AM_MAKEFLAGS) dist-gzip \
- && rm -f $(distdir).tar.gz \
+ && $(MAKE) $(AM_MAKEFLAGS) dist \
+ && rm -rf $(DIST_ARCHIVES) \
&& $(MAKE) $(AM_MAKEFLAGS) distcleancheck
$(am__remove_distdir)
- @echo "$(distdir).tar.gz is ready for distribution" | \
- sed 'h;s/./=/g;p;x;p;x'
+ @(echo "$(distdir) archives ready for distribution: "; \
+ list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
+ sed -e '1{h;s/./=/g;p;x;}' -e '$${p;x;}'
distuninstallcheck:
@cd $(distuninstallcheck_dir) \
&& test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
@@ -520,8 +596,9 @@
all-am: Makefile $(DATA)
installdirs: installdirs-recursive
installdirs-am:
- $(mkinstalldirs) $(DESTDIR)$(m4datadir) $(DESTDIR)$(pkgdocdir)
-
+ for dir in "$(DESTDIR)$(m4datadir)" "$(DESTDIR)$(pkgconfigdir)"
"$(DESTDIR)$(pkgdocdir)"; do \
+ test -z "$$dir" || $(mkdir_p) "$$dir"; \
+ done
install: install-recursive
install-exec: install-exec-recursive
install-data: install-data-recursive
@@ -533,7 +610,7 @@
installcheck: installcheck-recursive
install-strip:
$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- INSTALL_STRIP_FLAG=-s \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
`test -z '$(STRIP)' || \
echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
mostlyclean-generic:
@@ -541,7 +618,7 @@
clean-generic:
distclean-generic:
- -rm -f Makefile $(CONFIG_CLEAN_FILES)
+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@@ -552,18 +629,22 @@
distclean: distclean-recursive
-rm -f $(am__CONFIG_DISTCLEAN_FILES)
-distclean-am: clean-am distclean-generic distclean-hdr distclean-libtool \
+ -rm -f Makefile
+distclean-am: clean-am distclean-generic distclean-libtool \
distclean-tags
dvi: dvi-recursive
dvi-am:
+html: html-recursive
+
info: info-recursive
info-am:
-install-data-am: install-m4dataDATA install-pkgdocDATA
+install-data-am: install-m4dataDATA install-pkgconfigDATA \
+ install-pkgdocDATA
install-exec-am:
@@ -576,6 +657,7 @@
maintainer-clean: maintainer-clean-recursive
-rm -f $(am__CONFIG_DISTCLEAN_FILES)
-rm -rf $(top_srcdir)/autom4te.cache
+ -rm -f Makefile
maintainer-clean-am: distclean-am maintainer-clean-generic
mostlyclean: mostlyclean-recursive
@@ -591,29 +673,27 @@
ps-am:
uninstall-am: uninstall-info-am uninstall-m4dataDATA \
- uninstall-pkgdocDATA
+ uninstall-pkgconfigDATA uninstall-pkgdocDATA
uninstall-info: uninstall-info-recursive
-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \
- clean-generic clean-libtool clean-recursive ctags \
- ctags-recursive dist dist-all dist-gzip distcheck distclean \
- distclean-generic distclean-hdr distclean-libtool \
- distclean-recursive distclean-tags distcleancheck distdir \
- distuninstallcheck dvi dvi-am dvi-recursive info info-am \
- info-recursive install install-am install-data install-data-am \
- install-data-recursive install-exec install-exec-am \
- install-exec-recursive install-info install-info-am \
- install-info-recursive install-m4dataDATA install-man \
- install-pkgdocDATA install-recursive install-strip installcheck \
- installcheck-am installdirs installdirs-am \
- installdirs-recursive maintainer-clean maintainer-clean-generic \
+.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am am--refresh check \
+ check-am clean clean-generic clean-libtool clean-recursive \
+ ctags ctags-recursive dist dist-all dist-bzip2 dist-gzip \
+ dist-hook dist-shar dist-tarZ dist-zip distcheck distclean \
+ distclean-generic distclean-libtool distclean-recursive \
+ distclean-tags distcleancheck distdir distuninstallcheck dvi \
+ dvi-am html html-am info info-am install install-am \
+ install-data install-data-am install-exec install-exec-am \
+ install-info install-info-am install-m4dataDATA install-man \
+ install-pkgconfigDATA install-pkgdocDATA install-strip \
+ installcheck installcheck-am installdirs installdirs-am \
+ maintainer-clean maintainer-clean-generic \
maintainer-clean-recursive mostlyclean mostlyclean-generic \
- mostlyclean-libtool mostlyclean-recursive pdf pdf-am \
- pdf-recursive ps ps-am ps-recursive tags tags-recursive \
- uninstall uninstall-am uninstall-info-am \
- uninstall-info-recursive uninstall-m4dataDATA \
- uninstall-pkgdocDATA uninstall-recursive
+ mostlyclean-libtool mostlyclean-recursive pdf pdf-am ps ps-am \
+ tags tags-recursive uninstall uninstall-am uninstall-info-am \
+ uninstall-m4dataDATA uninstall-pkgconfigDATA \
+ uninstall-pkgdocDATA
dist-hook:
Index: README.html
===================================================================
RCS file: /cvsroot/audacity/lib-src/soundtouch/README.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- README.html 26 Oct 2004 19:25:26 -0000 1.2
+++ README.html 18 Sep 2006 07:31:34 -0000 1.3
@@ -1,637 +1,675 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
- <meta http-equiv="Content-Type"
- content="text/html; charset=iso-8859-1">
- <meta name="author" content="Olli Parviainen">
- <meta name="description"
- content="Readme file for SoundTouch audio processing library">
- <meta name="GENERATOR" content="Microsoft FrontPage Express 2.0">
- <title>SoundTouch library README</title>
-</head>
[...1281 lines suppressed...]
+<p>This library is free software; you can
+redistribute it and/or modify it under the terms of the GNU
+Lesser General Public License as published by the Free Software
+Foundation; either version 2.1 of the License, or (at your option)
+any later version.</p>
+<p>This library is distributed in the hope
+that it will be useful, but WITHOUT ANY WARRANTY; without even
+the implied warranty of MERCHANTABILITY or FITNESS FOR A
+PARTICULAR PURPOSE. See the GNU Lesser General Public License for
+more details.</p>
+<p>You should have received a copy of the GNU
+Lesser General Public License along with this library; if not,
+write to the Free Software Foundation, Inc., 59 Temple Place,
+Suite 330, Boston, MA 02111-1307 USA</p>
+<hr>
+<!--
+$Id$
+-->
+</body>
+</html>
Index: configure.ac
===================================================================
RCS file: /cvsroot/audacity/lib-src/soundtouch/configure.ac,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- configure.ac 12 Sep 2005 07:13:20 -0000 1.2
+++ configure.ac 18 Sep 2006 07:31:36 -0000 1.3
@@ -19,21 +19,17 @@
dnl Place - Suite 330, Boston, MA 02111-1307, USA
# Process this file with autoconf to produce a configure script.
-AC_INIT(SoundTouch, 1.2.1, [http://www.iki.fi/oparviai/soundtouch])
+AC_INIT(SoundTouch, 1.3.1, [http://www.surina.net/soundtouch])
AC_CONFIG_AUX_DIR(config)
-AM_CONFIG_HEADER([config/config.h])
+AM_CONFIG_HEADER([include/soundtouch_config.h])
AM_INIT_AUTOMAKE
-
-AM_MAINTAINER_MODE
-
AC_DISABLE_SHARED dnl This makes libtool only build static libs
#AC_GNU_SOURCE dnl enable posix extensions in glibc
AC_LANG(C++)
-
-
-
+#AC_MAINTAINER_MODE
+dnl added by audacity as this is a bundled library
dnl
############################################################################
dnl # Checks for programs
#
@@ -74,17 +70,21 @@
#AC_TYPE_OFF_T
#AC_TYPE_SIZE_T
-dnl define WORDS_BIGENDIAN if this is a big endian platform
-AH_TEMPLATE(WORDS_BIGENDIAN)
-AC_C_BIGENDIAN([
- AC_DEFINE(WORDS_BIGENDIAN)
- dnl well, I dunno, maybe it has???
- AC_MSG_WARN([The soundstretch binary is not coded to work with big
endian machines yet])
-])
-
-
+AC_ARG_ENABLE(integer-samples,
+ [AC_HELP_STRING([--enable-integer-samples],
+ [use integer samples instead of floats
+[default=yes]])],,
+ [enable_integer_samples=no])
+
+if test "x$enable_integer_samples" = "xyes"; then
+ echo "****** Integer sample type enabled ******"
+ AC_DEFINE(INTEGER_SAMPLES,1,[Use Integer as Sample type])
+else
+ echo "****** Float sample type enabled ******"
+ AC_DEFINE(FLOAT_SAMPLES,1,[Use Float as Sample type])
+fi
@@ -131,7 +131,8 @@
include/Makefile
])
-AC_OUTPUT
-
+AC_OUTPUT(
+ soundtouch-1.0.pc
+)
dnl use 'echo' to put stuff here if you want a message to the builder
Index: Makefile.am
===================================================================
RCS file: /cvsroot/audacity/lib-src/soundtouch/Makefile.am,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- Makefile.am 14 Mar 2004 15:51:34 -0000 1.1.1.1
+++ Makefile.am 18 Sep 2006 07:31:34 -0000 1.2
@@ -43,7 +43,16 @@
## of a final package, but it is useful for developers who might want to make
## changes to the configure scripts or makefiles.
# NOTE: wouldn't have to list the .TXT file if it were named without the .TXT
-EXTRA_DIST=soundtouch.m4 config/m4 bootstrap make-win.bat COPYING.TXT
README.html
+EXTRA_DIST= \
+ soundtouch.m4 \
+ config/m4 \
+ bootstrap \
+ make-win.bat \
+ COPYING.TXT \
+ README.html
+
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = soundtouch-1.0.pc
## This removes stuff from the distribution which may be present
## from a cvs checkout or other build reasons
Index: make-win.bat
===================================================================
RCS file: /cvsroot/audacity/lib-src/soundtouch/make-win.bat,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- make-win.bat 26 Oct 2004 19:16:42 -0000 1.2
+++ make-win.bat 18 Sep 2006 07:31:36 -0000 1.3
@@ -1,34 +1,34 @@
[EMAIL PROTECTED]
[EMAIL PROTECTED] SoundTouch & SoundStretch Build script for Win32 platform
[EMAIL PROTECTED]
[EMAIL PROTECTED] You'll need Visual C++ 6.0 installed to compile - also
execute the
[EMAIL PROTECTED] "vcvars32.bat" in VC install directotry before running this
one.
[EMAIL PROTECTED]
[EMAIL PROTECTED] Copyright (c) Olli Parviainen
[EMAIL PROTECTED] File Created: 09/Sep/2003
[EMAIL PROTECTED]
[EMAIL PROTECTED] $Id$
-
[EMAIL PROTECTED] "%MsDevDir%"=="" goto nodevdir
-
-md bin
-md lib
-msdev source\SoundTouch\SoundTouch.dsw /MAKE ALL
-msdev source\example\bpm\bpm.dsw /MAKE ALL
-msdev source\example\SoundStretch\SoundStretch.dsw /MAKE "SoundStretch - Win32
Release"
-
-goto end
-
-:nodevdir
-
[EMAIL PROTECTED] off
-echo *********************************************************************
-echo **
-echo ** ERROR: Visual Studio path not set.
-echo **
-echo ** Run "vcvars32.bat" from Visual Studio installation directory, e.g.
-echo ** "\Program Files\Microsoft Visual Studio\VC98\Bin", then try again.
-echo **
-echo *********************************************************************
-
[EMAIL PROTECTED]
[EMAIL PROTECTED] SoundTouch & SoundStretch Build script for Win32 platform
[EMAIL PROTECTED]
[EMAIL PROTECTED] You'll need Visual C++ 6.0 installed to compile - also
execute the
[EMAIL PROTECTED] "vcvars32.bat" in VC install directotry before running this
one.
[EMAIL PROTECTED]
[EMAIL PROTECTED] Copyright (c) Olli Parviainen
[EMAIL PROTECTED] File Created: 09/Sep/2003
[EMAIL PROTECTED]
[EMAIL PROTECTED] $Id$
+
[EMAIL PROTECTED] "%MsDevDir%"=="" goto nodevdir
+
+md bin
+md lib
+msdev source\SoundTouch\SoundTouch.dsw /MAKE ALL
+msdev source\example\bpm\bpm.dsw /MAKE ALL
+msdev source\example\SoundStretch\SoundStretch.dsw /MAKE "SoundStretch - Win32
Release"
+
+goto end
+
+:nodevdir
+
[EMAIL PROTECTED] off
+echo *********************************************************************
+echo **
+echo ** ERROR: Visual Studio path not set.
+echo **
+echo ** Run "vcvars32.bat" from Visual Studio installation directory, e.g.
+echo ** "\Program Files\Microsoft Visual Studio\VC98\Bin", then try again.
+echo **
+echo *********************************************************************
+
:end
\ No newline at end of file
Index: aclocal.m4
===================================================================
RCS file: /cvsroot/audacity/lib-src/soundtouch/aclocal.m4,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- aclocal.m4 12 Sep 2005 07:13:20 -0000 1.2
+++ aclocal.m4 18 Sep 2006 07:31:34 -0000 1.3
@@ -1,7 +1,7 @@
-# generated automatically by aclocal 1.7.6 -*- Autoconf -*-
+# generated automatically by aclocal 1.9.6 -*- Autoconf -*-
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002
-# Free Software Foundation, Inc.
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+# 2005 Free Software Foundation, Inc.
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -11,896 +11,9 @@
[...5298 lines suppressed...]
+
+ # tar/untar a dummy directory, and stop if the command works
+ rm -rf conftest.dir
+ mkdir conftest.dir
+ echo GrepMe > conftest.dir/file
+ AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar])
+ rm -rf conftest.dir
+ if test -s conftest.tar; then
+ AM_RUN_LOG([$am__untar <conftest.tar])
+ grep GrepMe conftest.dir/file >/dev/null 2>&1 && break
+ fi
+done
+rm -rf conftest.dir
+
+AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool])
+AC_MSG_RESULT([$am_cv_prog_tar_$1])])
+AC_SUBST([am__tar])
+AC_SUBST([am__untar])
+]) # _AM_PROG_TAR
+
-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
Audacity-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/audacity-cvs
