summaryrefslogtreecommitdiff
blob: aa4843933932e5a35b3e5edea906d386f43206ba (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
From 14504663805b9cdc5e514cacdadb7c137a06d6e1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Diego=20Elio=20Petten=C3=B2?= <flameeyes@gmail.com>
Date: Sun, 15 May 2011 15:02:34 +0200
Subject: [PATCH] build-sys: link gtk and gtk3 modules to libX11 as well as
 Gtk itself.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Both of the modules use the XFree/XGetWindowProperty functions which are
exposed by libX11; without this change, the modules would be
underlinked, which causes some link editors to refuse the link (including
GNU gold).

Signed-off-by: Diego Elio Pettenò <flameeyes@gmail.com>
---
 configure.ac |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/configure.ac b/configure.ac
index 98102cc..2aaa51f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -383,7 +383,7 @@ AC_ARG_ENABLE([gtk],
 
 AM_CONDITIONAL([GCONF_SCHEMAS_INSTALL], [false])
 if test "x${gtk}" != xno ; then
-    PKG_CHECK_MODULES(GTK, [ gtk+-2.0 >= 2.20.0 gthread-2.0 ],
+    PKG_CHECK_MODULES(GTK, [ gtk+-2.0 >= 2.20.0 gthread-2.0 x11 ],
         [
             HAVE_GTK=1
             AC_DEFINE([HAVE_GTK], 1, [Have GTK?])
@@ -422,7 +422,7 @@ AC_ARG_ENABLE([gtk3],
         [gtk3=auto])
 
 if test "x${gtk3}" != xno ; then
-    PKG_CHECK_MODULES(GTK3, [ gtk+-3.0 gthread-2.0 ],
+    PKG_CHECK_MODULES(GTK3, [ gtk+-3.0 gthread-2.0 x11 ],
         [
             HAVE_GTK3=1
             AC_DEFINE([HAVE_GTK3], 1, [Have GTK3?])
-- 
1.7.5.rc3