diff options
| author | Adam Jackson <ajax@nwnk.net> | 2005-07-20 19:32:03 +0000 |
|---|---|---|
| committer | Adam Jackson <ajax@nwnk.net> | 2005-07-20 19:32:03 +0000 |
| commit | f9a60649a815c42cd5ebd9e24dbbb12d62fd90de (patch) | |
| tree | d00e21de4adcbac1850d8895c58f783b520667d1 | |
| parent | bf280e7bc5d6e2c65ea0235fde208274a714d13b (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.am | 4 | ||||
| -rw-r--r-- | configure.ac | 10 |
2 files changed, 7 insertions, 7 deletions
diff --git a/Makefile.am b/Makefile.am index 0ad63c9..9b52fbe 100644 --- a/Makefile.am +++ b/Makefile.am @@ -21,8 +21,8 @@ bin_PROGRAMS = xmore -xmore_CFLAGS = $(DEP_CFLAGS) -DXMORE -xmore_LDADD = $(DEP_LIBS) +xmore_CFLAGS = $(XMORE_CFLAGS) -DXMORE +xmore_LDADD = $(XMORE_LIBS) xmore_SOURCES = \ xmore.c \ diff --git a/configure.ac b/configure.ac index edb5e93..16bf048 100644 --- a/configure.ac +++ b/configure.ac @@ -32,15 +32,15 @@ AC_PROG_CC AC_PROG_INSTALL # Checks for pkg-config packages -XAW_CHECK_XPRINT_SUPPORT(DEP) +XAW_CHECK_XPRINT_SUPPORT(XMORE) 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" + XMORE_CFLAGS="$DEP_CFLAGS $XPRINT_UTIL_CFLAGS" + XMORE_LIBS="$DEP_LIBS $XPRINT_UTIL_LIBS" fi -AC_SUBST(DEP_CFLAGS) -AC_SUBST(DEP_LIBS) +AC_SUBST(XMORE_CFLAGS) +AC_SUBST(XMORE_LIBS) AC_OUTPUT([Makefile]) |