summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdam Jackson <ajax@nwnk.net>2005-07-20 19:31:51 +0000
committerAdam Jackson <ajax@nwnk.net>2005-07-20 19:31:51 +0000
commitb2de9b16ae9b7bfce8e7cc36f20a38084fa25469 (patch)
treef4fe9039fe3db960f902740e0036bc657556b1b6
parentc0570ffdfa9ef913b5132b2069dd69491f77a8f8 (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--configure.ac6
-rw-r--r--src/Makefile.am4
2 files changed, 5 insertions, 5 deletions
diff --git a/configure.ac b/configure.ac
index a5f84af..1c5d30d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -37,9 +37,9 @@ AC_CHECK_FUNC([mkstemp],
AC_DEFINE(HAS_MKSTEMP,1,[Define to 1 if you have the `mkstemp' function.]))
# Checks for pkg-config packages
-PKG_CHECK_MODULES(DEP, x11 xt xmu)
-AC_SUBST(DEP_CFLAGS)
-AC_SUBST(DEP_LIBS)
+PKG_CHECK_MODULES(TWM, x11 xt xmu)
+AC_SUBST(TWM_CFLAGS)
+AC_SUBST(TWM_LIBS)
AC_OUTPUT([Makefile
src/Makefile
diff --git a/src/Makefile.am b/src/Makefile.am
index 9afdd73..c530057 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -24,8 +24,8 @@ AM_YFLAGS = -d
bin_PROGRAMS = twm
-twm_CFLAGS = $(DEP_CFLAGS) -DXVENDORNAME=\"The\ X.org\ Foundation\" -DXORG_RELEASE=\"Release\ $(VERSION)\" -D_BSD_SOURCE
-twm_LDADD = $(DEP_LIBS)
+twm_CFLAGS = $(TWM_CFLAGS) -DXVENDORNAME=\"The\ X.org\ Foundation\" -DXORG_RELEASE=\"Release\ $(VERSION)\" -D_BSD_SOURCE
+twm_LDADD = $(TWM_LIBS)
twm_SOURCES = \
add_window.c \