← 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-06-12 20:30:51 UTC
  • mfrom: (26.1.16 sid)
  • Revision ID: package-import@ubuntu.com-20120612203051-mex5136iqfafp06b
Tags: 2:2.19.0-3
http://bugs.debian.org/677206
* Add patch to avoid X segfaults with Driver-less Device sections in
  xorg.conf (Closes: #677206):
  - 0003-Avoid-calling-xf86nameCompare-with-a-NULL-pointer.patch

Show diffs side-by-side

added added

removed removed

Lines of Context:
configure.ac
158
158
        AC_DEFINE(USE_GLAMOR, 1, [Enable glamor acceleration])
159
159
fi
160
160
 
 
161
AC_ARG_WITH(default-accel,
 
162
            AS_HELP_STRING([--with-default-accel],
 
163
                           [Select the default acceleration method [default=uxa if enabled, otherwise sna]]),
 
164
                           [accel="$withval"],
 
165
                           [accel=auto])
 
166
if test "x$accel" = xyes; then
 
167
        AC_MSG_WARN([No default acceleration specified, choosing automatic selection])
 
168
        accel="auto"
 
169
fi
 
170
 
 
171
AC_MSG_CHECKING([which acceleration method to use by default])
 
172
if test "x$accel" = xauto; then
 
173
        if test "x$UXA" != "xno"; then
 
174
                accel=uxa
 
175
        else
 
176
                if test "x$SNA" != "xno"; then
 
177
                        accel=sna
 
178
                fi
 
179
        fi
 
180
        if test "x$accel" = xauto; then
 
181
                AC_MSG_ERROR([No default acceleration option])
 
182
        fi
 
183
fi
 
184
 
 
185
have_accel=no
 
186
if test "x$accel" = xsna; then
 
187
        if test "x$SNA" != "xno"; then
 
188
                AC_DEFINE(DEFAULT_ACCEL_METHOD, SNA, [Default acceleration method])
 
189
                have_accel=yes
 
190
        else
 
191
                AC_MSG_ERROR([SNA requested as default, but is not enabled])
 
192
        fi
 
193
fi
 
194
 
 
195
if test "x$accel" = xuxa; then
 
196
        if test "x$UXA" != "xno"; then
 
197
                AC_DEFINE(DEFAULT_ACCEL_METHOD, UXA, [Default acceleration method])
 
198
                have_accel=yes
 
199
        else
 
200
                AC_MSG_ERROR([UXA requested as default, but is not enabled])
 
201
        fi
 
202
fi
 
203
AC_MSG_RESULT($accel)
 
204
if test "x$accel" = xno; then
 
205
        AC_MSG_ERROR([No default acceleration option])
 
206
fi
 
207
 
161
208
AC_ARG_ENABLE(vmap,
162
209
              AS_HELP_STRING([--enable-vmap],
163
 
                             [Enable use of vmap [default=no]]),
 
210
                             [Enable use of vmap (experimental) [default=no]]),
164
211
              [VMAP="$enableval"],
165
212
              [VMAP=no])
166
213
AM_CONDITIONAL(USE_VMAP, test x$VMAP = xyes)
168
215
        AC_DEFINE(USE_VMAP,1,[Assume VMAP support])
169
216
fi
170
217
 
 
218
AC_ARG_ENABLE(async-swap,
 
219
              AS_HELP_STRING([--enable-async-swap],
 
220
                             [Enable use of asynchronous swaps (experimental) [default=no]]),
 
221
              [ASYNC_SWAP="$enableval"],
 
222
              [ASYNC_SWAP=no])
 
223
AM_CONDITIONAL(USE_ASYNC_SWAP, test x$ASYNC_SWAP = xyes)
 
224
if test "x$ASYNC_SWAP" = xyes; then
 
225
        AC_DEFINE(USE_ASYNC_SWAP,1,[Assume asynchronous swap support])
 
226
fi
171
227
 
172
228
AC_ARG_ENABLE(debug,
173
229
              AS_HELP_STRING([--enable-debug],
174
230
                             [Enables internal debugging [default=no]]),
175
231
              [DEBUG="$enableval"],
176
232
              [DEBUG=no])
177
 
 
178
233
# Store the list of server defined optional extensions in REQUIRED_MODULES
179
234
XORG_DRIVER_CHECK_EXT(RANDR, randrproto)
180
235
XORG_DRIVER_CHECK_EXT(RENDER, renderproto)