Do PKG_CHECK_MODULES on a unique token instead of on "DEP", so builds with

    a global configure cache don't get confused.

diff --git a/configure.ac b/configure.ac
index 71836d7..b0a3421 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -33,10 +33,10 @@ AC_PROG_CC
 AC_PROG_LIBTOOL
 
 # Check for dependencies
-PKG_CHECK_MODULES(DEP, x11 xext xextproto videoproto)
+PKG_CHECK_MODULES(XVMC, x11 xext xextproto videoproto)
 
-AC_SUBST(DEP_CFLAGS)
-AC_SUBST(DEP_LIBS)
+AC_SUBST(XVMC_CFLAGS)
+AC_SUBST(XVMC_LIBS)
                  
 XORG_RELEASE_VERSION
 

diff --git a/src/Makefile.am b/src/Makefile.am
index 459bb13..d1898a8 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -7,12 +7,12 @@ libXvMC_la_SOURCES = \
 libXvMCW_la_SOURCES = \
        XvMCWrapper.c
 
-libXvMC_la_LIBADD = @DEP_LIBS@
-libXvMC_la_CFLAGS = @DEP_CFLAGS@ -I$(top_srcdir)/include
+libXvMC_la_LIBADD = @XVMC_LIBS@
+libXvMC_la_CFLAGS = @XVMC_CFLAGS@ -I$(top_srcdir)/include
 
-libXvMCW_la_LIBADD = @DEP_LIBS@
+libXvMCW_la_LIBADD = @XVMC_LIBS@
 libXvMCW_la_CFLAGS =                           \
-       @DEP_CFLAGS@                            \
+       @XVMC_CFLAGS@                           \
        -I$(top_srcdir)/include                 \
        -DXVMC_CONFIGDIR=XConfigDir             \
        -DXVMC_SOVERSION=\"1.0\"                \

diff --git a/xvmc.pc.in b/xvmc.pc.in
index 99bf14c..06e7903 100644 (file)
--- a/xvmc.pc.in
+++ b/xvmc.pc.in
@@ -6,6 +6,6 @@ includedir=@includedir@
 Name: XvMC
 Description: The XvMC Library
 Version: @PACKAGE_VERSION@
-Cflags: -I${includedir} @DEP_CFLAGS@
-Libs: -L${libdir} -lXvMC @DEP_LIBS@
+Cflags: -I${includedir} @XVMC_CFLAGS@
+Libs: -L${libdir} -lXvMC @XVMC_LIBS@