diff options
| author | Adam Jackson <ajax@nwnk.net> | 2005-07-20 19:31:49 +0000 |
|---|---|---|
| committer | Adam Jackson <ajax@nwnk.net> | 2005-07-20 19:31:49 +0000 |
| commit | 4ae6c4a84f601196a4cf67dd6f1269c239c757b1 (patch) | |
| tree | d14d2e45e1fc82e32b73c6721f747194504add3b | |
| parent | bdd6bc86322d8769390ce81e74a9c2da103e3533 (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 8689fd9..35c7d59 100644 --- a/Makefile.am +++ b/Makefile.am @@ -21,8 +21,8 @@ bin_PROGRAMS = mkfontscale -mkfontscale_CFLAGS = @DEP_CFLAGS@ -mkfontscale_LDADD = @DEP_LIBS@ +mkfontscale_CFLAGS = @MKFONTSCALE_CFLAGS@ +mkfontscale_LDADD = @MKFONTSCALE_LIBS@ mkfontscale_SOURCES = \ data.h \ diff --git a/configure.ac b/configure.ac index 408f7cd..55979c5 100644 --- a/configure.ac +++ b/configure.ac @@ -34,8 +34,8 @@ AC_CHECK_LIB(z, gzopen, [], [AC_MSG_ERROR([zlib is required, but was not found.])]) # Checks for pkg-config packages -PKG_CHECK_MODULES(DEP, fontenc freetype2) -AC_SUBST(DEP_CFLAGS) -AC_SUBST(DEP_LIBS) +PKG_CHECK_MODULES(MKFONTSCALE, fontenc freetype2) +AC_SUBST(MKFONTSCALE_CFLAGS) +AC_SUBST(MKFONTSCALE_LIBS) AC_OUTPUT([Makefile]) |