From eae739b52894f9eb631cfef4535b2c36384aba31 Mon Sep 17 00:00:00 2001
From: Frederic Peters <fpeters@0d.be>
Date: Sat, 8 Aug 2009 17:15:34 +0100
Subject: Bug 559638 – explicitly link against libX11
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 configure.in | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

(limited to 'configure.in')

diff --git a/configure.in b/configure.in
index b3f8ea2..2034b2e 100644
--- a/configure.in
+++ b/configure.in
@@ -22,6 +22,34 @@ PKG_CHECK_MODULES([ZENITY],[gtk+-2.0 >= $GTK_REQUIRED glib-2.0])
 AC_SUBST([ZENITY_CFLAGS])
 AC_SUBST([ZENITY_LIBS])
 
+dnl *************************
+dnl Check for the GTK+ backend, if it's X11, we -lX11
+dnl *************************
+
+zenity_save_cflags="$CFLAGS"
+# pull in the CFLAGS to locate gdkconfig.h
+CFLAGS=`$PKG_CONFIG --cflags gtk+-2.0`
+AC_COMPILE_IFELSE([
+#include <gdkconfig.h>
+
+int main(void) {
+#ifndef GDK_WINDOWING_X11
+#error GDK_WINDOWING_X11 not defined
+#endif
+    return 0;
+}
+],
+        GDK_BACKEND_X11=yes,
+        GDK_BACKEND_X11=no)
+
+CFLAGS="$zenity_save_cflags"
+
+if test "x$GDK_BACKEND_X11" = "xyes"; then
+	PKG_CHECK_MODULES(X, x11)
+	ZENITY_CFLAGS="$ZENITY_CFLAGS $X_CFLAGS"
+	ZENITY_LIBS="$ZENITY_LIBS $X_LIBS"
+fi
+
 # *******************************
 # perl check
 # *******************************
-- 
cgit v1.2.3-54-g00ecf