diff options
| author | Adam Jackson <ajax@nwnk.net> | 2005-07-20 19:31:50 +0000 |
|---|---|---|
| committer | Adam Jackson <ajax@nwnk.net> | 2005-07-20 19:31:50 +0000 |
| commit | 6bea90f954b122c65c98b93908b6789684ac5959 (patch) | |
| tree | 3962a4444bc181ef4e60ef973c3bd5b4d840f077 | |
| parent | ff0444aac27e7a33a68871de65dc429ee2c44c47 (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 ba839de..607bb4b 100644 --- a/Makefile.am +++ b/Makefile.am @@ -24,12 +24,12 @@ bin_PROGRAMS = proxymngr CONFIG_DIR = $(libdir)/X11/proxymngr proxymngr_CFLAGS = \ - $(DEP_CFLAGS) \ + $(PROXYMNGR_CFLAGS) \ -DXVENDORNAME=\"The\ X\.Org\ Foundation\" \ -DXORG_RELEASE=\"Release\ $(VERSION)\" \ -DCONFIG_FILE=\"$(CONFIG_DIR)/proxymngr/pmconfig\" -proxymngr_LDADD = $(DEP_LIBS) +proxymngr_LDADD = $(PROXYMNGR_LIBS) proxymngr_SOURCES = \ config.c \ diff --git a/configure.ac b/configure.ac index 24c33d9..2a1b92e 100644 --- a/configure.ac +++ b/configure.ac @@ -45,8 +45,8 @@ if [[ -z $SED ]] ; then fi # Checks for pkg-config packages -PKG_CHECK_MODULES(DEP, ice xt x11 xproxymngproto) -AC_SUBST(DEP_CFLAGS) -AC_SUBST(DEP_LIBS) +PKG_CHECK_MODULES(PROXYMNGR, ice xt x11 xproxymngproto) +AC_SUBST(PROXYMNGR_CFLAGS) +AC_SUBST(PROXYMNGR_LIBS) AC_OUTPUT([Makefile]) |