← Back to branch summary

~ubuntu-branches/ubuntu/raring/libxfont/raring-security

« back to all changes in this revision

Viewing changes to configure.ac

  • Committer: Package Import Robot
  • Author(s): Cyril Brulebois, Cyril Brulebois, Julien Cristau
  • Date: 2012-03-04 09:24:59 UTC
  • mfrom: (1.1.15)
  • Revision ID: package-import@ubuntu.com-20120304092459-cbu7e0ujz24lslpt
Tags: 1:1.4.5-1
http://bugs.debian.org/654154
[ Cyril Brulebois ]
* New upstream release.
* Switch to dh:
  - Bump debhelper build-dep and compat.
  - Rewrite debian/rules, using autoreconf and quilt sequences.
  - Adjust build dependencies accordingly.
  - Use build-main and build-udeb as build directories.
  - Adjust .install accordingly.
* Remove xsfbs accordingly.
* Add support for hardened build flags through dpkg-buildflags, based
  on a patch by Moritz Muehlenhoff, thanks! (Closes: #654154).

[ Julien Cristau ]
* Remove David Nusinow from Uploaders.

Show diffs side-by-side

added added

removed removed

Lines of Context:
configure.ac
21
21
 
22
22
# Initialize Autoconf
23
23
AC_PREREQ([2.60])
24
 
#
25
 
# This is the package version number, not the shared library
26
 
# version.  This same version number must appear in Xfont.h
27
 
# Yes, it is a pain to synchronize version numbers.  Unfortunately, it's
28
 
# not possible to extract the version number here from Xfont.h
29
 
#
30
 
AC_INIT([libXfont], [1.4.4],
 
24
AC_INIT([libXfont], [1.4.5],
31
25
        [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [libXfont])
32
26
AC_CONFIG_SRCDIR([Makefile.am])
33
27
AC_CONFIG_HEADERS([config.h include/X11/fonts/fontconf.h])
75
69
if test x$XFONT_FREETYPE = xyes; then
76
70
        AC_DEFINE(XFONT_FREETYPE,1,[Support FreeType rasterizer for nearly all font file formats])
77
71
        AC_ARG_WITH(freetype-config, [  --with-freetype-config=PROG   Use FreeType configuration program PROG], freetype_config=$withval, freetype_config=auto)
78
 
        
 
72
 
79
73
        if test "$freetype_config" = "auto" ; then
80
 
                PKG_CHECK_MODULES(FREETYPE, freetype2, 
 
74
                PKG_CHECK_MODULES(FREETYPE, freetype2,
81
75
                        freetype_config=no, freetype_config=yes)
82
76
        fi
83
77
 
84
 
        if test "$freetype_config" = "yes"; then 
 
78
        if test "$freetype_config" = "yes"; then
85
79
                AC_PATH_PROG(ft_config,freetype-config,no)
86
80
                if test "$ft_config" = "no"; then
87
81
                        AC_MSG_ERROR([You must have freetype installed; see http://www.freetype.org/])
90
84
                ft_config="$freetype_config"
91
85
        fi
92
86
 
93
 
        if test "$freetype_config" != "no"; then        
 
87
        if test "$freetype_config" != "no"; then
94
88
                FREETYPE_CFLAGS="`$ft_config --cflags`"
95
89
                FREETYPE_LIBS="`$ft_config --libs`"
96
90
        fi
118
112
AC_SUBST(X_GZIP_FONT_COMPRESSION)
119
113
AC_CHECK_LIB(z, gzopen, [Z_LIBS=-lz], AC_MSG_ERROR([*** zlib is required]))
120
114
 
121
 
AC_ARG_WITH(bzip2, 
122
 
        AS_HELP_STRING([--with-bzip2], 
 
115
AC_ARG_WITH(bzip2,
 
116
        AS_HELP_STRING([--with-bzip2],
123
117
                        [Support bzip2 compressed bitmap fonts]),
124
118
        [], [with_bzip2=no])
125
119
if test "x$with_bzip2" = xyes; then