diff options
| author | Adam Jackson <ajax@nwnk.net> | 2005-07-20 19:31:55 +0000 |
|---|---|---|
| committer | Adam Jackson <ajax@nwnk.net> | 2005-07-20 19:31:55 +0000 |
| commit | 875c7f079c6230e8a09e53904e64277360ec86c7 (patch) | |
| tree | 4d96bb1c730572e0a0bab79112f60e486d57d7de | |
| parent | 3fc196e33de9fe3c8468d771763c4433328c764c (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 31e607b..0dbb739 100644 --- a/Makefile.am +++ b/Makefile.am @@ -21,8 +21,8 @@ bin_PROGRAMS = xfd -xfd_CFLAGS = $(DEP_CFLAGS) -DXRENDER -xfd_LDADD = $(DEP_LIBS) +xfd_CFLAGS = $(XFD_CFLAGS) -DXRENDER +xfd_LDADD = $(XFD_LIBS) xfd_SOURCES = \ grid.c \ diff --git a/configure.ac b/configure.ac index fd392af..0285203 100644 --- a/configure.ac +++ b/configure.ac @@ -32,15 +32,15 @@ AC_PROG_CC AC_PROG_INSTALL # Checks for pkg-config packages -XAW_CHECK_XPRINT_SUPPORT(DEP) +XAW_CHECK_XPRINT_SUPPORT(XFD) PKG_CHECK_MODULES(ADDITIONAL, freetype2 fontconfig xft) -DEP_CFLAGS="$DEP_CFLAGS $ADDITIONAL_CFLAGS" -DEP_LIBS="$DEP_LIBS $ADDITIONAL_LIBS" +XFD_CFLAGS="$DEP_CFLAGS $ADDITIONAL_CFLAGS" +XFD_LIBS="$DEP_LIBS $ADDITIONAL_LIBS" -AC_SUBST(DEP_CFLAGS) -AC_SUBST(DEP_LIBS) +AC_SUBST(XFD_CFLAGS) +AC_SUBST(XFD_LIBS) |