diff options
| author | Adam Jackson <ajax@nwnk.net> | 2005-07-20 19:31:52 +0000 |
|---|---|---|
| committer | Adam Jackson <ajax@nwnk.net> | 2005-07-20 19:31:52 +0000 |
| commit | b02f56c56dd0663069d4cd65bf99d7d04f39e743 (patch) | |
| tree | 317ba3c3bbe24f536265b2763186f9bc86308334 | |
| parent | c4d8c00d9297242d768a4d7d0eb40f640432b02f (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 | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/Makefile.am b/Makefile.am index b54e324..55a8da6 100644 --- a/Makefile.am +++ b/Makefile.am @@ -21,8 +21,8 @@ bin_PROGRAMS = xdbedizzy -xdbedizzy_CFLAGS = $(DEP_CFLAGS) $(EXTRA) -xdbedizzy_LDADD = $(DEP_LIBS) -lm +xdbedizzy_CFLAGS = $(XDBEDIZZY_CFLAGS) $(EXTRA) +xdbedizzy_LDADD = $(XDBEDIZZY_LIBS) -lm if USE_XPRINT xdbedizzy_CFLAGS += -DUSE_XPRINT diff --git a/configure.ac b/configure.ac index e079d35..8cf0495 100644 --- a/configure.ac +++ b/configure.ac @@ -46,12 +46,12 @@ AM_CONDITIONAL([USE_XPRINT], [test "$use_xprint" = yes]) # Checks for pkg-config packages if test x$use_xprint = xyes ; then - PKG_CHECK_MODULES(DEP, xext xprintutil) + PKG_CHECK_MODULES(XDBEDIZZY, xext xprintutil) else - PKG_CHECK_MODULES(DEP, xext) + PKG_CHECK_MODULES(XDBEDIZZY, xext) fi -AC_SUBST(DEP_CFLAGS) -AC_SUBST(DEP_LIBS) +AC_SUBST(XDBEDIZZY_CFLAGS) +AC_SUBST(XDBEDIZZY_LIBS) AC_OUTPUT([Makefile]) |