[Xfce4-commits] <gigolo:master> Explicitly check for and link against libX11

[Enrico Tröger]

Updating branch refs/heads/master
         to 4efef6c2109e0e078c0ebc42dc191c8921c5b679 (commit)
       from b0383e25daa8f7ff770f96854abc09aa1f9459e6 (commit)

commit 4efef6c2109e0e078c0ebc42dc191c8921c5b679
Author: Enrico Tröger <enrico at xfce.org>
Date:   Mon Nov 9 20:19:27 2009 +0100

    Explicitly check for and link against libX11

 configure.ac    |    6 ++++++
 src/Makefile.am |    6 +++---
 wscript         |    4 +++-
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/configure.ac b/configure.ac
index 1711078..ab3d06e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -24,6 +24,12 @@ PKG_CHECK_MODULES(GTK, [$gtk_modules])
 AC_SUBST(GTK_CFLAGS)
 AC_SUBST(GTK_LIBS)
 
+# X11
+AC_CHECK_HEADERS_ONCE([X11/Xlib.h])
+AC_CHECK_LIB(X11, XGetSelectionOwner, [X11_LIBS="$X11_LIBS -lX11]")
+AC_SUBST([X11_LIBS])
+
+
 # --disable-deprecated switch for GTK2 purification
 AC_ARG_ENABLE(deprecated, [  --disable-deprecated    Disable deprecated GTK functions. ],
 			  [GTK_CFLAGS="$GTK_CFLAGS -DG_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED"], [])
diff --git a/src/Makefile.am b/src/Makefile.am
index 8fc3984..1cade0b 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,7 +1,7 @@
 
 bin_PROGRAMS = gigolo
 
-gigolo_SOURCES = 								\
+gigolo_SOURCES =								\
 	main.c main.h								\
 	compat.c compat.h							\
 	common.c common.h							\
@@ -12,7 +12,7 @@ gigolo_SOURCES = 								\
 	menubuttonaction.c menubuttonaction.h		\
 	mountdialog.c mountdialog.h					\
 	mountoperation.c mountoperation.h			\
-	bookmarkpanel.c bookmarkpanel.h			\
+	bookmarkpanel.c bookmarkpanel.h				\
 	bookmarkdialog.c bookmarkdialog.h			\
 	bookmarkeditdialog.c bookmarkeditdialog.h	\
 	browsenetworkpanel.c browsenetworkpanel.h	\
@@ -25,4 +25,4 @@ AM_CFLAGS = -DLOCALEDIR=\""$(localedir)"\"
 
 INCLUDES = @GTK_CFLAGS@
 
-gigolo_LDADD = @GTK_LIBS@ $(INTLLIBS)
+gigolo_LDADD = @GTK_LIBS@ @X11_LIBS@ $(INTLLIBS)
diff --git a/wscript b/wscript
index dad3295..f408618 100644
--- a/wscript
+++ b/wscript
@@ -49,6 +49,8 @@ def configure(conf):
 		mandatory=True, args='--cflags --libs')
 	conf.check_cfg(package='gio-2.0', atleast_version='2.16.0', uselib_store='GIO',
 		mandatory=True, args='--cflags --libs')
+	conf.check(header_name='X11/Xlib.h')
+	conf.check_cc(lib='X11', uselib='X11')
 
 	gtk_version = conf.check_cfg(modversion='gtk+-2.0', uselib_store='GTK')
 	gio_version = conf.check_cfg(modversion='gio-2.0', uselib_store='GIO')
@@ -132,7 +134,7 @@ def build(bld):
 		target			= 'gigolo',
 		source			= 'src/main.c',
 		includes		= '.',
-		uselib			= 'GTK GIO',
+		uselib			= 'GTK GIO X11',
 		uselib_local	= 'gigolo_lib',
 	)