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 | ed783e6948cf7cd937f0570e9578162e35495d45 (patch) | |
| tree | 4fc8a45ecb7b7383d7bd57c94d6d30ba70e5de41 | |
| parent | bcc095561f040a8a0cd19ed94bc800d128e9c0b1 (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 | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/Makefile.am b/Makefile.am index cc6b534..aad80af 100644 --- a/Makefile.am +++ b/Makefile.am @@ -22,7 +22,7 @@ bin_PROGRAMS = xdpyinfo AM_CFLAGS = \ - $(DEP_CFLAGS) \ + $(XDPYINFO_CFLAGS) \ $(XEXT_CFLAGS) \ $(XKB_CFLAGS) \ $(XF86VIDMODE_CFLAGS) \ @@ -35,7 +35,7 @@ AM_CFLAGS = \ $(XPRINT_CFLAGS) xdpyinfo_LDADD = \ - $(DEP_LIBS) \ + $(XDPYINFO_LIBS) \ $(XEXT_LIBS) \ $(XKB_LIBS) \ $(XF86VIDMODE_LIBS) \ diff --git a/configure.ac b/configure.ac index 9409a9c..d045688 100644 --- a/configure.ac +++ b/configure.ac @@ -32,9 +32,9 @@ AC_PROG_CC AC_PROG_INSTALL # Checks for pkg-config packages -PKG_CHECK_MODULES(DEP, xext x11 xtst) -AC_SUBST(DEP_CFLAGS) -AC_SUBST(DEP_LIBS) +PKG_CHECK_MODULES(XDPYINFO, xext x11 xtst) +AC_SUBST(XDPYINFO_CFLAGS) +AC_SUBST(XDPYINFO_LIBS) PKG_CHECK_MODULES(XEXT, xextproto xext, [SAVE_CPPFLAGS="$CPPFLAGS" |