← Back to branch summary

~ubuntu-branches/ubuntu/raring/xserver-xorg-video-intel/raring

« back to all changes in this revision

Viewing changes to configure.ac

  • Committer: Package Import Robot
  • Author(s): Timo Aaltonen
  • Date: 2012-09-29 16:45:35 UTC
  • mfrom: (1.4.24)
  • Revision ID: package-import@ubuntu.com-20120929164535-g15mwstkty0de7ki
Tags: 2:2.20.9-0ubuntu1
https://launchpad.net/bugs/966744
* Merge from unrelease debian git.
  - fixes racy UXA pageflip code (LP: #966744)
* Drop dont-run-intel-mode-fini-before-preinit.diff, upstream.

Show diffs side-by-side

added added

removed removed

Lines of Context:
configure.ac
23
23
# Initialize Autoconf
24
24
AC_PREREQ([2.60])
25
25
AC_INIT([xf86-video-intel],
26
 
        [2.20.8],
 
26
        [2.20.9],
27
27
        [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
28
28
        [xf86-video-intel])
29
29
AC_CONFIG_SRCDIR([Makefile.am])
125
125
                                  [Assume KMS support [[default=no]]]),
126
126
              [KMS_ONLY="$enableval"],
127
127
              [KMS_ONLY=no])
 
128
AC_ARG_ENABLE(ums-only, AS_HELP_STRING([--enable-ums-only],
 
129
                                  [Assume only UMS (no KMS) support [[default=no]]]),
 
130
              [UMS_ONLY="$enableval"],
 
131
              [UMS_ONLY=no])
128
132
 
129
133
required_xorg_xserver_version=1.6
130
134
required_pixman_version=0.24
230
234
                        accel=sna
231
235
                fi
232
236
        fi
233
 
        if test "x$accel" = xauto; then
 
237
        if test "x$accel" = xauto -a "x$UMS_ONLY" != "xyes"; then
234
238
                AC_MSG_ERROR([No default acceleration option])
235
239
        fi
236
240
fi
237
241
 
238
 
have_accel=no
 
242
have_accel=none
239
243
if test "x$accel" = xsna; then
240
244
        if test "x$SNA" != "xno"; then
241
245
                AC_DEFINE(DEFAULT_ACCEL_METHOD, SNA, [Default acceleration method])
254
258
        fi
255
259
fi
256
260
AC_MSG_RESULT($accel)
257
 
if test "x$accel" = xno; then
 
261
if test "x$accel" = xnone -a "x$UMS_ONLY" != "xyes"; then
258
262
        AC_MSG_ERROR([No default acceleration option])
259
263
fi
260
264
 
361
365
if test "x$KMS_ONLY" = xyes; then
362
366
        AC_DEFINE(KMS_ONLY,1,[Assume KMS support])
363
367
fi
 
368
AM_CONDITIONAL(UMS_ONLY, test x$UMS_ONLY = xyes)
 
369
if test "x$UMS_ONLY" = xyes; then
 
370
        AC_DEFINE(UMS_ONLY,1,[Assume only UMS (no KMS) support])
 
371
fi
364
372
 
365
373
AM_CONDITIONAL(DEBUG, test x$DEBUG != xno)
366
374
AM_CONDITIONAL(FULL_DEBUG, test x$FULL_DEBUG == xfull)