From fe29c745207c2076cd711a23d1dbae033a192143 Mon Sep 17 00:00:00 2001
From: Adam Jackson <ajax@nwnk.net>
Date: Wed, 20 Jul 2005 19:31:52 +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 | 10 +++++-----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 3d99d65..17a6350 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -21,8 +21,8 @@
 
 bin_PROGRAMS = xclock
 
-xclock_CFLAGS = $(DEP_CFLAGS)
-xclock_LDADD = $(DEP_LIBS)
+xclock_CFLAGS = $(XCLOCK_CFLAGS)
+xclock_LDADD = $(XCLOCK_LIBS)
 
 xclock_SOURCES =	\
         Clock.c \
diff --git a/configure.ac b/configure.ac
index 198e164..d19fa92 100644
--- a/configure.ac
+++ b/configure.ac
@@ -34,10 +34,10 @@ AC_PROG_INSTALL
 AC_CHECK_FUNCS([strlcpy])
 
 dnl Required dependencies
-PKG_CHECK_MODULES(X11, x11)
+PKG_CHECK_MODULES(XCLOCK_X11, x11)
 XAW_CHECK_XPRINT_SUPPORT(XAW)
-DEP_CFLAGS="$X11_CFLAGS $XAW_CFLAGS"
-DEP_LIBS="$X11_LIBS $XAW_LIBS"
+XCLOCK_CFLAGS="$XCLOCK_X11_CFLAGS $XAW_CFLAGS"
+XCLOCK_LIBS="$XCLOCK_X11_LIBS $XAW_LIBS"
 
 dnl Optional dependencies
 AC_ARG_WITH(xft, AC_HELP_STRING([--with-xft],[Use Xft2 and Xrender for rendering (Default is YES)]),use_xft="$withval",use_xft="try")
@@ -58,7 +58,7 @@ if test x$use_xkb != xno ; then
 	AC_DEFINE([XKB],1,[Define to use XkbStdBell])
 fi
 
-AC_SUBST(DEP_CFLAGS)
-AC_SUBST(DEP_LIBS)
+AC_SUBST(XCLOCK_CFLAGS)
+AC_SUBST(XCLOCK_LIBS)
 
 AC_OUTPUT([Makefile])
-- 
cgit v1.2.3