diff options
| author | Adam Jackson <ajax@nwnk.net> | 2005-08-03 03:28:03 +0000 |
|---|---|---|
| committer | Adam Jackson <ajax@nwnk.net> | 2005-08-03 03:28:03 +0000 |
| commit | 49e4c36c1bf2ccc3af576c489abf76bea4bf64b1 (patch) | |
| tree | 29385d1bc12c8e73ea5766ac4e6b89aa38e41fdb | |
| parent | 8a6fb4344eb5c13198125996e43a0898a19818f8 (diff) | |
Do PKG_CHECK_MODULES on a unique token instead of on "DEP", so builds with
a global configure cache don't get confused.
| -rw-r--r-- | configure.ac | 6 | ||||
| -rw-r--r-- | fontenc.pc.in | 4 | ||||
| -rw-r--r-- | src/Makefile.am | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/configure.ac b/configure.ac index 0b84c21..0514dd6 100644 --- a/configure.ac +++ b/configure.ac @@ -38,10 +38,10 @@ AC_PROG_LIBTOOL AC_CHECK_LIB(z, gzclose) # Check for dependencies -PKG_CHECK_MODULES(DEP, xproto) +PKG_CHECK_MODULES(FONTENC, xproto) -AC_SUBST(DEP_CFLAGS) -AC_SUBST(DEP_LIBS) +AC_SUBST(FONTENC_CFLAGS) +AC_SUBST(FONTENC_LIBS) XORG_RELEASE_VERSION diff --git a/fontenc.pc.in b/fontenc.pc.in index c5c149d..b23e406 100644 --- a/fontenc.pc.in +++ b/fontenc.pc.in @@ -6,6 +6,6 @@ includedir=@includedir@ Name: fontenc Description: The fontenc Library Version: @PACKAGE_VERSION@ -Cflags: -I${includedir} @DEP_CFLAGS@ -Libs: -L${libdir} -lfontenc @DEP_LIBS@ +Cflags: -I${includedir} @FONTENC_CFLAGS@ +Libs: -L${libdir} -lfontenc @FONTENC_LIBS@ diff --git a/src/Makefile.am b/src/Makefile.am index dfc42af..d05fc29 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -12,7 +12,7 @@ INCLUDES = -I$(top_srcdir)/include \ -DFONTENC_NO_LIBFONT $(FONTENCDEFS) -libfontenc_la_LIBADD = @DEP_LIBS@ +libfontenc_la_LIBADD = @FONTENC_LIBS@ libfontenc_la_LDFLAGS = -version-number 1:0:0 -no-undefined |