summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdam Jackson <ajax@nwnk.net>2005-07-20 19:32:04 +0000
committerAdam Jackson <ajax@nwnk.net>2005-07-20 19:32:04 +0000
commit30d354e3fa21954d67cadfee8438e8d1d5563c81 (patch)
tree54bbe88280ef382407d393b446f6a7071ea180c7
parent6467b9f9b57d56d502e97260261745742a7645c7 (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 f1827d8..4f5cb39 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -21,8 +21,8 @@
bin_PROGRAMS = xset
-xset_CFLAGS = $(DEP_CFLAGS) -D_BSD_SOURCE
-xset_LDADD = $(DEP_LIBS)
+xset_CFLAGS = $(XSET_CFLAGS) -D_BSD_SOURCE
+xset_LDADD = $(XSET_LIBS)
xset_SOURCES = \
xset.c
diff --git a/configure.ac b/configure.ac
index a2c84b9..d482527 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, xmu)
-AC_SUBST(DEP_CFLAGS)
-AC_SUBST(DEP_LIBS)
+PKG_CHECK_MODULES(XSET, xmu)
+AC_SUBST(XSET_CFLAGS)
+AC_SUBST(XSET_LIBS)
AC_OUTPUT([Makefile])