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
commit52f5d9a418159d31b86df0df679bee4147bbb38b (patch)
treefc0c3794835ad4bf9600b47c3f33c153fe9bfcbf
parenta971b93716a6ac10b8f77b2c6637ace00f42b531 (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 fac5938..2f57f41 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -21,8 +21,8 @@
bin_PROGRAMS = xsetmode
-xsetmode_CFLAGS = $(DEP_CFLAGS)
-xsetmode_LDADD = $(DEP_LIBS)
+xsetmode_CFLAGS = $(XSETMODE_CFLAGS)
+xsetmode_LDADD = $(XSETMODE_LIBS)
xsetmode_SOURCES = \
xsetmode.c
diff --git a/configure.ac b/configure.ac
index be03447..412b34f 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, xi x11)
-AC_SUBST(DEP_CFLAGS)
-AC_SUBST(DEP_LIBS)
+PKG_CHECK_MODULES(XSETMODE, xi x11)
+AC_SUBST(XSETMODE_CFLAGS)
+AC_SUBST(XSETMODE_LIBS)
AC_OUTPUT([Makefile])