Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-04-30 15:49:41 +02:00
Code Issues Releases Wiki Activity

libflac needs libogg too.

Browse Source 
So we need to pass --with-ogg-includes and --with-ogg-libraries to the
configure script of libflac, because it does not use pkg-config.
This commit is contained in:
benjamin.drung@gmail.com 2013-11-09 12:40:16 +00:00
parent 07dc22a5fc
commit 5b51a60778
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
configure vendored
View File

@ -7897,9 +7897,11 @@ fi
LIBVORBIS_LOCAL_CPPSYMBOLS="USE_LIBVORBIS"
libogg_dir="$(pwd)/lib-src/libogg"
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"
LIBVORBIS_LOCAL_CONFIGURE_ARGS="$LIBVORBIS_LOCAL_CONFIGURE_ARGS --with-ogg-includes=${libogg_dir}/include --with-ogg-libraries=${libogg_dir}/src/.libs"
{ $as_echo "$as_me:${as_lineno-$LINENO}: Vorbis libraries are available in this source tree" >&5
$as_echo "$as_me: Vorbis libraries are available in this source tree" >&6;}
else

6
m4/audacity_checklib_libvorbis.m4
View File

@ -59,9 +59,15 @@ AC_DEFUN([AUDACITY_CHECKLIB_LIBVORBIS], [
LIBVORBIS_LOCAL_CPPSYMBOLS="USE_LIBVORBIS"
dnl We need to override the pkg-config check for libogg by passing
dnl OGG_CFLAGS and OGG_LIBS to the configure script of libvorbis.
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"
dnl libflac needs libogg too. So we need to pass these flags to the
dnl configure script of libflac, because it does not use pkg-config.
LIBVORBIS_LOCAL_CONFIGURE_ARGS="$LIBVORBIS_LOCAL_CONFIGURE_ARGS --with-ogg-includes=${libogg_dir}/include --with-ogg-libraries=${libogg_dir}/src/.libs"
AC_MSG_NOTICE([Vorbis libraries are available in this source tree])
else
AC_MSG_NOTICE([Vorbis libraries are NOT available in this source tree])