Update of /cvsroot/audacity/lib-src/soundtouch
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv11608
Modified Files:
Makefile.am aclocal.m4 configure configure.ac
Log Message:
Add missing autotools files (not sure why they were missing) which prevented
maintainer mode build, re-run autoconf to generate up to date configure which
has the correct path to .m4 macro files in it.
Index: aclocal.m4
===================================================================
RCS file: /cvsroot/audacity/lib-src/soundtouch/aclocal.m4,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- aclocal.m4 18 Jan 2009 00:29:04 -0000 1.7
+++ aclocal.m4 7 Nov 2009 12:17:03 -0000 1.8
@@ -11,6 +11,7965 @@
# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
# PARTICULAR PURPOSE.
+# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
+#
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
+# 2006, 2007, 2008 Free Software Foundation, Inc.
+# Written by Gordon Matzigkeit, 1996
+#
+# This file is free software; the Free Software Foundation gives
+# unlimited permission to copy and/or distribute it, with or without
[...7939 lines suppressed...]
+m4_ifndef([_LT_AC_LANG_C_CONFIG], [AC_DEFUN([_LT_AC_LANG_C_CONFIG])])
+m4_ifndef([AC_LIBTOOL_LANG_CXX_CONFIG],
[AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG])])
+m4_ifndef([_LT_AC_LANG_CXX_CONFIG], [AC_DEFUN([_LT_AC_LANG_CXX_CONFIG])])
+m4_ifndef([AC_LIBTOOL_LANG_F77_CONFIG],
[AC_DEFUN([AC_LIBTOOL_LANG_F77_CONFIG])])
+m4_ifndef([_LT_AC_LANG_F77_CONFIG], [AC_DEFUN([_LT_AC_LANG_F77_CONFIG])])
+m4_ifndef([AC_LIBTOOL_LANG_GCJ_CONFIG],
[AC_DEFUN([AC_LIBTOOL_LANG_GCJ_CONFIG])])
+m4_ifndef([_LT_AC_LANG_GCJ_CONFIG], [AC_DEFUN([_LT_AC_LANG_GCJ_CONFIG])])
+m4_ifndef([AC_LIBTOOL_LANG_RC_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_RC_CONFIG])])
+m4_ifndef([_LT_AC_LANG_RC_CONFIG], [AC_DEFUN([_LT_AC_LANG_RC_CONFIG])])
+m4_ifndef([AC_LIBTOOL_CONFIG], [AC_DEFUN([AC_LIBTOOL_CONFIG])])
+m4_ifndef([_LT_AC_FILE_LTDLL_C], [AC_DEFUN([_LT_AC_FILE_LTDLL_C])])
+
# Copyright (C) 2002, 2003, 2005 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
@@ -889,4 +8848,3 @@
AC_SUBST([am__untar])
]) # _AM_PROG_TAR
-m4_include([config/libtool.m4])
Index: configure.ac
===================================================================
RCS file: /cvsroot/audacity/lib-src/soundtouch/configure.ac,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- configure.ac 18 Jan 2009 00:29:04 -0000 1.8
+++ configure.ac 7 Nov 2009 12:17:03 -0000 1.9
@@ -21,6 +21,7 @@
AC_INIT(SoundTouch, 1.3.1, [http://www.surina.net/soundtouch])
AC_CONFIG_AUX_DIR(config)
+AC_CONFIG_MACRO_DIR([config/m4])
AM_CONFIG_HEADER([include/soundtouch_config.h])
AM_INIT_AUTOMAKE([-Wall foreign])
Index: Makefile.am
===================================================================
RCS file: /cvsroot/audacity/lib-src/soundtouch/Makefile.am,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- Makefile.am 18 Jan 2009 00:29:04 -0000 1.4
+++ Makefile.am 7 Nov 2009 12:17:03 -0000 1.5
@@ -66,5 +66,5 @@
# flag to aclocal where to find m4 macros for tests
-ACLOCAL_AMFLAGS = -I config
+ACLOCAL_AMFLAGS = -I config/m4
Index: configure
===================================================================
RCS file: /cvsroot/audacity/lib-src/soundtouch/configure,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- configure 18 Jan 2009 00:29:04 -0000 1.10
+++ configure 7 Nov 2009 12:17:03 -0000 1.11
@@ -577,22 +577,22 @@
# Check that we are running under the correct shell.
SHELL=${CONFIG_SHELL-/bin/sh}
-case X$ECHO in
+case X$lt_ECHO in
X*--fallback-echo)
# Remove one level of quotation (which was required for Make).
- ECHO=`echo "$ECHO" | sed 's,\\\\\$\\$0,'$0','`
+ ECHO=`echo "$lt_ECHO" | sed 's,\\\\\$\\$0,'$0','`
;;
esac
[...17966 lines suppressed...]
+compiler_lib_search_dirs=$lt_compiler_lib_search_dirs_CXX
+
+# Dependencies to place before and after the objects being linked to
+# create a shared library.
+predep_objects=$lt_predep_objects_CXX
+postdep_objects=$lt_postdep_objects_CXX
+predeps=$lt_predeps_CXX
+postdeps=$lt_postdeps_CXX
+
+# The library search path used internally by the compiler when linking
+# a shared library.
+compiler_lib_search_path=$lt_compiler_lib_search_path_CXX
+
+# ### END LIBTOOL TAG CONFIG: CXX
+_LT_EOF
+
+ ;;
esac
done # for ac_tag
------------------------------------------------------------------------------
Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day
trial. Simplify your report design, integration and deployment - and focus on
what you do best, core application coding. Discover what's new with
Crystal Reports now. http://p.sf.net/sfu/bobj-july
_______________________________________________
Audacity-cvs mailing list
Audacity-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/audacity-cvs
