summaryrefslogtreecommitdiff
path: root/configure.ac
diff options
context:
space:
mode:
authorSøren Sandmann Pedersen <sandmann@daimi.au.dk>2005-06-27 16:09:14 +0000
committerSøren Sandmann Pedersen <sandmann@daimi.au.dk>2005-06-27 16:09:14 +0000
commit4534fa0c8adb77b7db47101318e0e863edb186ce (patch)
treeb0ace95925e12601679ab68f6a70370e3bcfc158 /configure.ac
parentfda7215c0783ad170eb14f7dda078fac3f134470 (diff)
- Remove fontenc from Xfont
- Add a dependency from Xfont on libfontenc - Add build system for lib/fontenc - xc/lib/font: Change #include "fontenc.h" to #include <X11/fonts/fontenc.h> in some places. - Remove dpsinfo and dpsexec from the app section of symlink.sh - Fix xp.pc.in to add XPRINT_LIBS/CFLAGS instead of X_LIBS/CFLAGS
Diffstat (limited to 'configure.ac')
-rw-r--r--configure.ac4
1 files changed, 2 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac
index 0a7441b..eec4c4a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -126,6 +126,7 @@ fi
AM_CONDITIONAL(XFONT_FONTFILE, [test "x$XFONT_FONTFILE" = xyes])
if test "x$XFONT_FONTFILE" = xyes; then
AC_DEFINE(XFONT_FONTFILE,,[Support fonts in files])
+
fi
AC_CHECK_LIB(z, gzopen, [Z_LIBS=-lz
@@ -139,7 +140,7 @@ AC_SUBST(X_GZIP_FONT_COMPRESSION)
AC_CHECK_LIB(m, hypot, [MATH_LIBS=-lm
AC_SUBST(MATH_LIBS)], AC_MSG_ERROR([*** libm is required]))
-PKG_CHECK_MODULES(XFONT, xproto xtrans fontsproto)
+PKG_CHECK_MODULES(XFONT, xproto xtrans fontsproto fontenc)
if test "x$GCC" = "xyes"; then
GCC_WARNINGS="-Wall -Wpointer-arith -Wstrict-prototypes \
@@ -162,5 +163,4 @@ AC_OUTPUT([Makefile
src/fc/Makefile
src/util/Makefile
src/stubs/Makefile
- src/fontenc/Makefile
xfont.pc])