~ubuntu-branches/ubuntu/saucy/libxfont/saucy-updates

« back to all changes in this revision

Viewing changes to configure.ac

  • Committer: Bazaar Package Importer
  • Author(s): Julien Cristau
  • Date: 2009-12-02 11:12:13 UTC
  • mto: (1.1.11 upstream) (10.1.5 sid)
  • mto: This revision was merged to the branch mainline in revision 23.
  • Revision ID: james.westby@ubuntu.com-20091202111213-6u8j50b2zexz6kld
ImportĀ upstreamĀ versionĀ 1.4.1

Show diffs side-by-side

added added

removed removed

Lines of Context:
23
23
AC_PREREQ([2.57])
24
24
 
25
25
AC_INIT([libXfont],
26
 
        1.4.0,
 
26
        1.4.1,
27
27
        [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
28
28
        libXfont)
29
29
dnl
36
36
AM_CONFIG_HEADER(config.h)
37
37
AC_CONFIG_HEADERS([include/X11/fonts/fontconf.h])
38
38
 
39
 
# Require xorg-macros version >= 1.2.0 for XORG_CWARNFLAGS & XORG_CHANGELOG
 
39
# Require xorg-macros version >= 1.3.0 for XORG_DEFAULT_OPTIONS
40
40
m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.2 or later before running autoconf/autogen])])
41
 
XORG_MACROS_VERSION(1.2)
 
41
XORG_MACROS_VERSION(1.3)
42
42
 
43
43
# Check for progs
44
44
AC_PROG_CC
47
47
dnl must first be located explicitly.
48
48
PKG_PROG_PKG_CONFIG
49
49
 
 
50
XORG_DEFAULT_OPTIONS
 
51
 
 
52
# xmlto is used to convert doc/fontlib.xml from DocBook to PDF/HTML
 
53
AC_ARG_VAR([XMLTO], [Path to xmlto command])
 
54
AC_PATH_PROG([XMLTO], [xmlto])
 
55
AM_CONDITIONAL([HAVE_XMLTO], [test "x$XMLTO" != "x"])
 
56
 
 
57
# Option to enable support for building developer internals docs
 
58
AC_ARG_ENABLE(devel-docs,
 
59
        AS_HELP_STRING([--enable-devel-docs],
 
60
            [Build internals documentation for developers (default: enabled)]),
 
61
            [DEVEL_DOCS=$enableval], [DEVEL_DOCS=yes])
 
62
AM_CONDITIONAL([MAKE_DEVEL_DOCS], [test "x$DEVEL_DOCS" = "xyes"])
 
63
 
50
64
# Look for headers
51
65
AC_CHECK_HEADERS([endian.h poll.h sys/poll.h])
52
66
AC_CHECK_FUNCS([poll])
53
67
 
54
68
m4_ifdef([AS_HELP_STRING], , [m4_define([AS_HELP_STRING], m4_defn([AC_HELP_STRING]))])
55
69
 
56
 
DEFAULT_ENCODINGSDIR=${libdir}/X11/fonts/encodings
57
 
AC_ARG_WITH(encodingsdir,
58
 
        AS_HELP_STRING([--with-encodingsdir=ENCODINGSDIR], [Path to font encodings]),
59
 
        [ENCODINGSDIR="$withval"],
60
 
        [ENCODINGSDIR="$DEFAULT_ENCODINGSDIR"])
61
 
AC_SUBST(ENCODINGSDIR)
62
 
 
63
70
#
64
71
# select libraries to include
65
72
#
189
196
# Transport selection macro from xtrans.m4
190
197
XTRANS_CONNECTION_FLAGS
191
198
 
192
 
XORG_CWARNFLAGS
193
 
 
194
199
case $host_os in
195
200
    linux*)
196
201
        OS_CFLAGS="-D_XOPEN_SOURCE"
204
209
esac
205
210
AC_SUBST([OS_CFLAGS])
206
211
 
207
 
XORG_RELEASE_VERSION
208
 
XORG_CHANGELOG
209
 
 
210
212
AC_OUTPUT([Makefile
211
213
           src/Makefile
212
214
           src/fontfile/Makefile