diff options
| author | marha <marha@users.sourceforge.net> | 2009-10-11 19:27:48 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2009-10-11 19:27:48 +0000 |
| commit | d36223b06a859c5979253d0176adfaeadc10cb32 (patch) | |
| tree | de85a6072aae048506ebab0dba2e7c4588132412 /libXfont/configure.ac | |
| parent | 6b4cfac5a67f87884a525ce2c99f30e0060b3ca7 (diff) | |
| parent | e4bc1b2bff00254f5782928d5b7b15b4db2e774c (diff) | |
| download | vcxsrv-d36223b06a859c5979253d0176adfaeadc10cb32.tar.gz vcxsrv-d36223b06a859c5979253d0176adfaeadc10cb32.tar.bz2 vcxsrv-d36223b06a859c5979253d0176adfaeadc10cb32.zip | |
svn merge ^/branches/released .
Diffstat (limited to 'libXfont/configure.ac')
| -rw-r--r-- | libXfont/configure.ac | 32 |
1 files changed, 17 insertions, 15 deletions
diff --git a/libXfont/configure.ac b/libXfont/configure.ac index c6b6ca64b..399f7d05d 100644 --- a/libXfont/configure.ac +++ b/libXfont/configure.ac @@ -23,7 +23,7 @@ dnl Process this file with autoconf to create configure. AC_PREREQ([2.57]) AC_INIT([libXfont], - 1.4.0, + 1.4.1, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], libXfont) dnl @@ -36,9 +36,9 @@ AM_INIT_AUTOMAKE([foreign dist-bzip2]) AM_CONFIG_HEADER(config.h) AC_CONFIG_HEADERS([include/X11/fonts/fontconf.h]) -# Require xorg-macros version >= 1.2.0 for XORG_CWARNFLAGS & XORG_CHANGELOG +# Require xorg-macros version >= 1.3.0 for XORG_DEFAULT_OPTIONS m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.2 or later before running autoconf/autogen])]) -XORG_MACROS_VERSION(1.2) +XORG_MACROS_VERSION(1.3) # Check for progs AC_PROG_CC @@ -47,19 +47,26 @@ dnl If the first PKG_CHECK_MODULES appears inside a conditional, pkg-config dnl must first be located explicitly. PKG_PROG_PKG_CONFIG +XORG_DEFAULT_OPTIONS + +# xmlto is used to convert doc/fontlib.xml from DocBook to PDF/HTML +AC_ARG_VAR([XMLTO], [Path to xmlto command]) +AC_PATH_PROG([XMLTO], [xmlto]) +AM_CONDITIONAL([HAVE_XMLTO], [test "x$XMLTO" != "x"]) + +# Option to enable support for building developer internals docs +AC_ARG_ENABLE(devel-docs, + AS_HELP_STRING([--enable-devel-docs], + [Build internals documentation for developers (default: enabled)]), + [DEVEL_DOCS=$enableval], [DEVEL_DOCS=yes]) +AM_CONDITIONAL([MAKE_DEVEL_DOCS], [test "x$DEVEL_DOCS" = "xyes"]) + # Look for headers AC_CHECK_HEADERS([endian.h poll.h sys/poll.h]) AC_CHECK_FUNCS([poll]) m4_ifdef([AS_HELP_STRING], , [m4_define([AS_HELP_STRING], m4_defn([AC_HELP_STRING]))]) -DEFAULT_ENCODINGSDIR=${libdir}/X11/fonts/encodings -AC_ARG_WITH(encodingsdir, - AS_HELP_STRING([--with-encodingsdir=ENCODINGSDIR], [Path to font encodings]), - [ENCODINGSDIR="$withval"], - [ENCODINGSDIR="$DEFAULT_ENCODINGSDIR"]) -AC_SUBST(ENCODINGSDIR) - # # select libraries to include # @@ -189,8 +196,6 @@ PKG_CHECK_MODULES(XFONT, xproto xtrans fontsproto fontenc) # Transport selection macro from xtrans.m4 XTRANS_CONNECTION_FLAGS -XORG_CWARNFLAGS - case $host_os in linux*) OS_CFLAGS="-D_XOPEN_SOURCE" @@ -204,9 +209,6 @@ case $host_os in esac AC_SUBST([OS_CFLAGS]) -XORG_RELEASE_VERSION -XORG_CHANGELOG - AC_OUTPUT([Makefile src/Makefile src/fontfile/Makefile |