Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-10-15 15:11:12 +02:00
Code Issues Releases Wiki Activity

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

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

49
lib-src/libvorbis/configure.ac
View File

@@ -236,43 +236,18 @@ AC_CHECK_LIB(pthread, pthread_create, pthread_lib="-lpthread", :)
PKG_PROG_PKG_CONFIG
HAVE_OGG=no
dnl Audacity-specific code by dmazzoni:
dnl If libogg is in the same parent directory and it has been
dnl configured already, then we assume that libogg is going to
dnl be built, too.
AC_CHECK_FILE(../libogg/include/ogg/ogg.h,
ogg_h_available="yes",
ogg_h_available="no")
AC_CHECK_FILE(../libogg/Makefile,
ogg_configured="yes",
ogg_configured="no")
if test "x$ogg_configured" = "xyes" && test "x$ogg_h_available" = "xyes" ; then
echo "Using local libogg library from Audacity lib-src directory."
AC_SUBST(OGG_CFLAGS)
AC_SUBST(OGG_LIBS)
OGG_LIBS="-L../.. -logg"
LIBS="-L../.. -logg"
OGG_CFLAGS="-I../../libogg/include"
else
if test "x$PKG_CONFIG" != "x"
then
PKG_CHECK_MODULES(OGG, ogg >= 1.0, HAVE_OGG=yes, HAVE_OGG=no)
fi
if test "x$HAVE_OGG" = "xno"
then
dnl fall back to the old school test
XIPH_PATH_OGG(, AC_MSG_ERROR(must have Ogg installed!))
libs_save=$LIBS
LIBS="$OGG_LIBS $VORBIS_LIBS"
AC_CHECK_FUNC(oggpack_writealign, , AC_MSG_ERROR(Ogg >= 1.0 required !))
LIBS=$libs_save
fi
if test "x$PKG_CONFIG" != "x"
then
PKG_CHECK_MODULES(OGG, ogg >= 1.0, HAVE_OGG=yes, HAVE_OGG=no)
fi
if test "x$HAVE_OGG" = "xno"
then
dnl fall back to the old school test
XIPH_PATH_OGG(, AC_MSG_ERROR(must have Ogg installed!))
libs_save=$LIBS
LIBS="$OGG_LIBS $VORBIS_LIBS"
AC_CHECK_FUNC(oggpack_writealign, , AC_MSG_ERROR(Ogg >= 1.0 required !))
LIBS=$libs_save
fi
dnl --------------------------------------------------