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
commite03e8dd59d692c551c89e5d3dce5ed6dfdbea63b (patch)
treee6171f0d8a1134788012e9d1d8ac6c653f83314b
parent492cae010ee83167c662df163f37dec2ef5b8b8b (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 9ad914a..cdf24f5 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -21,8 +21,8 @@
bin_PROGRAMS = fslsfonts
-fslsfonts_CFLAGS = $(DEP_CFLAGS)
-fslsfonts_LDADD = $(DEP_LIBS)
+fslsfonts_CFLAGS = $(FSLSFONTS_CFLAGS)
+fslsfonts_LDADD = $(FSLSFONTS_LIBS)
fslsfonts_SOURCES = \
fslsfonts.c
diff --git a/configure.ac b/configure.ac
index 051e0d1..11d42a0 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 libfs)
-AC_SUBST(DEP_CFLAGS)
-AC_SUBST(DEP_LIBS)
+PKG_CHECK_MODULES(FSLSFONTS, x11 libfs)
+AC_SUBST(FSLSFONTS_CFLAGS)
+AC_SUBST(FSLSFONTS_LIBS)
AC_OUTPUT([Makefile])