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 | 0842c698bd90b2f47d808d47b37912a7a0e3ba78 (patch) | |
| tree | bb9ba35f1e0e80500234fda300e254898abcbd37 | |
| parent | c46761f286f8c9a41ee0e510211b5ed667a78479 (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 e97ae06..a52c22b 100644 --- a/Makefile.am +++ b/Makefile.am @@ -101,8 +101,8 @@ libre_a_SOURCES = \ # xedit # -xedit_CFLAGS = $(DEP_CFLAGS) -I$(top_srcdir)/lisp/re -D_BSD_SOURCE -DXEDIT -DINCLUDE_XPRINT_SUPPORT -xedit_LDADD = $(DEP_LIBS) libre.a liblisp.a libmp.a -lm +xedit_CFLAGS = $(XEDIT_CFLAGS) -I$(top_srcdir)/lisp/re -D_BSD_SOURCE -DXEDIT -DINCLUDE_XPRINT_SUPPORT +xedit_LDADD = $(XEDIT_LIBS) libre.a liblisp.a libmp.a -lm xedit_SOURCES = \ commands.c \ diff --git a/configure.ac b/configure.ac index 8233863..9785ba5 100644 --- a/configure.ac +++ b/configure.ac @@ -33,15 +33,15 @@ AC_PROG_INSTALL AC_PROG_RANLIB # Checks for pkg-config packages -XAW_CHECK_XPRINT_SUPPORT(DEP) +XAW_CHECK_XPRINT_SUPPORT(XEDIT) 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" + XEDIT_CFLAGS="$DEP_CFLAGS $XPRINT_UTIL_CFLAGS" + XEDIT_LIBS="$DEP_LIBS $XPRINT_UTIL_LIBS" fi -AC_SUBST(DEP_CFLAGS) -AC_SUBST(DEP_LIBS) +AC_SUBST(XEDIT_CFLAGS) +AC_SUBST(XEDIT_LIBS) AC_OUTPUT([Makefile]) |