← Back to branch summary

~ubuntu-branches/ubuntu/vivid/libxrender/vivid

« back to all changes in this revision

Viewing changes to configure.ac

  • Committer: Bazaar Package Importer
  • Author(s): Julien Cristau, Timo Aaltonen, Julien Cristau
  • Date: 2009-11-25 19:38:16 UTC
  • mfrom: (1.1.5 upstream)
  • Revision ID: james.westby@ubuntu.com-20091125193816-i8z1czm0p4kzen9g
Tags: 1:0.9.5-1
[ Timo Aaltonen ]
* New upstream release.
* Run autoreconf on build. Add build-deps on automake, libtool
  and xutils-dev.
* Parse space-separated DEB_BUILD_OPTIONS, and handle parallel=N.
* Bump Standards-Version to 3.8.3.
* Move -dbg package to section debug.
* Drop pre-dependency on x11-common from libxrender-dev. This was needed
  for upgrades from sarge.

[ Julien Cristau ]
* Install the libXrender doc in libxrender-dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
configure.ac
30
30
dnl digit in the version number to track changes which don't affect the
31
31
dnl protocol, so Xrender version l.n.m corresponds to protocol version l.n
32
32
dnl
33
 
AC_INIT(libXrender, 0.9.4, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], libXrender)
 
33
AC_INIT(libXrender, 0.9.5, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], libXrender)
34
34
AM_INIT_AUTOMAKE([dist-bzip2])
35
35
AM_MAINTAINER_MODE
36
36
 
 
37
# Require xorg-macros: XORG_DEFAULT_OPTIONS
 
38
m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.3 or later before running autoconf/autogen])])
 
39
XORG_MACROS_VERSION(1.3)
37
40
AM_CONFIG_HEADER(config.h)
38
41
 
39
42
# Check for progs
40
43
AC_PROG_CC
41
44
AC_PROG_LIBTOOL
42
 
 
43
 
# Check for X
44
 
PKG_CHECK_MODULES(X, x11)
45
 
                  
46
 
X_REQUIRES="x11"
47
 
X_NON_PKG_CFLAGS=""
48
 
X_NON_PKG_LIBS=""
49
 
 
50
 
AC_SUBST(X_REQUIRES)
51
 
AC_SUBST(X_NON_PKG_CFLAGS)
52
 
AC_SUBST(X_NON_PKG_LIBS)
 
45
XORG_DEFAULT_OPTIONS
53
46
 
54
47
# Check render configuration, strip extra digits from package version to
55
48
# find the required protocol version
59
52
fi
60
53
RENDER_VERSION=[`echo $VERSION | sed 's/^\([0-9][0-9]*\.[0-9][0-9]*\).*$/\1/'`]
61
54
AC_SUBST(RENDER_VERSION)
62
 
PKG_CHECK_MODULES(RENDER, renderproto >= $RENDER_VERSION)
63
 
 
 
55
PKG_CHECK_MODULES(RENDER, x11 renderproto >= $RENDER_VERSION)
64
56
AC_SUBST(RENDER_CFLAGS)
65
57
 
66
58
XORG_CHECK_MALLOC_ZERO
67
 
XORG_RELEASE_VERSION
68
59
 
69
60
AC_OUTPUT([Makefile
70
61
           src/Makefile