summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdam Jackson <ajax@nwnk.net>2005-07-20 19:32:04 +0000
committerAdam Jackson <ajax@nwnk.net>2005-07-20 19:32:04 +0000
commitae806b5d11971407cc06f22ff1ce81c86fbae672 (patch)
treef884b32a99e56a939147abc746009021c6f8ee2f
parent2357729733356dde5bf4fad434cfc6a3c9bd7f44 (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.am4
-rw-r--r--configure.ac6
2 files changed, 5 insertions, 5 deletions
diff --git a/Makefile.am b/Makefile.am
index ace756c..de745be 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -24,10 +24,10 @@ bin_PROGRAMS = xsm
SYSTEM_INIT_DIR = $(libdir)/X11/xsm
-xsm_CFLAGS = $(DEP_CFLAGS) -DRSHCMD=\"@RSH@\" \
+xsm_CFLAGS = $(XSM_CFLAGS) -DRSHCMD=\"@RSH@\" \
-DSYSTEM_INIT_FILE=\"$(SYSTEM_INIT_DIR)/system.xsm\"
-xsm_LDADD = $(DEP_LIBS)
+xsm_LDADD = $(XSM_LIBS)
xsm_SOURCES = \
auth.c \
diff --git a/configure.ac b/configure.ac
index 098b66b..14840e5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -61,9 +61,9 @@ AC_CHECK_FUNC([mkstemp],
AC_DEFINE(HAS_MKSTEMP,1,[Define to 1 if you have the `mkstemp' function.]))
# Checks for pkg-config packages
-XAW_CHECK_XPRINT_SUPPORT(DEP)
+XAW_CHECK_XPRINT_SUPPORT(XSM)
-AC_SUBST(DEP_CFLAGS)
-AC_SUBST(DEP_LIBS)
+AC_SUBST(XSM_CFLAGS)
+AC_SUBST(XSM_LIBS)
AC_OUTPUT([Makefile])