From 81a51fb38778c54442657142cf5d57fae4ac3e0e Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Wed, 20 Jul 2005 19:31:51 +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 | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Makefile.am b/Makefile.am index 9162f17..28169dc 100644 --- a/Makefile.am +++ b/Makefile.am @@ -28,8 +28,8 @@ LIBPATH = $(libdir)/X11/x11perfcomp x11perfcompdir = $(LIBPATH) dist_x11perfcomp_SCRIPTS = fillblnk.sh perfboth.sh perfratio.sh Xmark.sh -x11perf_CFLAGS = $(DEP_CFLAGS) -x11perf_LDADD = $(DEP_LIBS) -lm +x11perf_CFLAGS = $(X11PERF_CFLAGS) +x11perf_LDADD = $(X11PERF_LIBS) -lm x11perf_SOURCES = \ bitmaps.c \ diff --git a/configure.ac b/configure.ac index 3ded10b..803e44a 100644 --- a/configure.ac +++ b/configure.ac @@ -37,8 +37,8 @@ if [[ -z $SED ]] ; then fi # Checks for pkg-config packages -PKG_CHECK_MODULES(DEP, x11 xmu) -AC_SUBST(DEP_CFLAGS) -AC_SUBST(DEP_LIBS) +PKG_CHECK_MODULES(X11PERF, x11 xmu) +AC_SUBST(X11PERF_CFLAGS) +AC_SUBST(X11PERF_LIBS) AC_OUTPUT([Makefile]) -- cgit v1.2.3