Skip to content

Commit 7d28a3e

Browse files
author
Matt Sealey
committed
debian: Support disabling X11 extensions
Bug: https://bugzilla.gnome.org/show_bug.cgi?id=612918 Author: Cyril Brulebois <kibi@debian.org> Signed-off-by: Matt Sealey <matt@genesi-usa.com>
1 parent 3e56f16 commit 7d28a3e

File tree

2 files changed

+19
-71
lines changed

2 files changed

+19
-71
lines changed

configure.in

+19-4
Original file line numberDiff line numberDiff line change
@@ -241,6 +241,18 @@ AC_ARG_ENABLE(xinerama,
241241
[AC_HELP_STRING([--enable-xinerama],
242242
[support xinerama extension if available [default=yes]])],,
243243
[enable_xinerama="yes"])
244+
AC_ARG_ENABLE(xrandr,
245+
[AC_HELP_STRING([--enable-xrandr],
246+
[support XRandR extension if available [default=yes]])])
247+
AC_ARG_ENABLE(xfixes,
248+
[AC_HELP_STRING([--enable-xfixes],
249+
[support XFixes extension if available [default=yes]])])
250+
AC_ARG_ENABLE(xcomposite,
251+
[AC_HELP_STRING([--enable-xcomposite],
252+
[support X Composite extension if available [default=yes]])])
253+
AC_ARG_ENABLE(xdamage,
254+
[AC_HELP_STRING([--enable-xdamage],
255+
[support X Damage extension if available [default=yes]])])
244256
AC_ARG_ENABLE(rebuilds,
245257
[AC_HELP_STRING([--disable-rebuilds],
246258
[disable all source autogeneration rules])],,
@@ -1187,7 +1199,8 @@ if test "x$gdktarget" = "xx11"; then
11871199
AM_CONDITIONAL(XINPUT_XFREE, test x$with_xinput = xxfree || test x$with_xinput = xyes)
11881200

11891201
# Check for the RANDR extension
1190-
if $PKG_CONFIG --exists "xrandr >= 1.2.99" ; then
1202+
if test x"$enable_xrandr" != xno && \
1203+
$PKG_CONFIG --exists "xrandr >= 1.2.99" ; then
11911204
AC_DEFINE(HAVE_RANDR, 1, [Have the Xrandr extension library])
11921205

11931206
X_PACKAGES="$X_PACKAGES xrandr"
@@ -1203,7 +1216,8 @@ if test "x$gdktarget" = "xx11"; then
12031216

12041217
# Checks for XFixes extension
12051218

1206-
if $PKG_CONFIG --exists xfixes ; then
1219+
if test x"$enable_xfixes" != xno && \
1220+
$PKG_CONFIG --exists xfixes ; then
12071221
AC_DEFINE(HAVE_XFIXES, 1, [Have the XFIXES X extension])
12081222

12091223
X_PACKAGES="$X_PACKAGES xfixes"
@@ -1212,7 +1226,8 @@ if test "x$gdktarget" = "xx11"; then
12121226

12131227
# Checks for Xcomposite extension
12141228

1215-
if $PKG_CONFIG --exists xcomposite ; then
1229+
if test x"$enable_xcomposite" != xno && \
1230+
$PKG_CONFIG --exists xcomposite ; then
12161231
AC_DEFINE(HAVE_XCOMPOSITE, 1, [Have the XCOMPOSITE X extension])
12171232

12181233
X_PACKAGES="$X_PACKAGES xcomposite"
@@ -1221,7 +1236,7 @@ if test "x$gdktarget" = "xx11"; then
12211236

12221237
# Checks for Xdamage extension
12231238

1224-
if $PKG_CONFIG --exists xdamage ; then
1239+
if test x"$enable_xdamage" != xno && $PKG_CONFIG --exists xdamage ; then
12251240
AC_DEFINE(HAVE_XDAMAGE, 1, [Have the XDAMAGE X extension])
12261241

12271242
X_PACKAGES="$X_PACKAGES xdamage"

debian/patches/005_support_disabling_x11_extensions.patch

-67
This file was deleted.

0 commit comments

Comments
 (0)