summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdam Jackson <ajax@nwnk.net>2005-07-20 19:31:49 +0000
committerAdam Jackson <ajax@nwnk.net>2005-07-20 19:31:49 +0000
commit7334df8b1d2aaa3d86ef0edb67138026e154f6b7 (patch)
tree495fa558018e5485faa8851d36963321157b9b41
parent8b25b98b1cbe95610a862d75cdecd59cd40bca30 (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.ac10
2 files changed, 7 insertions, 7 deletions
diff --git a/Makefile.am b/Makefile.am
index 448e801..bb8c5c8 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -21,8 +21,8 @@
bin_PROGRAMS = listres
-listres_CFLAGS = $(DEP_CFLAGS) -D_BSD_SOURCE
-listres_LDADD = $(DEP_LIBS)
+listres_CFLAGS = $(LISTRES_CFLAGS) -D_BSD_SOURCE
+listres_LDADD = $(LISTRES_LIBS)
listres_SOURCES = \
listres.c
diff --git a/configure.ac b/configure.ac
index 93f4da8..c79b86f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -34,10 +34,10 @@ AC_PROG_INSTALL
XAW_CHECK_XPRINT_SUPPORT(XAW)
# Checks for pkg-config packages
-PKG_CHECK_MODULES(DEP, x11 xt xmu)
-DEP_CFLAGS="$DEP_CFLAGS $XAW_CFLAGS"
-DEP_LIBS="$DEP_LIBS $XAW_LIBS"
-AC_SUBST(DEP_CFLAGS)
-AC_SUBST(DEP_LIBS)
+PKG_CHECK_MODULES(LISTRES, x11 xt xmu)
+LISTRES_CFLAGS="$DEP_CFLAGS $XAW_CFLAGS"
+LISTRES_LIBS="$DEP_LIBS $XAW_LIBS"
+AC_SUBST(LISTRES_CFLAGS)
+AC_SUBST(LISTRES_LIBS)
AC_OUTPUT([Makefile])