[gdk-pixbuf/gdk-pixbuf-2-24] Don't detect X11 automagically



commit 280916fe764cfe0e79fc0cac978ea65c64d1682e
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 e45f5d0..2640c53 100644
--- a/configure.ac
+++ b/configure.ac
@@ -936,7 +936,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]