← Back to branch summary

~ubuntu-branches/debian/jessie/xserver-xorg-video-intel/jessie

« back to all changes in this revision

Viewing changes to configure.ac

  • Committer: Package Import Robot
  • Author(s): Cyril Brulebois
  • Date: 2012-02-24 14:16:47 UTC
  • mfrom: (26.1.12 sid)
  • Revision ID: package-import@ubuntu.com-20120224141647-4aux48xunen1oa16
Tags: 2:2.18.0-1
* New upstream release.
* No SNA for unstable, it's too fast of a moving target for now.
* Since we're building for unstable, let's go back to the previous
  xorg-server build-dep.

Show diffs side-by-side

added added

removed removed

Lines of Context:
configure.ac
21
21
# Process this file with autoconf to produce a configure script
22
22
 
23
23
# Initialize Autoconf
24
 
AC_PREREQ([2.63])
 
24
AC_PREREQ([2.60])
25
25
AC_INIT([xf86-video-intel],
26
 
        [2.17.0],
 
26
        [2.18.0],
27
27
        [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
28
28
        [xf86-video-intel])
29
29
AC_CONFIG_SRCDIR([Makefile.am])
30
30
AC_CONFIG_HEADERS([config.h])
31
 
AC_CONFIG_AUX_DIR([build-aux])
32
 
AC_CONFIG_MACRO_DIR([m4])
 
31
AC_CONFIG_AUX_DIR(.)
33
32
 
34
33
# Initialize Automake
35
 
AM_INIT_AUTOMAKE([1.10 foreign dist-bzip2])
36
 
AM_MAINTAINER_MODE([enable])
37
 
 
38
 
# Support silent build rules, requires at least automake-1.11. Disable
39
 
# by either passing --disable-silent-rules to configure or passing V=1
40
 
# to make
41
 
m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
 
34
AM_INIT_AUTOMAKE([foreign dist-bzip2])
 
35
AM_MAINTAINER_MODE
42
36
 
43
37
# Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS
44
38
m4_ifndef([XORG_MACROS_VERSION],
56
50
  depending on your distribution, try package 'xserver-xorg-dev' or 'xorg-x11-server-devel'])])
57
51
 
58
52
# Initialize libtool
59
 
LT_PREREQ([2.2])
60
 
LT_INIT([disable-static])
 
53
AC_DISABLE_STATIC
 
54
AC_PROG_LIBTOOL
61
55
 
62
56
# Are we in a git checkout?
63
57
dot_git=no
128
122
              [SNA=no])
129
123
AM_CONDITIONAL(SNA, test x$SNA != xno)
130
124
required_xorg_xserver_version=1.6
131
 
required_pixman_version=0.16
 
125
required_pixman_version=0.24
132
126
if test "x$SNA" != "xno"; then
133
127
        required_xorg_xserver_version=1.10
134
 
        required_pixman_version=0.23
135
128
        AC_DEFINE(USE_SNA, 1, [Enable SNA support])
 
129
        AC_CHECK_HEADERS([sys/sysinfo.h])
136
130
fi
137
131
AC_MSG_RESULT([$SNA])
138
132
 
142
136
                             [Enable Unified Acceleration Architecture (UXA) [default=yes]]),
143
137
              [UXA="$enableval"],
144
138
              [UXA=yes])
 
139
AC_MSG_RESULT([$UXA])
145
140
AM_CONDITIONAL(UXA, test x$UXA != xno)
146
141
if test "x$UXA" != "xno"; then
147
142
        AC_DEFINE(USE_UXA, 1, [Enable UXA support])
148
 
fi
149
 
AC_MSG_RESULT([$UXA])
 
143
        PKG_CHECK_MODULES(DRMINTEL, [libdrm_intel >= 2.4.29])
 
144
fi
 
145
 
 
146
AC_MSG_CHECKING([whether to include GLAMOR support])
 
147
AC_ARG_ENABLE(glamor,
 
148
              AS_HELP_STRING([--enable-glamor],
 
149
                             [Enable glamor, a new GL-based acceleration [default=no]]),
 
150
              [GLAMOR="$enableval"],
 
151
              [GLAMOR=no])
 
152
AC_MSG_RESULT([$GLAMOR])
 
153
AM_CONDITIONAL(GLAMOR, test x$GLAMOR != xno)
 
154
if test "x$GLAMOR" != "xno"; then
 
155
        PKG_CHECK_MODULES(LIBGLAMOR, [glamor >= 0.3.1])
 
156
        PKG_CHECK_MODULES(LIBGLAMOR_EGL, [glamor-egl])
 
157
        AC_DEFINE(USE_GLAMOR, 1, [Enable glamor acceleration])
 
158
fi
150
159
 
151
160
AC_ARG_ENABLE(vmap,
152
161
              AS_HELP_STRING([--enable-vmap],
173
182
 
174
183
# Obtain compiler/linker options for the driver dependencies
175
184
PKG_CHECK_MODULES(XORG, [xorg-server >= $required_xorg_xserver_version xproto fontsproto pixman-1 >= $required_pixman_version $REQUIRED_MODULES])
176
 
PKG_CHECK_MODULES(DRM, [libdrm >= 2.4.23])
 
185
PKG_CHECK_MODULES(DRM, [libdrm >= 2.4.24]) # libdrm_intel is checked separately
177
186
PKG_CHECK_MODULES(DRI, [xf86driproto], , DRI=no)
178
187
PKG_CHECK_MODULES(DRI2, [dri2proto >= 2.6],, DRI2=no)
179
188
PKG_CHECK_MODULES(PCIACCESS, [pciaccess >= 0.10])
246
255
fi
247
256
if test "x$DEBUG" != xno; then
248
257
        AC_DEFINE(HAS_EXTRA_DEBUG,1,[Enable additional debugging])
 
258
        PKG_CHECK_MODULES(VALGRIND, [valgrind],
 
259
                          AC_DEFINE([HAVE_VALGRIND], 1, [Use valgrind intrinsics to suppress false warings]),)
249
260
fi
250
261
if test "x$DEBUG" = xfull; then
251
262
        AC_DEFINE(HAS_DEBUG_FULL,1,[Enable all debugging])