1
0
mirror of https://github.com/cookiengineer/audacity synced 2025-10-11 00:53:46 +02:00

Use pkg-config override facility to specify libogg location to libvorbis.

1) Revert "Reintroduce patch for building local libvorbis with local libogg." (r12914)

2) Remove acinclude.m4 and regenerate autotool files to use a newer
pkg-config checking macro to get the override facility.

3) Override pkg-config check for libogg by specifying OGG_CFLAGS and OGG_LIBS.
This commit is contained in:
benjamin.drung@gmail.com
2013-11-09 01:28:56 +00:00
parent ada79ccf45
commit 8c2d95559b
24 changed files with 150 additions and 399 deletions

View File

@@ -59,8 +59,8 @@ AC_DEFUN([AUDACITY_CHECKLIB_LIBVORBIS], [
LIBVORBIS_LOCAL_CPPSYMBOLS="USE_LIBVORBIS"
LIBVORBIS_LOCAL_CONFIGURE_OPTS="--disable-oggtest"
export PKG_CONFIG_PATH="../libogg:${PKG_CONFIG_PATH}"
libogg_dir="$(pwd)/lib-src/libogg"
LIBVORBIS_LOCAL_CONFIGURE_ARGS="--disable-oggtest OGG_CFLAGS=-I${libogg_dir}/include OGG_LIBS=${libogg_dir}/src/.libs/libogg.a"
AC_MSG_NOTICE([Vorbis libraries are available in this source tree])
else