[gdk-pixbuf] Don't detect X11 automagically
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gdk-pixbuf] Don't detect X11 automagically
- Date: Fri, 16 Dec 2011 21:45:48 +0000 (UTC)
commit e6734ba07c81f1a0fd3e577ddd2a0d121fc92af1
Author: Matthias Clasen <mclasen redhat com>
Date: Fri Dec 16 15:21:15 2011 -0500
Don't detect X11 automagically
Instead, add an explicit --with-x11 option and default it to 'no'.
Based on a patch by Pacho Ramos, bug 657569.
configure.ac | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index fc2c059..af15e80 100644
--- a/configure.ac
+++ b/configure.ac
@@ -926,7 +926,11 @@ GDK_PIXBUF_XLIB_PACKAGES=
GDK_PIXBUF_XLIB_EXTRA_CFLAGS=
GDK_PIXBUF_XLIB_EXTRA_LIBS=
-if $PKG_CONFIG --exists x11; then
+AC_ARG_WITH(x11,
+ [AC_HELP_STRING([--with-x11],
+ [build X11 support])])
+
+if test x$with_x11 = xyes; then
AM_CONDITIONAL(USE_X11, true)
PKG_CHECK_MODULES(GDK_PIXBUF_XLIB_DEP, x11 gobject-2.0)
else
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]