From 85e45a09e2410989d9be492a2d1710a8a3d97028 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Sebastian=20Dr=C3=B6ge?= Date: Thu, 9 Aug 2012 13:37:22 +0200 Subject: [PATCH] vp8: Use pkg-config file for getting the LIBS and CFLAGS --- configure.ac | 14 ++++++-------- ext/vp8/Makefile.am | 1 + 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/configure.ac b/configure.ac index 45490e5..cfdfa78 100644 --- a/configure.ac +++ b/configure.ac @@ -1761,19 +1761,17 @@ AG_GST_CHECK_FEATURE(ZBAR, [ZBar barcode detector], zbar, [ dnl *** vp8 *** translit(dnm, m, l) AM_CONDITIONAL(USE_VP8, vp8) AG_GST_CHECK_FEATURE(VP8, [VP8 decoder], vp8, [ - VPX_LIBS="" - AG_GST_CHECK_LIBHEADER(VPX, vpx, - vpx_codec_version, , - vpx/vpx_codec.h, [ + PKG_CHECK_MODULES(VPX, vpx, [HAVE_VPX="yes"], [HAVE_VPX="no"]) + + if test $HAVE_VPX = "yes"; then HAVE_VP8_ENCODER=no HAVE_VP8_DECODER=no OLD_LIBS="$LIBS" - LIBS="$LIBS $LIBM -lpthread" + LIBS="$LIBS $VPX_LIBS" AC_CHECK_LIB(vpx, vpx_codec_vp8_cx_algo, [ HAVE_VP8=yes AC_DEFINE(HAVE_VP8_ENCODER, 1, [Defined if the VP8 encoder is available]) - VPX_LIBS="-lvpx" AC_MSG_CHECKING([for VP8E_SET_TUNING presence]) AC_TRY_COMPILE([ @@ -1792,11 +1790,11 @@ return 0; AC_CHECK_LIB(vpx, vpx_codec_vp8_dx_algo, [ HAVE_VP8=yes AC_DEFINE(HAVE_VP8_DECODER, 1, [Defined if the VP8 decoder is available]) - VPX_LIBS="-lvpx" ]) LIBS="$OLD_LIBS" - ]) + fi AC_SUBST(VPX_LIBS) + AC_SUBST(VPX_CFLAGS) ]) dnl *** rtmp *** diff --git a/ext/vp8/Makefile.am b/ext/vp8/Makefile.am index 09b8d5c..3b32713 100644 --- a/ext/vp8/Makefile.am +++ b/ext/vp8/Makefile.am @@ -11,6 +11,7 @@ libgstvp8_la_CFLAGS = \ $(GST_PLUGINS_BASE_CFLAGS) \ $(GST_BASE_CFLAGS) \ $(GST_CFLAGS) \ + $(VPX_CFLAGS) \ -DGST_USE_UNSTABLE_API libgstvp8_la_LIBADD = \ $(GST_PLUGINS_BASE_LIBS) -lgsttag-@GST_API_VERSION@ -lgstvideo-@GST_API_VERSION@ \ -- 2.7.4