1
0
mirror of https://github.com/cookiengineer/audacity synced 2025-11-03 15:43:50 +01:00

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.
This commit is contained in:
lllucius
2011-03-30 16:14:51 +00:00
parent 0c54afc769
commit 15eef6421e
14 changed files with 670 additions and 367 deletions

View File

@@ -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"