From b7533f8eb9cea84603a80e5207b4a589d3dfd444 Mon Sep 17 00:00:00 2001
From: Adam Jackson <ajax@nwnk.net>
Date: Wed, 20 Jul 2005 19:31:58 +0000
Subject: 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.

---
 Makefile.am  |  4 ++--
 configure.ac | 14 +++++++-------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index d225d19..a9d0dcf 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -21,8 +21,8 @@
 
 bin_PROGRAMS = xlogo
 
-xlogo_CFLAGS = $(DEP_CFLAGS)
-xlogo_LDADD = $(DEP_LIBS)
+xlogo_CFLAGS = $(XLOGO_CFLAGS)
+xlogo_LDADD = $(XLOGO_LIBS)
 
 xlogo_SOURCES =	\
         Logo.c \
diff --git a/configure.ac b/configure.ac
index 0efb6a3..e2ba984 100644
--- a/configure.ac
+++ b/configure.ac
@@ -31,21 +31,21 @@ AC_PROG_CC
 AC_PROG_INSTALL
 
 # Checks for pkg-config packages
-XAW_CHECK_XPRINT_SUPPORT(DEP)
+XAW_CHECK_XPRINT_SUPPORT(XLOGO)
 
 if test "x$xaw_use_xprint" = "xyes" ; then
    PKG_CHECK_MODULES(XPRINT_UTIL, xprintutil)
 
-   DEP_CFLAGS="$DEP_CFLAGS $XPRINT_UTIL_CFLAGS"
-   DEP_LIBS="$DEP_LIBS $XPRINT_UTIL_LIBS"
+   XLOGO_CFLAGS="$DEP_CFLAGS $XPRINT_UTIL_CFLAGS"
+   XLOGO_LIBS="$DEP_LIBS $XPRINT_UTIL_LIBS"
 fi
 
 PKG_CHECK_MODULES(XRENDER, xrender)
 
-DEP_CFLAGS="$DEP_CFLAGS $XRENDER_CFLAGS"
-DEP_LIBS="$DEP_LIBS $XRENDER_LIBS"
+XLOGO_CFLAGS="$DEP_CFLAGS $XRENDER_CFLAGS"
+XLOGO_LIBS="$DEP_LIBS $XRENDER_LIBS"
 
-AC_SUBST(DEP_CFLAGS)
-AC_SUBST(DEP_LIBS)
+AC_SUBST(XLOGO_CFLAGS)
+AC_SUBST(XLOGO_LIBS)
 
 AC_OUTPUT([Makefile])
-- 
cgit v1.2.3