[gvfs/gnome-2-32] Do not build app lookup extension if we have glib >= 2.27.1
- From: Tomas Bzatek <tbzatek src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gvfs/gnome-2-32] Do not build app lookup extension if we have glib >= 2.27.1
- Date: Mon, 21 Mar 2011 16:02:36 +0000 (UTC)
commit 7552d43b182c00fe0479f56920f09170aafd5662
Author: Vincent Untz <vuntz gnome org>
Date: Mon Mar 21 16:43:11 2011 +0100
Do not build app lookup extension if we have glib >= 2.27.1
https://bugzilla.gnome.org/show_bug.cgi?id=635252
configure.ac | 9 +++++++++
gconf/Makefile.am | 2 ++
2 files changed, 11 insertions(+), 0 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index fdb292c..617f943 100644
--- a/configure.ac
+++ b/configure.ac
@@ -213,6 +213,14 @@ fi
AM_CONDITIONAL(USE_GCONF, [test "$msg_gconf" = "yes"])
+dnl *************************************************************
+dnl *** Check if we can build gconf-based gio extension point ***
+dnl *************************************************************
+
+msg_gconf_gio=no
+PKG_CHECK_EXISTS(gio-2.0 <= 2.27.1, msg_gconf_gio=yes)
+AM_CONDITIONAL(USE_GCONF_GIO, [test "$msg_gconf_gio" = "yes"])
+
dnl ********************************************
dnl *** Check for expat (for obexftp and gdu ***
dnl ********************************************
@@ -726,6 +734,7 @@ echo "
archive support: $msg_archive
AFC support: $msg_afc
GConf support: $msg_gconf
+ GConf-based GIO extension: $msg_gconf_gio
DNS-SD support: $msg_avahi
Build HAL volume monitor: $msg_hal (with fast init path: $have_hal_fast_init)
Build GDU volume monitor: $msg_gdu
diff --git a/gconf/Makefile.am b/gconf/Makefile.am
index 85d4d8d..af1433e 100644
--- a/gconf/Makefile.am
+++ b/gconf/Makefile.am
@@ -4,8 +4,10 @@ NULL =
module_flags = -export_dynamic -avoid-version -module -no-undefined -export-symbols-regex '^g_io_module_(load|unload|query)'
if USE_GCONF
+if USE_GCONF_GIO
giomodules_LTLIBRARIES = libgiogconf.la
endif
+endif
libgiogconf_la_SOURCES = \
gapplookupgconf.c gapplookupgconf.h \
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]