← Back to branch summary

~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): Cyril Brulebois
  • Date: 2010-11-19 01:17:48 UTC
  • mfrom: (1.1.13 upstream) (10.1.8 experimental)
  • Revision ID: james.westby@ubuntu.com-20101119011748-k5809pbrfmwd0ywd
Tags: 1:1.4.3-1
* New upstream release.
* Bump xutils-dev build-dep for new macros.
* Add xmlto, xorg-sgml-doctools, and w3m build-dep for the doc.
* Pass --with-xmlto and --without-fop for the regular build (we want
  html and txt only). Disable both for the udeb build.
* Tweak doc filenames, and handle that through dh_install.
* Add --fail-missing -XlibXfont.la for the second dh_install call (the
  udeb one), for additional safety.

Show diffs side-by-side

added added

removed removed

Lines of Context:
configure.ac
23
23
AC_PREREQ([2.60])
24
24
 
25
25
AC_INIT([libXfont],
26
 
        1.4.2,
 
26
        [1.4.3],
27
27
        [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
28
28
        libXfont)
29
29
# Autoheader generates config.h.in. No new lines allowed in the list.
37
37
AM_INIT_AUTOMAKE([foreign dist-bzip2])
38
38
AM_MAINTAINER_MODE
39
39
 
40
 
# Require xorg-macros: XORG_DEFAULT_OPTIONS
 
40
# Require xorg-macros minimum of 1.10 for DocBook XML documentation
41
41
m4_ifndef([XORG_MACROS_VERSION],
42
 
          [m4_fatal([must install xorg-macros 1.6 or later before running autoconf/autogen])])
43
 
XORG_MACROS_VERSION(1.6)
 
42
          [m4_fatal([must install xorg-macros 1.10 or later before running autoconf/autogen])])
 
43
XORG_MACROS_VERSION(1.10)
44
44
XORG_DEFAULT_OPTIONS
45
45
XORG_ENABLE_DEVEL_DOCS
46
46
XORG_WITH_XMLTO(0.0.20)
47
47
XORG_WITH_FOP
 
48
XORG_CHECK_SGML_DOCTOOLS(1.5)
48
49
 
49
50
# Check for progs
50
51
AC_PROG_CC
200
201
AC_SUBST([OS_CFLAGS])
201
202
 
202
203
AC_OUTPUT([Makefile
 
204
           doc/Makefile
203
205
           src/Makefile
204
206
           src/fontfile/Makefile
205
207
           src/FreeType/Makefile