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
commit5c31a07dbcb735445951f7f7cae8579ee16262d5 (patch)
treec35bd1fcb758fab6e2eeb407be15b605a5efd0b4
parent9e0555e9d980217dd20d1f7385ff47514675629c (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 e98dace..727ce1d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -21,8 +21,8 @@
bin_PROGRAMS = ico
-ico_CFLAGS = $(DEP_CFLAGS)
-ico_LDADD = $(DEP_LIBS) -lm
+ico_CFLAGS = $(ICO_CFLAGS)
+ico_LDADD = $(ICO_LIBS) -lm
ico_SOURCES = \
allobjs.h \
diff --git a/configure.ac b/configure.ac
index 7780976..4e41237 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)
-AC_SUBST(DEP_CFLAGS)
-AC_SUBST(DEP_LIBS)
+PKG_CHECK_MODULES(ICO, x11)
+AC_SUBST(ICO_CFLAGS)
+AC_SUBST(ICO_LIBS)
AC_OUTPUT([Makefile])