[Xfce4-commits] <gigolo:master> Use pkgconfig for the X11 checks

[Enrico Tröger]

Updating branch refs/heads/master
         to 40c55694b2fb0c17f6457075a8a4a50c97da9bf8 (commit)
       from 63640a683e95a02dc9e5ec9da2e365c3e754f2a7 (commit)

commit 40c55694b2fb0c17f6457075a8a4a50c97da9bf8
Author: Enrico Tröger <enrico at xfce.org>
Date:   Tue Nov 17 20:36:37 2009 +0100

    Use pkgconfig for the X11 checks

 configure.ac    |    7 +------
 src/Makefile.am |    2 +-
 wscript         |    3 +--
 3 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/configure.ac b/configure.ac
index 9459570..0e2bb3f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -19,16 +19,11 @@ IT_PROG_INTLTOOL
 
 
 # GTK checks
-gtk_modules="gtk+-2.0 >= 2.12.0 gio-2.0 >= 2.16.0"
+gtk_modules="gtk+-2.0 >= 2.12.0 gio-2.0 >= 2.16.0 x11"
 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. ],
diff --git a/src/Makefile.am b/src/Makefile.am
index 1cade0b..a3588d7 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -25,4 +25,4 @@ AM_CFLAGS = -DLOCALEDIR=\""$(localedir)"\"
 
 INCLUDES = @GTK_CFLAGS@
 
-gigolo_LDADD = @GTK_LIBS@ @X11_LIBS@ $(INTLLIBS)
+gigolo_LDADD = @GTK_LIBS@ $(INTLLIBS)
diff --git a/wscript b/wscript
index f408618..9877105 100644
--- a/wscript
+++ b/wscript
@@ -49,8 +49,7 @@ 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')
+	conf.check_cfg(package='x11', uselib_store='X11', mandatory=True, args='--libs')
 
 	gtk_version = conf.check_cfg(modversion='gtk+-2.0', uselib_store='GTK')
 	gio_version = conf.check_cfg(modversion='gio-2.0', uselib_store='GIO')