summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdam Jackson <ajax@nwnk.net>2005-07-20 19:31:56 +0000
committerAdam Jackson <ajax@nwnk.net>2005-07-20 19:31:56 +0000
commit762e676f39b96ba3eb80c33bb1def9d49c467e25 (patch)
tree60f6b2390e0ead17a0855946e1d93b3afcd2fedc
parentd8a8e23f12ef65115d76fc60ba6b7db77f45be47 (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 4b77f02..c5514fc 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -21,8 +21,8 @@
bin_PROGRAMS = xfwp
-xfwp_CFLAGS = $(DEP_CFLAGS)
-xfwp_LDADD = $(DEP_LIBS)
+xfwp_CFLAGS = $(XFWP_CFLAGS)
+xfwp_LDADD = $(XFWP_LIBS)
xfwp_SOURCES = \
io.c \
diff --git a/configure.ac b/configure.ac
index 123cd02..cbcda62 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, x11 ice xproxymngproto)
-AC_SUBST(DEP_CFLAGS)
-AC_SUBST(DEP_LIBS)
+PKG_CHECK_MODULES(XFWP, x11 ice xproxymngproto)
+AC_SUBST(XFWP_CFLAGS)
+AC_SUBST(XFWP_LIBS)
AC_OUTPUT([Makefile])