← Back to branch summary

~ubuntu-branches/ubuntu/wily/xfonts-utils/wily-proposed

« back to all changes in this revision

Viewing changes to font-util/configure.ac

  • Committer: Package Import Robot
  • Author(s): Julien Cristau
  • Date: 2012-05-06 00:01:33 UTC
  • Revision ID: package-import@ubuntu.com-20120506000133-t3s2kq76s15z0stw
Tags: 1:7.7~1
* font-util 1.3.0
* mkfontdir 1.0.7
* mkfontscale 1.1.0
* Drop dh_testroot from debian/rules clean.
* Move fontutil.pc to /usr/share/pkgconfig.
* Mark xfonts-utils Multi-arch: foreign.

Show diffs side-by-side

added added

removed removed

Lines of Context:
font-util/configure.ac
21
21
dnl
22
22
dnl Process this file with autoconf to create configure.
23
23
 
 
24
# Initialize Autoconf
24
25
AC_PREREQ([2.60])
25
 
AC_INIT([font-util], [1.2.0],
 
26
AC_INIT([font-util], [1.3.0],
26
27
        [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [font-util])
 
28
AC_CONFIG_SRCDIR([Makefile.am])
 
29
AC_CONFIG_HEADERS([config.h])
 
30
 
 
31
# Initialize Automake
27
32
AM_INIT_AUTOMAKE([foreign dist-bzip2])
28
33
AM_MAINTAINER_MODE
29
34
 
31
36
m4_ifndef([XORG_MACROS_VERSION],
32
37
          [m4_fatal([must install xorg-macros 1.8 or later before running autoconf/autogen])])
33
38
XORG_MACROS_VERSION(1.8)
34
 
AM_CONFIG_HEADER(config.h)
35
 
 
36
39
XORG_DEFAULT_OPTIONS
37
40
 
38
 
AC_PROG_CC
39
 
AC_PROG_INSTALL
40
 
 
41
41
AC_MSG_CHECKING([for root directory for font files])
42
42
fontrootdir='${datadir}/fonts/X11'
43
 
AC_ARG_WITH(fontrootdir, [AC_HELP_STRING([--with-fontrootdir=DIR],
 
43
AC_ARG_WITH(fontrootdir, [AS_HELP_STRING([--with-fontrootdir=DIR],
44
44
        [Path to parent of font subdirectories [DATADIR/fonts/X11]])],
45
45
        [fontrootdir="${withval}"])
46
46
AC_SUBST(fontrootdir)
47
47
AC_MSG_RESULT([${fontrootdir}])
48
48
 
49
49
mapdir='${fontrootdir}/util'
50
 
AC_ARG_WITH(mapdir, [AC_HELP_STRING([--with-mapdir=DIR],
 
50
AC_ARG_WITH(mapdir, [AS_HELP_STRING([--with-mapdir=DIR],
51
51
        [Path to install font maps [FONTROOTDIR/util]])],
52
52
        [mapdir="${withval}"])
53
53
MAPDIR="$mapdir"