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

@@ -89,8 +89,8 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/add_cflags.m4 \
$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/pkg.m4 \
$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/ogg.m4 \
$(top_srcdir)/m4/pkg.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d