[Xfce4-commits] <midori:master> Allow zeitgeist dependency to be disable

[Christian Dywan]

Updating branch refs/heads/master
         to 6891492f1ee56b86caf495650a22fd82c910219a (commit)
       from 4c83c3947ead7df9394d040a83ac1c2b8625f62a (commit)

commit 6891492f1ee56b86caf495650a22fd82c910219a
Author: Christian Dywan <christian at twotoasts.de>
Date:   Mon Oct 29 10:39:10 2012 +0100

    Allow zeitgeist dependency to be disable
    
    Fixes: https://bugs.launchpad.net/midori/+bug/1072459

 wscript |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/wscript b/wscript
index f55ee97..f8d4167 100644
--- a/wscript
+++ b/wscript
@@ -237,7 +237,8 @@ def configure (conf):
         granite = 'no '
         conf.define ('GRANITE_VERSION', 'No')
 
-    check_pkg ('zeitgeist-1.0', '0.3.14', mandatory=False)
+    if option_enabled ('zeitgeist'):
+        check_pkg ('zeitgeist-1.0', '0.3.14', mandatory=True)
     conf.check (lib='m', mandatory=True)
     check_pkg ('gmodule-2.0', '2.8.0', False)
     check_pkg ('gthread-2.0', '2.8.0', False)
@@ -445,6 +446,7 @@ def set_options (opt):
     add_enable_option ('tests', 'building of tests', group, disable=True)
     add_enable_option ('hildon', 'Maemo integration', group, disable=not is_maemo ())
     add_enable_option ('gtk3', 'GTK+3 and WebKitGTK+3 support', group, disable=True)
+    add_enable_option ('zeitgeist', 'Zeitgeist history integration', group, disable=is_win32 (os.environ))
 
     # Provided for compatibility
     opt.add_option ('--build', help='Ignored')