summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdam Jackson <ajax@nwnk.net>2005-07-20 19:31:48 +0000
committerAdam Jackson <ajax@nwnk.net>2005-07-20 19:31:48 +0000
commit193cf93becd97779c8d6ee790efa78387c71b258 (patch)
tree3f49b7830a3b1ac2a45938250704cfe58ada402d
parent3fbfc8390e09c5d63a8ab37342f09784acc13485 (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 81f497d..ca9b209 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -21,8 +21,8 @@
bin_PROGRAMS = editres
-editres_CFLAGS = $(DEP_CFLAGS)
-editres_LDADD = $(DEP_LIBS)
+editres_CFLAGS = $(EDITRES_CFLAGS)
+editres_LDADD = $(EDITRES_LIBS)
editres_SOURCES = \
actions.c \
diff --git a/configure.ac b/configure.ac
index f9ff901..31bd823 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(EDITRES, x11 xt xmu)
+EDITRES_CFLAGS="$DEP_CFLAGS $XAW_CFLAGS"
+EDITRES_LIBS="$DEP_LIBS $XAW_LIBS"
+AC_SUBST(EDITRES_CFLAGS)
+AC_SUBST(EDITRES_LIBS)
AC_OUTPUT([Makefile])