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
commitf44de2580c94b06b8e43bb7f32f9409a5bfe1812 (patch)
treea7233dbc3eb7a5be87c9b29164de8bf7edc75b37
parent1b024ee5c3ddf09fb5d900cc8e1733d2ba0679d1 (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 f50ed93..bda3fd5 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -21,8 +21,8 @@
bin_PROGRAMS = xstdcmap
-xstdcmap_CFLAGS = $(DEP_CFLAGS) -D_BSD_SOURCE
-xstdcmap_LDADD = $(DEP_LIBS)
+xstdcmap_CFLAGS = $(XSTDCMAP_CFLAGS) -D_BSD_SOURCE
+xstdcmap_LDADD = $(XSTDCMAP_LIBS)
xstdcmap_SOURCES = \
xstdcmap.c
diff --git a/configure.ac b/configure.ac
index f5cc243..000dc4c 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, xmu x11)
-AC_SUBST(DEP_CFLAGS)
-AC_SUBST(DEP_LIBS)
+PKG_CHECK_MODULES(XSTDCMAP, xmu x11)
+AC_SUBST(XSTDCMAP_CFLAGS)
+AC_SUBST(XSTDCMAP_LIBS)
AC_OUTPUT([Makefile])