summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdam Jackson <ajax@nwnk.net>2005-07-20 19:31:51 +0000
committerAdam Jackson <ajax@nwnk.net>2005-07-20 19:31:51 +0000
commitd9ea3ae597b97c173faa6dd29077ddf3a4bbc5ac (patch)
tree8b1dc5b50e29746a74a2adc9540315606f095a09
parentdf4faebea1a9a32c5c4b78a2585cbf6a443181a7 (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 d1286b4..f034cfe 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -21,8 +21,8 @@
bin_PROGRAMS = xbiff
-xbiff_CFLAGS = $(DEP_CFLAGS) -D_BSD_SOURCE
-xbiff_LDADD = $(DEP_LIBS)
+xbiff_CFLAGS = $(XBIFF_CFLAGS) -D_BSD_SOURCE
+xbiff_LDADD = $(XBIFF_LIBS)
xbiff_SOURCES = \
Mailbox.c \
diff --git a/configure.ac b/configure.ac
index 6a4a4a8..a7df353 100644
--- a/configure.ac
+++ b/configure.ac
@@ -31,13 +31,13 @@ AM_CONFIG_HEADER(config.h)
AC_PROG_CC
AC_PROG_INSTALL
-XAW_CHECK_XPRINT_SUPPORT(DEP)
+XAW_CHECK_XPRINT_SUPPORT(XBIFF)
PKG_CHECK_MODULES(XBITMAPS, xbitmaps)
-DEP_CFLAGS="$DEP_CFLAGS $XBITMAPS_CFLAGS"
-DEP_LIBS="$DEP_LIBS $XBITMAPS_LIBS"
+XBIFF_CFLAGS="$DEP_CFLAGS $XBITMAPS_CFLAGS"
+XBIFF_LIBS="$DEP_LIBS $XBITMAPS_LIBS"
-AC_SUBST(DEP_CFLAGS)
-AC_SUBST(DEP_LIBS)
+AC_SUBST(XBIFF_CFLAGS)
+AC_SUBST(XBIFF_LIBS)
AC_OUTPUT([Makefile])