Browse Source

Applying 2 of Benjamin's patches to add an autogen script and to

enable support for using the system portaudio library.  The latter
also corrects a long standing bug that prevented using config.status
to regenerate src/Makefile.

As a result of the above, I've taken Benjamin's *_LOCAL_CONFIGURE_ARGS
idea and propagated its usage to the other place where ac_configure_args
was being set directly.

Removed old stuff from lib-src/Makefile.in and made the library locations
for portaudio and portmixer like the rest (a symlink in lib-src).

Reworked portmixer's configure.ac to properly detect host apis.
mac-2.1.1-vi
lllucius 12 years ago
parent
commit
15eef6421e
  1. 5
      autogen.sh
  2. 193
      configure
  3. 33
      configure.in
  4. 25
      lib-src/Makefile.in
  5. 576
      lib-src/portmixer/configure
  6. 105
      lib-src/portmixer/configure.ac
  7. 4
      m4/audacity_checklib_libraptor.m4
  8. 2
      m4/audacity_checklib_libsbsms.m4
  9. 2
      m4/audacity_checklib_libsndfile.m4
  10. 2
      m4/audacity_checklib_libtwolame.m4
  11. 2
      m4/audacity_checklib_libvamp.m4
  12. 56
      m4/audacity_checklib_portaudio.m4
  13. 4
      m4/audacity_checklib_redland.m4
  14. 2
      src/Makefile.in

5
autogen.sh

@ -0,0 +1,5 @@
#!/bin/sh
aclocal -I m4
autoconf
rm -rf aclocal.m4 autom4te.cache

193
configure

@ -609,6 +609,8 @@ build_os
build_vendor
build_cpu
build
PORTAUDIO_LIBS
PORTAUDIO_CFLAGS
PORTSMF_LIBS
PORTSMF_CFLAGS
AVFORMAT_LIBS
@ -728,6 +730,7 @@ with_libvamp
with_libtwolame
with_ffmpeg
with_midi
with_portaudio
enable_audiounits
enable_ladspa
enable_quicktime
@ -768,13 +771,14 @@ AVFORMAT_CFLAGS
AVFORMAT_LIBS
PORTSMF_CFLAGS
PORTSMF_LIBS
PORTAUDIO_CFLAGS
PORTAUDIO_LIBS
GTK_CFLAGS
GTK_LIBS
JACK_CFLAGS
JACK_LIBS'
ac_subdirs_all='"lib-src/FileDialog"
$CONFIG_SUBDIRS
lib-src/portaudio-v19
lib-src/portmixer'
# Initialize some variables set by options.
@ -1425,6 +1429,7 @@ Optional Packages:
--with-libtwolame use libtwolame for MP2 export support
--with-ffmpeg use ffmpeg for import and export support
--with-midi use portSMF for Midi support
--with-portaudio use portaudio19
--with-portmixer compile with PortMixer [default=yes]
Some influential environment variables:
@ -1479,6 +1484,10 @@ Some influential environment variables:
C compiler flags for PORTSMF, overriding pkg-config
PORTSMF_LIBS
linker flags for PORTSMF, overriding pkg-config
PORTAUDIO_CFLAGS
C compiler flags for PORTAUDIO, overriding pkg-config
PORTAUDIO_LIBS
linker flags for PORTAUDIO, overriding pkg-config
GTK_CFLAGS C compiler flags for GTK, overriding pkg-config
GTK_LIBS linker flags for GTK, overriding pkg-config
JACK_CFLAGS C compiler flags for JACK, overriding pkg-config
@ -5112,7 +5121,7 @@ BUILD_LDFLAGS="$BUILD_LDFLAGS $WIDGETEXTRA_LIBS"
CXXFLAGS="$CXXFLAGS $WIDGETEXTRA_CFLAGS"
LIBSRC_BUILD="$LIBSRC_BUILD widgetextra"
LIBRARIES="LIBVORBIS LIBMAD LIBSNDFILE LIBFLAC LIBID3TAG LIBSAMPLERATE LIBRESAMPLE LIBSBSMS LIBSOUNDTOUCH LIBNYQUIST LIBVAMP LIBEXPAT LIBTWOLAME FFMPEG PORTSMF"
LIBRARIES="LIBVORBIS LIBMAD LIBSNDFILE LIBFLAC LIBID3TAG LIBSAMPLERATE LIBRESAMPLE LIBSBSMS LIBSOUNDTOUCH LIBNYQUIST LIBVAMP LIBEXPAT LIBTWOLAME FFMPEG PORTSMF PORTAUDIO"
{ $as_echo "$as_me:${as_lineno-$LINENO}: Determining what libraries are available in this tree and on the system" >&5
$as_echo "$as_me: Determining what libraries are available in this tree and on the system" >&6;}
@ -5243,7 +5252,7 @@ fi
$as_echo "$as_me: libsndfile libraries are available in this source tree" >&6;}
ac_configure_args="$ac_configure_args --disable-sqlite --disable-external-libs --disable-alsa"
LIBSNDFILE_LOCAL_CONFIGURE_ARGS="--disable-sqlite --disable-external-libs --disable-alsa"
else
LIBSNDFILE_LOCAL_AVAILABLE="no"
{ $as_echo "$as_me:${as_lineno-$LINENO}: libsndfile libraries are NOT available in this source tree" >&5
@ -6313,7 +6322,7 @@ fi
LIBSBSMS_LOCAL_CPPSYMBOLS="USE_SBSMS"
LIBSBSMS_LOCAL_CONFIG_SUBDIRS="lib-src/sbsms"
ac_configure_args="$ac_configure_args --disable-programs"
LIBSBSMS_LOCAL_CONFIGURE_ARGS="--disable-programs"
{ $as_echo "$as_me:${as_lineno-$LINENO}: libsbsms libraries are available in the local tree" >&5
$as_echo "$as_me: libsbsms libraries are available in the local tree" >&6;}
@ -6792,7 +6801,7 @@ fi
LIBVAMP_LOCAL_OPTOBJS="effects/vamp/VampEffect.o effects/vamp/LoadVamp.o"
LIBVAMP_LOCAL_CPPSYMBOLS="USE_VAMP"
LIBVAMP_LOCAL_CONFIG_SUBDIRS="lib-src/libvamp"
ac_configure_args="$ac_configure_args --disable-programs"
LIBVAMP_LOCAL_CONFIGURE_ARGS="--disable-programs"
{ $as_echo "$as_me:${as_lineno-$LINENO}: Vamp libraries are available in the local tree" >&5
$as_echo "$as_me: Vamp libraries are available in the local tree" >&6;}
@ -6932,7 +6941,7 @@ fi
LIBTWOLAME_LOCAL_CPPSYMBOLS="USE_LIBTWOLAME"
LIBTWOLAME_LOCAL_CONFIG_SUBDIRS="lib-src/twolame"
ac_configure_args="$ac_configure_args --disable-programs"
LIBTWOLAME_LOCAL_CONFIGURE_ARGS="--disable-programs"
{ $as_echo "$as_me:${as_lineno-$LINENO}: libtwolame library is available in the local tree" >&5
$as_echo "$as_me: libtwolame library is available in the local tree" >&6;}
@ -7314,6 +7323,159 @@ fi
# Check whether --with-portaudio was given.
if test "${with_portaudio+set}" = set; then :
withval=$with_portaudio; PORTAUDIO_ARGUMENT=$withval
else
PORTAUDIO_ARGUMENT="unspecified"
fi
pkg_failed=no
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for PORTAUDIO" >&5
$as_echo_n "checking for PORTAUDIO... " >&6; }
if test -n "$PORTAUDIO_CFLAGS"; then
pkg_cv_PORTAUDIO_CFLAGS="$PORTAUDIO_CFLAGS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"portaudio-2.0 >= 19\""; } >&5
($PKG_CONFIG --exists --print-errors "portaudio-2.0 >= 19") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
pkg_cv_PORTAUDIO_CFLAGS=`$PKG_CONFIG --cflags "portaudio-2.0 >= 19" 2>/dev/null`
else
pkg_failed=yes
fi
else
pkg_failed=untried
fi
if test -n "$PORTAUDIO_LIBS"; then
pkg_cv_PORTAUDIO_LIBS="$PORTAUDIO_LIBS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"portaudio-2.0 >= 19\""; } >&5
($PKG_CONFIG --exists --print-errors "portaudio-2.0 >= 19") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
pkg_cv_PORTAUDIO_LIBS=`$PKG_CONFIG --libs "portaudio-2.0 >= 19" 2>/dev/null`
else
pkg_failed=yes
fi
else
pkg_failed=untried
fi
if test $pkg_failed = yes; then
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
_pkg_short_errors_supported=yes
else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
PORTAUDIO_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "portaudio-2.0 >= 19" 2>&1`
else
PORTAUDIO_PKG_ERRORS=`$PKG_CONFIG --print-errors "portaudio-2.0 >= 19" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$PORTAUDIO_PKG_ERRORS" >&5
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
portaudio_available_system="no"
elif test $pkg_failed = untried; then
portaudio_available_system="no"
else
PORTAUDIO_CFLAGS=$pkg_cv_PORTAUDIO_CFLAGS
PORTAUDIO_LIBS=$pkg_cv_PORTAUDIO_LIBS
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
portaudio_available_system="yes"
fi
if test "x$portaudio_available_system" = "xyes" ; then
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <portaudio.h>
_ACEOF
if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
$EGREP "Pa_GetStreamHostApiType" >/dev/null 2>&1; then :
have_portaudio_support=yes
else
have_portaudio_support=no
fi
rm -f conftest*
if test "x$have_portaudio_support" = "xyes" ; then
PORTAUDIO_SYSTEM_AVAILABLE="yes"
PORTAUDIO_SYSTEM_LIBS=$PORTAUDIO_LIBS
PORTAUDIO_SYSTEM_CXXFLAGS=$PORTAUDIO_CFLAGS
{ $as_echo "$as_me:${as_lineno-$LINENO}: portaudio19 library is available as system library" >&5
$as_echo "$as_me: portaudio19 library is available as system library" >&6;}
else
PORTAUDIO_SYSTEM_AVAILABLE="no"
{ $as_echo "$as_me:${as_lineno-$LINENO}: portaudio19 library is available as system library, but does not have the Pa_GetStreamHostApiType function." >&5
$as_echo "$as_me: portaudio19 library is available as system library, but does not have the Pa_GetStreamHostApiType function." >&6;}
fi
else
PORTAUDIO_SYSTEM_AVAILABLE="no"
{ $as_echo "$as_me:${as_lineno-$LINENO}: portaudio19 library is NOT available as system library" >&5
$as_echo "$as_me: portaudio19 library is NOT available as system library" >&6;}
fi
as_ac_File=`$as_echo "ac_cv_file_${srcdir}/lib-src/portaudio-v19/include/portaudio.h" | $as_tr_sh`
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${srcdir}/lib-src/portaudio-v19/include/portaudio.h" >&5
$as_echo_n "checking for ${srcdir}/lib-src/portaudio-v19/include/portaudio.h... " >&6; }
if eval "test \"\${$as_ac_File+set}\"" = set; then :
$as_echo_n "(cached) " >&6
else
test "$cross_compiling" = yes &&
as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
if test -r "${srcdir}/lib-src/portaudio-v19/include/portaudio.h"; then
eval "$as_ac_File=yes"
else
eval "$as_ac_File=no"
fi
fi
eval ac_res=\$$as_ac_File
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
$as_echo "$ac_res" >&6; }
if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
portaudio_h_found="yes"
else
portaudio_h_found="no"
fi
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_CONFIG_SUBDIRS="lib-src/portaudio-v19"
PORTAUDIO_LOCAL_CONFIGURE_ARGS="--with-pa-include=../portaudio-v19/include"
{ $as_echo "$as_me:${as_lineno-$LINENO}: portaudio19 library is available in the local tree" >&5
$as_echo "$as_me: portaudio19 library is available in the local tree" >&6;}
else
PORTAUDIO_LOCAL_AVAILABLE="no"
{ $as_echo "$as_me:${as_lineno-$LINENO}: portaudio19 library is NOT available in the local tree" >&5
$as_echo "$as_me: portaudio19 library is NOT available in the local tree" >&6;}
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: Figuring out what libraries to enable" >&5
$as_echo "$as_me: Figuring out what libraries to enable" >&6;}
@ -7386,6 +7548,10 @@ $as_echo "#define USE_SYSTEM_EXPAT 1" >>confdefs.h
fi
fi
if test "$PORTAUDIO_USE_LOCAL" != "yes" && test "$PORTAUDIO_USE_SYSTEM" != "yes" ; then
as_fn_error $? "Audacity requires portaudio to be enabled" "$LINENO" 5
fi
if ( test "$LIBRESAMPLE_USE_LOCAL" = "yes" || test "$LIBRESAMPLE_USE_SYSTEM" = "yes") && ( test "$LIBSAMPLERATE_USE_LOCAL" = "yes" || test "$LIBSAMPLERATE_USE_SYSTEM" = "yes"); then
{ $as_echo "$as_me:${as_lineno-$LINENO}: Both libresample and libsamplerate are available" >&5
$as_echo "$as_me: Both libresample and libsamplerate are available" >&6;}
@ -7420,6 +7586,7 @@ for lib in $LIBRARIES ; do
eval OPTOBJS=\"$OPTOBJS \$${lib}_LOCAL_OPTOBJS\"
eval CXXFLAGS=\"\$CXXFLAGS \$${lib}_LOCAL_CXXFLAGS\"
eval CONFIG_SUBDIRS=\"\$${lib}_LOCAL_CONFIG_SUBDIRS\"
eval ac_configure_args=\"\$ac_configure_args \$${lib}_LOCAL_CONFIGURE_ARGS\"
subdirs="$subdirs $CONFIG_SUBDIRS"
@ -7732,13 +7899,6 @@ $as_echo "#define HAVE_GTK 1" >>confdefs.h
esac
LOCAL_LIBS="$LOCAL_LIBS portaudio-v19/lib/libportaudio.a"
EXTRAOBJS="$EXTRAOBJS ../lib-src/portaudio-v19/lib/libportaudio.a"
CXXFLAGS="-I\$(top_srcdir)/lib-src/portaudio-v19/include $CXXFLAGS"
subdirs="$subdirs lib-src/portaudio-v19"
case "${host_os}" in
darwin* | rhapsody*)
LIBS="-framework AudioUnit -framework AudioToolbox $LIBS"
@ -7970,11 +8130,10 @@ $as_echo "#define USE_PORTMIXER 1" >>confdefs.h
CXXFLAGS="-I\$(top_srcdir)/lib-src/portmixer/include $CXXFLAGS"
LOCAL_LIBS="$LOCAL_LIBS portmixer/libportmixer.a"
LOCAL_LIBS="$LOCAL_LIBS libportmixer.a"
subdirs="$subdirs lib-src/portmixer"
ac_configure_args="$ac_configure_args --with-pa-include=../portaudio-v19/include"
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for lrint" >&5
@ -9544,10 +9703,6 @@ $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
fi
pa_libs=
pa_libs=`grep 'Libs:' lib-src/portaudio-v19/portaudio-2.0.pc | sed -e 's/Libs://;s/-L${libdir}//;s/-lportaudio//'`
sed -i -e "s/@PA_LIBS@/$pa_libs/" src/Makefile
echo ""
echo "Finished configure:"

33
configure.in

@ -305,7 +305,7 @@ dnl can do without if they aren't available.
dnl-------------------------------------------------------------
dnl LIBRARIES="LIBVORBIS LIBMAD LIBSNDFILE LIBFLAC LIBID3TAG LIBSAMPLERATE LIBRESAMPLE LIBSBSMS LIBSOUNDTOUCH LIBNYQUIST LIBVAMP LIBEXPAT LIBTWOLAME FFMPEG LIBLRDF SLV2 REDLAND PORTSMF TAGLIB"
dnl disable plugin categorisation and LV2 libs for 1.3.7 release
LIBRARIES="LIBVORBIS LIBMAD LIBSNDFILE LIBFLAC LIBID3TAG LIBSAMPLERATE LIBRESAMPLE LIBSBSMS LIBSOUNDTOUCH LIBNYQUIST LIBVAMP LIBEXPAT LIBTWOLAME FFMPEG PORTSMF"
LIBRARIES="LIBVORBIS LIBMAD LIBSNDFILE LIBFLAC LIBID3TAG LIBSAMPLERATE LIBRESAMPLE LIBSBSMS LIBSOUNDTOUCH LIBNYQUIST LIBVAMP LIBEXPAT LIBTWOLAME FFMPEG PORTSMF PORTAUDIO"
AC_MSG_NOTICE([Determining what libraries are available in this tree and on the system])
@ -328,6 +328,7 @@ dnl AUDACITY_CHECKLIB_SLV2
dnl AUDACITY_CHECKLIB_LIBLRDF
AUDACITY_CHECKLIB_PORTSMF
dnl AUDACITY_CHECKLIB_TAGLIB
AUDACITY_CHECKLIB_PORTAUDIO
dnl Decide what libraries to build with, and whether to use system or local libraries
dnl Set variables based on choices.
@ -397,6 +398,10 @@ else
fi
fi
if test "$PORTAUDIO_USE_LOCAL" != "yes" && test "$PORTAUDIO_USE_SYSTEM" != "yes" ; then
AC_MSG_ERROR([Audacity requires portaudio to be enabled])
fi
dnl we can only have one sample rate conversion library used.
dnl by now we will have both enabled if they are present, regardless of whether
dnl they were requested, unless one was specifically disabled.
@ -449,6 +454,7 @@ for lib in $LIBRARIES ; do
eval OPTOBJS=\"$OPTOBJS \$${lib}_LOCAL_OPTOBJS\"
eval CXXFLAGS=\"\$CXXFLAGS \$${lib}_LOCAL_CXXFLAGS\"
eval CONFIG_SUBDIRS=\"\$${lib}_LOCAL_CONFIG_SUBDIRS\"
eval ac_configure_args=\"\$ac_configure_args \$${lib}_LOCAL_CONFIGURE_ARGS\"
AC_CONFIG_SUBDIRS($CONFIG_SUBDIRS)
eval CPPSYMBOLS=\"\$${lib}_LOCAL_CPPSYMBOLS\"
@ -496,10 +502,10 @@ AC_ARG_ENABLE(quicktime,
dnl In-tree libraries (ones we write, so only options are off and local)
AC_ARG_WITH(portmixer,
[AS_HELP_STRING([--with-portmixer],
[compile with PortMixer [default=yes]])],
use_portmixer=$withval,
use_portmixer="yes")
[AS_HELP_STRING([--with-portmixer],
[compile with PortMixer [default=yes]])],
use_portmixer=$withval,
use_portmixer="yes")
AC_CANONICAL_HOST
@ -558,13 +564,6 @@ case "${host_os}" in
;;
esac
dnl PortAudio configuration
LOCAL_LIBS="$LOCAL_LIBS portaudio-v19/lib/libportaudio.a"
EXTRAOBJS="$EXTRAOBJS ../lib-src/portaudio-v19/lib/libportaudio.a"
CXXFLAGS="-I\$(top_srcdir)/lib-src/portaudio-v19/include $CXXFLAGS"
AC_CONFIG_SUBDIRS([lib-src/portaudio-v19])
case "${host_os}" in
darwin* | rhapsody*)
@ -599,10 +598,9 @@ 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 portmixer/libportmixer.a"
LOCAL_LIBS="$LOCAL_LIBS libportmixer.a"
AC_CONFIG_SUBDIRS([lib-src/portmixer])
ac_configure_args="$ac_configure_args --with-pa-include=../portaudio-v19/include"
fi
dnl Check for lrint/lrintf
@ -672,13 +670,6 @@ fi
AC_OUTPUT
dnl
dnl Substitute any addition libraries that portaudio (v19) requires
dnl
pa_libs=
pa_libs=`grep 'Libs:' lib-src/portaudio-v19/portaudio-2.0.pc | sed -e 's/Libs://;s/-L${libdir}//;s/-lportaudio//'`
sed -i -e "s/@PA_LIBS@/$pa_libs/" src/Makefile
echo ""
echo "Finished configure:"

25
lib-src/Makefile.in

@ -6,12 +6,6 @@ portsmf-recursive:
libportSMF.a: portsmf-recursive
ln -sf portsmf/libportSMF.a libportSMF.a
# dlcompat
dl-recursive:
$(MAKE) -C dlcompat
libdl.a: dl-recursive
ln -sf dlcompat/libdl.a libdl.a
# expat
expat-recursive:
$(MAKE) -C expat
@ -146,19 +140,14 @@ taglib.a: taglib-recursive
# PortAudio
portaudio-v19-recursive:
$(MAKE) -C portaudio-v19 lib/libportaudio.la
portaudio-v19/lib/libportaudio.a: portaudio-v19-recursive
ln -sf .libs/libportaudio.a $@
libportaudio.a: portaudio-v19-recursive
ln -sf portaudio-v19/lib/.libs/libportaudio.a libportaudio.a
# PortMixer
portmixer-recursive:
$(MAKE) -C portmixer
portmixer/libportmixer.a: portmixer-recursive
portaudio/pa_unix_oss/portaudio.a:
$(MAKE) -C portaudio/pa_unix_oss
portaudio/pa_mac_core/portaudio.a:
$(MAKE) -C portaudio/pa_mac_core
libportmixer.a: portmixer-recursive
ln -sf portmixer/libportmixer.a libportmixer.a
# RTAudio not supported 23/08/2007 R.A.
# librtaudio-recursive:
@ -169,7 +158,6 @@ portaudio/pa_mac_core/portaudio.a:
# Utility rules
clean:
-$(MAKE) -C portsmf clean
-$(MAKE) -C dlcompat clean
-$(MAKE) -C expat clean
-$(MAKE) -C FileDialog clean
-$(MAKE) -C libid3tag clean
@ -185,8 +173,6 @@ clean:
-$(MAKE) -C lib-widget-extra clean
-$(MAKE) -C libflac clean
-$(MAKE) -C portaudio-v19 clean
-$(MAKE) -C portaudio/pa_unix_oss clean
-$(MAKE) -C portaudio/pa_mac_core clean
-$(MAKE) -C portmixer clean
-$(MAKE) -C sbsms clean
-$(MAKE) -C soundtouch clean
@ -195,7 +181,6 @@ clean:
distclean:
-$(MAKE) -C portsmf distclean
-$(MAKE) -C dlcompat distclean
-$(MAKE) -C expat distclean
-$(MAKE) -C FileDialog distclean
-$(MAKE) -C libid3tag distclean
@ -211,8 +196,6 @@ distclean:
-$(MAKE) -C lib-widget-extra distclean
-$(MAKE) -C libflac distclean
-$(MAKE) -C portaudio-v19 distclean
-$(MAKE) -C portaudio/pa_unix_oss distclean
-$(MAKE) -C portaudio/pa_mac_core distclean
-$(MAKE) -C portmixer distclean
-$(MAKE) -C sbsms distclean
-$(MAKE) -C soundtouch distclean

576
lib-src/portmixer/configure
File diff suppressed because it is too large
View File

105
lib-src/portmixer/configure.ac

@ -43,7 +43,7 @@ AC_ARG_WITH([pa-include],
#
#
#
if [[ with_portaudio != "" ]] ; then
if test -n "$with_portaudio"; then
CPPFLAGS="$CPPFLAGS -I$withval"
AC_SUBST(cflags, ["$cflags -I$withval"] )
fi
@ -54,54 +54,65 @@ fi
have_oss=no
AC_CHECK_HEADERS([sys/soundcard.h linux/soundcard.h machine/soundcard.h], have_oss=yes)
if [[ $have_oss = "yes" ]] ; then
AC_CHECK_HEADER(pa_unix_oss.h, ,have_oss=no, [#include "portaudio.h"])
if [[ $have_oss = "yes" ]] ; then
AC_EGREP_HEADER([PaOSS_GetStreamInputDevice], [pa_unix_oss.h], , [have_oss=no])
if [[ $have_oss = "no" ]] ; then
AC_MSG_WARN([Missing PaOSS_GetStreamInputDevice support in pa_unix_oss.h]);
fi
fi
fi
AC_CHECK_HEADER(alsa/asoundlib.h, have_alsa=yes, have_alsa=no)
AC_CHECK_HEADER(CoreAudio/CoreAudio.h, have_coreaudio=yes, have_coreaudio=no)
AC_CHECK_HEADER(windows.h, have_windows=yes, have_windows=no)
#
# Make sure the support is there
#
have_support=yes
if [[ $have_alsa = "yes" ]] ; then
AC_EGREP_HEADER([PaAlsa_GetStreamInputCard], [pa_linux_alsa.h], , [have_support=no])
if [[ $have_support = "no" ]] ; then
AC_MSG_WARN([Missing support in pa_linux_alsa.h]);
fi
AC_CHECK_HEADER(pa_linux_alsa.h, ,have_alsa=no)
if [[ $have_alsa = "yes" ]] ; then
AC_EGREP_HEADER([PaAlsa_GetStreamInputCard], [pa_linux_alsa.h], , [have_alsa=no])
if [[ $have_alsa = "no" ]] ; then
AC_MSG_WARN([Missing PaAlsa_GetStreamInputCard support in pa_linux_alsa.h]);
fi
fi
fi
AC_CHECK_HEADER(CoreAudio/CoreAudio.h, have_coreaudio=yes, have_coreaudio=no)
if [[ $have_coreaudio = "yes" ]] ; then
AC_EGREP_HEADER([PaMacCore_GetStreamInputDevice], [pa_mac_core.h], , [have_support=no])
if [[ $have_support = "no" ]] ; then
AC_MSG_WARN([Missing support in pa_mac_core.h]);
fi
fi
if [[ $have_oss = "yes" ]] ; then
AC_EGREP_HEADER([PaOSS_GetStreamInputDevice], [pa_unix_oss.h], , [have_support=no])
if [[ $have_support = "no" ]] ; then
AC_MSG_WARN([Missing support in pa_unix_oss.h]);
fi
AC_CHECK_HEADER(pa_mac_core.h, ,have_coreaudio=no, [#include "portaudio.h"])
if [[ $have_alsa = "yes" ]] ; then
AC_EGREP_HEADER([PaMacCore_GetStreamInputDevice], [pa_mac_core.h], , [have_support=no])
if [[ $have_support = "no" ]] ; then
AC_MSG_WARN([Missing support in pa_mac_core.h]);
fi
fi
fi
have_wmme=no
have_ds=no
AC_CHECK_HEADER(windows.h, have_windows=yes, have_windows=no)
if [[ $have_windows = "yes" ]] ; then
AC_EGREP_HEADER([PaWinDS_GetStreamInputGUID], [pa_win_ds.h], , [have_support=no])
if [[ $have_support = "no" ]] ; then
AC_MSG_WARN([Missing support in pa_win_ds.h]);
fi
AC_EGREP_HEADER([PaWinMME_GetStreamInputHandle], [pa_win_wmme.h], , [have_support=no])
if [[ $have_support = "no" ]] ; then
AC_MSG_WARN([Missing support in pa_win_wmme.h]);
fi
AC_CHECK_HEADER(pa_win_wmme.h, have_wmme=yes)
if [[ $have_wmme = "yes" ]] ; then
AC_EGREP_HEADER([PaWinMME_GetStreamInputHandle], [pa_win_wmme.h], , [have_wmme=no])
if [[ $have_wmme = "no" ]] ; then
AC_MSG_WARN([Missing PaWinMME_GetStreamInputHandle support in pa_win_wmme.h]);
fi
fi
AC_CHECK_HEADER(pa_win_ds.h, have_ds=yes)
if [[ $have_ds = "yes" ]] ; then
AC_EGREP_HEADER([PaWinDS_GetStreamInputGUID], [pa_win_ds.h], , [have_ds=no])
if [[ $have_support = "no" ]] ; then
AC_MSG_WARN([Missing PaWinDS_GetStreamInputGUID support in pa_win_ds.h]);
fi
fi
fi
AC_EGREP_HEADER([Pa_GetStreamHostApiType], [portaudio.h], , [have_support=no])
if [[ $have_support = "no" ]] ; then
AC_MSG_WARN([Missing support in portaudio.h]);
fi
if [[ $have_support = "no" ]] ; then
AC_MSG_ERROR([Your version of portaudio does not include required functions.]);
AC_CHECK_HEADER(portaudio.h, have_portaudio=yes, have_portaudio=no)
if [[ $have_portaudio = "yes" ]] ; then
AC_EGREP_HEADER([Pa_GetStreamHostApiType], [portaudio.h], , [have_portaudio=no])
if [[ $have_portaudio = "no" ]] ; then
AC_MSG_ERROR([Your version of portaudio does not include required Pa_GetStreamHostApiType function]);
fi
fi
#
@ -113,25 +124,33 @@ AC_SUBST( objects, [px_mixer.o] )
#
# Set up to use the identified ones
#
AC_MSG_NOTICE(---------------------------------------);
have_support=no
AC_MSG_NOTICE([---------------------------------------])
if [[ $have_oss = "yes" ]] ; then
AC_MSG_NOTICE(Including support for OSS);
AC_MSG_NOTICE([Including support for OSS]);
AC_DEFINE(PX_USE_UNIX_OSS)
objects="$objects px_unix_oss.o"
have_support=yes
fi
if [[ $have_alsa = "yes" ]] ; then
AC_MSG_NOTICE(Including support for ALSA);
AC_MSG_NOTICE([Including support for ALSA])
AC_DEFINE(PX_USE_LINUX_ALSA)
objects="$objects px_linux_alsa.o"
have_support=yes
fi
if [[ $have_coreaudio = "yes" ]] ; then
AC_MSG_NOTICE(Including support for Coreaudio);
AC_MSG_NOTICE([Including support for Coreaudio])
AC_DEFINE(PX_USE_MAC_COREAUDIO)
objects="$objects px_mac_coreaudio.o"
have_support=yes
fi
if [[ $have_support = "no" ]] ; then
AC_MSG_ERROR([No supported mixer interfaces detected])
fi
AC_MSG_NOTICE(---------------------------------------);
AC_MSG_NOTICE([---------------------------------------])
#
# Write it all out

4
m4/audacity_checklib_libraptor.m4

@ -41,9 +41,9 @@ AC_DEFUN([AUDACITY_CHECKLIB_LIBRAPTOR], [
fi
AC_MSG_NOTICE([libraptor is available in the local tree])
if test "x$LIBEXPAT_SYSTEM_AVAILABLE" = "xno" ; then
ac_configure_args="$ac_configure_args \"--with-expat-source=${srcdir}/src/include\""
LIBRAPTOR_LOCAL_CONFIGURE_ARGS="\"--with-expat-source=${srcdir}/src/include\""
fi
ac_configure_args="$ac_configure_args RAPTOR_CFLAGS='-I../../libraptor/src' RAPTOR_LIBS='-L../.. -lraptor'"
LIBRAPTOR_LOCAL_CONFIGURE_ARGS="$LIBRAPTOR_LOCAL_CONFIGURE_ARGS RAPTOR_CFLAGS='-I../../libraptor/src' RAPTOR_LIBS='-L../.. -lraptor'"
else
LIBRAPTOR_LOCAL_AVAILABLE="no"
AC_MSG_NOTICE([libraptor is NOT available in the local tree])

2
m4/audacity_checklib_libsbsms.m4

@ -47,8 +47,8 @@ AC_DEFUN([AUDACITY_CHECKLIB_LIBSBSMS], [
dnl set up configuring sbsms
LIBSBSMS_LOCAL_CONFIG_SUBDIRS="lib-src/sbsms"
ac_configure_args="$ac_configure_args --disable-programs"
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

2
m4/audacity_checklib_libsndfile.m4

@ -45,7 +45,7 @@ AC_DEFUN([AUDACITY_CHECKLIB_LIBSNDFILE], [
dnl export SNDFILE_CFLAGS="'-I`pwd`/lib-src/libsndfile/src'"
dnl Temporary fix for bug #248
ac_configure_args="$ac_configure_args --disable-sqlite --disable-external-libs --disable-alsa"
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])

2
m4/audacity_checklib_libtwolame.m4

@ -48,7 +48,7 @@ AC_DEFUN([AUDACITY_CHECKLIB_LIBTWOLAME], [
dnl request library is configured
LIBTWOLAME_LOCAL_CONFIG_SUBDIRS="lib-src/twolame"
dnl disable programs we don't need to build
ac_configure_args="$ac_configure_args --disable-programs"
LIBTWOLAME_LOCAL_CONFIGURE_ARGS="--disable-programs"
AC_MSG_NOTICE([libtwolame library is available in the local tree])
else

2
m4/audacity_checklib_libvamp.m4

@ -55,8 +55,8 @@ AC_DEFUN([AUDACITY_CHECKLIB_LIBVAMP], [
LIBVAMP_LOCAL_CPPSYMBOLS="USE_VAMP"
dnl schedule the directory to be configured
LIBVAMP_LOCAL_CONFIG_SUBDIRS="lib-src/libvamp"
ac_configure_args="$ac_configure_args --disable-programs"
dnl do not build programs we don't need
LIBVAMP_LOCAL_CONFIGURE_ARGS="--disable-programs"
AC_MSG_NOTICE([Vamp libraries are available in the local tree])
else

56
m4/audacity_checklib_portaudio.m4

@ -0,0 +1,56 @@
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
AC_DEFUN([AUDACITY_CHECKLIB_PORTAUDIO], [
AC_ARG_WITH(portaudio,
[AS_HELP_STRING([--with-portaudio], [use portaudio19])],
PORTAUDIO_ARGUMENT=$withval,
PORTAUDIO_ARGUMENT="unspecified")
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")
if test "x$portaudio_available_system" = "xyes" ; then
AC_EGREP_HEADER([Pa_GetStreamHostApiType], [portaudio.h],
[have_portaudio_support=yes], [have_portaudio_support=no])
if test "x$have_portaudio_support" = "xyes" ; 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'
dnl set up configuring portaudio
PORTAUDIO_LOCAL_CONFIG_SUBDIRS="lib-src/portaudio-v19"
PORTAUDIO_LOCAL_CONFIGURE_ARGS="--with-pa-include=../portaudio-v19/include"
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
])

4
m4/audacity_checklib_redland.m4

@ -41,9 +41,9 @@ AC_DEFUN([AUDACITY_CHECKLIB_REDLAND], [
# This is a horrible hack to keep from having to modify the raptor/configure.ac. It makes
# the raptor configure think there's a full expat source tree. But, all we have is expat.h
# tucked away in audacity/src/include. So, we trick it...
ac_configure_args="$ac_configure_args \"--with-expat-source=dummy_magic\" CPPFLAGS='$CPPFLAGS -I../../../src/include'"
REDLAND_LOCAL_CONFIGURE_ARGS="\"--with-expat-source=dummy_magic\" CPPFLAGS='$CPPFLAGS -I../../../src/include'"
fi
ac_configure_args="$ac_configure_args RAPTOR_CFLAGS='-I../../redland/raptor/src' RAPTOR_LIBS='-L.. -L../.. -lraptor' REDLAND_CFLAGS='-I../../redland/raptor/src -I../../redland/rasqal/src -I../../redland/librdf' REDLAND_LIBS='-L.. -L../.. -lrdf -lraptor -lrasqal'"
REDLAND_LOCAL_CONFIGURE_ARGS="$REDLAND_LOCAL_CONFIGURE_ARGS RAPTOR_CFLAGS='-I../../redland/raptor/src' RAPTOR_LIBS='-L.. -L../.. -lraptor' REDLAND_CFLAGS='-I../../redland/raptor/src -I../../redland/rasqal/src -I../../redland/librdf' REDLAND_LIBS='-L.. -L../.. -lrdf -lraptor -lrasqal'"
AC_MSG_NOTICE([Redland is available in the local tree])
else
REDLAND_LOCAL_AVAILABLE="no"

2
src/Makefile.in

@ -20,7 +20,7 @@ PRECOMP_CFLAGS = @PRECOMP_CFLAGS@
LOCAL_LIBS = @LOCAL_LIBS@
EXTRAOBJS = @EXTRAOBJS@
EXTRATARGETS = @EXTRATARGETS@
LIBS = @LIBS@ @PA_LIBS@
LIBS = @LIBS@
DIRS=blockfile commands effects effects/ladspa effects/nyquist effects/vamp export import prefs toolbars widgets xml
srcdir=@srcdir@

Loading…
Cancel
Save