diff options
| author | Adam Jackson <ajax@nwnk.net> | 2005-07-20 19:31:48 +0000 |
|---|---|---|
| committer | Adam Jackson <ajax@nwnk.net> | 2005-07-20 19:31:48 +0000 |
| commit | ed904c57d881eb9bcd09aeb8722fbb55687f3600 (patch) | |
| tree | b491b7604c16d628e3e05142e8c8401fb7dbb91f | |
| parent | b209b9a7f683c10a77ed2e03da79b7ac1abc4844 (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 99a9ac5..a60b2c8 100644 --- a/Makefile.am +++ b/Makefile.am @@ -21,8 +21,8 @@ bin_PROGRAMS = fonttosfnt -fonttosfnt_CFLAGS = $(DEP_CFLAGS) -DXVENDORNAME=\"X.org\ Foundation\" -DXVENDORNAMESHORT=\"X.org\" -fonttosfnt_LDADD = $(DEP_LIBS) -lm +fonttosfnt_CFLAGS = $(FONTTOSFNT_CFLAGS) -DXVENDORNAME=\"X.org\ Foundation\" -DXVENDORNAMESHORT=\"X.org\" +fonttosfnt_LDADD = $(FONTTOSFNT_LIBS) -lm fonttosfnt_SOURCES = \ fonttosfnt.c \ diff --git a/configure.ac b/configure.ac index 14731cc..6d98e2d 100644 --- a/configure.ac +++ b/configure.ac @@ -36,8 +36,8 @@ AC_CHECK_FUNC(setenv, have_setenv=yes, have_setenv=no) AM_CONDITIONAL(NEED_SETENV, [test x$have_setenv = xno]) # Checks for pkg-config packages -PKG_CHECK_MODULES(DEP, x11 freetype2 fontenc) -AC_SUBST(DEP_CFLAGS) -AC_SUBST(DEP_LIBS) +PKG_CHECK_MODULES(FONTTOSFNT, x11 freetype2 fontenc) +AC_SUBST(FONTTOSFNT_CFLAGS) +AC_SUBST(FONTTOSFNT_LIBS) AC_OUTPUT([Makefile]) |