summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdam Jackson <ajax@nwnk.net>2005-07-20 19:32:05 +0000
committerAdam Jackson <ajax@nwnk.net>2005-07-20 19:32:05 +0000
commit00de3c1da23b030d5ad6818c8af7f4e9a968a60e (patch)
treed0fcf74d2aab33d32dd5ebf1fab209b1608be012
parentd5c7c5891a774190d3a1fbf1727bfb8238be0f23 (diff)
Use a unique token for PKG_CHECK_MODULES. Otherwise, if you use a global
configure cache, you cache it, and the cached value is probably wrong.
-rw-r--r--Makefile.am4
-rw-r--r--configure.ac6
2 files changed, 5 insertions, 5 deletions
diff --git a/Makefile.am b/Makefile.am
index 75007fd..0da718d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -21,8 +21,8 @@
bin_PROGRAMS = xvinfo
-xvinfo_CFLAGS = $(DEP_CFLAGS)
-xvinfo_LDADD = $(DEP_LIBS)
+xvinfo_CFLAGS = $(XVINFO_CFLAGS)
+xvinfo_LDADD = $(XVINFO_LIBS)
xvinfo_SOURCES = \
xvinfo.c
diff --git a/configure.ac b/configure.ac
index f69b499..f423bd4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -32,8 +32,8 @@ AC_PROG_CC
AC_PROG_INSTALL
# Checks for pkg-config packages
-PKG_CHECK_MODULES(DEP, xv x11)
-AC_SUBST(DEP_CFLAGS)
-AC_SUBST(DEP_LIBS)
+PKG_CHECK_MODULES(XVINFO, xv x11)
+AC_SUBST(XVINFO_CFLAGS)
+AC_SUBST(XVINFO_LIBS)
AC_OUTPUT([Makefile])