From c0414eb4d8c710fac94ea32bc47031e1855c6fdb Mon Sep 17 00:00:00 2001
From: Adam Jackson <ajax@nwnk.net>
Date: Wed, 3 Aug 2005 03:28:03 +0000
Subject: Do PKG_CHECK_MODULES on a unique token instead of on "DEP", so builds
 with     a global configure cache don't get confused.

---
 configure.ac    | 6 +++---
 dmx.pc.in       | 4 ++--
 src/Makefile.am | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/configure.ac b/configure.ac
index f1a88f7..d4793c9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -34,10 +34,10 @@ AC_PROG_CC
 AC_PROG_LIBTOOL
 
 # Check for dependencies
-PKG_CHECK_MODULES(DEP, x11 xext xextproto dmxproto)
+PKG_CHECK_MODULES(DMX, x11 xext xextproto dmxproto)
 
-AC_SUBST(DEP_CFLAGS)
-AC_SUBST(DEP_LIBS)
+AC_SUBST(DMX_CFLAGS)
+AC_SUBST(DMX_LIBS)
 		  
 XORG_RELEASE_VERSION
 
diff --git a/dmx.pc.in b/dmx.pc.in
index 8500c9f..6110ac7 100644
--- a/dmx.pc.in
+++ b/dmx.pc.in
@@ -6,6 +6,6 @@ includedir=@includedir@
 Name: dmx
 Description: The dmx Library
 Version: @PACKAGE_VERSION@
-Cflags: -I${includedir} @DEP_CFLAGS@
-Libs: -L${libdir} -ldmx @DEP_LIBS@
+Cflags: -I${includedir} @DMX_CFLAGS@
+Libs: -L${libdir} -ldmx @DMX_LIBS@
 
diff --git a/src/Makefile.am b/src/Makefile.am
index 37b7db5..5d1823e 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -3,8 +3,8 @@ lib_LTLIBRARIES = libdmx.la
 libdmx_la_SOURCES = \
          dmx.c
 
-libdmx_la_LIBADD = $(DEP_LIBS)
+libdmx_la_LIBADD = $(DMX_LIBS)
 
 libdmx_la_LDFLAGS = -version-number 1:0:0 -no-undefined
 
-AM_CFLAGS = $(DEP_CFLAGS)
+AM_CFLAGS = $(DMX_CFLAGS)
-- 
cgit v1.2.1