From 0a2b3d36c22b85a8b85e881b28debd94e4712421 Mon Sep 17 00:00:00 2001
From: Bugmenot <bugmenot@mailinator.com>
Date: Wed, 25 Jul 2012 19:54:23 +0000
Subject: [PATCH] Bug 777166 - Use CFLAGS from pkgconfig for system libvpx,
 r=derf

From c445b9ab36a0c79aa1be2dfbd91438e994bccb4e Mon Sep 17 00:00:00 2001
---
 config/autoconf.mk.in          | 2 +-
 configure.in                   | 8 +++++---
 content/media/webm/Makefile.in | 2 +-
 3 files changed, 7 insertions(+), 5 deletions(-)
---
 config/autoconf.mk.in          | 2 +-
 configure.in                   | 8 +++++---
 content/media/webm/Makefile.in | 2 +-
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/config/autoconf.mk.in b/config/autoconf.mk.in
index 2b60f1d9b43..7b713036a6e 100644
--- a/config/autoconf.mk.in
+++ b/config/autoconf.mk.in
@@ -224,7 +224,7 @@ MOZ_LIBEVENT_INCLUDES = @MOZ_LIBEVENT_INCLUDES@
 
 MOZ_NATIVE_LIBVPX = @MOZ_NATIVE_LIBVPX@
 MOZ_LIBVPX_LIBS = @MOZ_LIBVPX_LIBS@
-MOZ_LIBVPX_INCLUDES = @MOZ_LIBVPX_INCLUDES@
+MOZ_LIBVPX_CFLAGS = @MOZ_LIBVPX_CFLAGS@
 
 MOZ_NATIVE_ZLIB	= @MOZ_NATIVE_ZLIB@
 MOZ_NATIVE_BZ2	= @MOZ_NATIVE_BZ2@
diff --git a/configure.in b/configure.in
index 2c2a27ff486..92085fd9030 100644
--- a/configure.in
+++ b/configure.in
@@ -5351,7 +5351,7 @@ MOZ_ARG_WITH_BOOL(system-libvpx,
 [  --with-system-libvpx    Use system libvpx (located with pkgconfig)],
     MOZ_NATIVE_LIBVPX=1)
 
-MOZ_LIBVPX_INCLUDES=
+MOZ_LIBVPX_CFLAGS=
 MOZ_LIBVPX_LIBS=
 
 if test -n "$MOZ_VP8"; then
@@ -5368,18 +5368,20 @@ if test -n "$MOZ_VP8"; then
         dnl === libvpx Version check ===
         dnl ============================
         dnl Check to see if we have a system libvpx package.
-        PKG_CHECK_MODULES(LIBVPX, vpx >= 1.0.0)
+        PKG_CHECK_MODULES(MOZ_LIBVPX, vpx >= 1.0.0)
 
         MOZ_CHECK_HEADER([vpx/vpx_decoder.h], [], 
          [AC_MSG_ERROR([Couldn't find vpx/vpx_decoder.h which is required for build with system libvpx. Use --without-system-libvpx to build with in-tree libvpx.])])
 
+        _SAVE_LIBS=$LIBS
         AC_CHECK_LIB(vpx, vpx_codec_dec_init_ver, [], 
          [AC_MSG_ERROR([--with-system-libvpx requested but symbol vpx_codec_dec_init_ver not found])])
+        LIBS=$_SAVE_LIBS
     fi
 fi
 
 AC_SUBST(MOZ_NATIVE_LIBVPX)
-AC_SUBST(MOZ_LIBVPX_INCLUDES)
+AC_SUBST(MOZ_LIBVPX_CFLAGS)
 AC_SUBST(MOZ_LIBVPX_LIBS)
 
 if test "$MOZ_WEBM"; then
diff --git a/content/media/webm/Makefile.in b/content/media/webm/Makefile.in
index 116970c1d95..76e38a059bb 100644
--- a/content/media/webm/Makefile.in
+++ b/content/media/webm/Makefile.in
@@ -30,5 +30,5 @@ FORCE_STATIC_LIB = 1
 include $(topsrcdir)/config/rules.mk
 
 LOCAL_INCLUDES = \
-		$(MOZ_LIBVPX_INCLUDES) \
+		$(MOZ_LIBVPX_CFLAGS) \
 		$(NULL)