Make use of the XScreenSaver extension optional

The extension is only needed for the --inactivity-reset option,
so most users building Midori won't need it.
We also need to check for the according header file.

diff --git a/midori/main.c b/midori/main.c
index d0e7e64ed6dd159ad91bc1bb7112861e3887eb26..47a3ba3a18d55def93fee8d1fb1a22f2def8194d 100644 (file)
--- a/midori/main.c
+++ b/midori/main.c
@@ -54,7 +54,7 @@
     #define BOOKMARK_FILE "bookmarks.xbel"
 #endif
 
-#ifdef GDK_WINDOWING_X11
+#ifdef HAVE_X11_EXTENSIONS_SCRNSAVER_H
     #include <X11/Xlib.h>
     #include <X11/Xutil.h>
     #include <X11/extensions/scrnsaver.h>
@@ -1438,7 +1438,7 @@ typedef struct {
 static gboolean
 midori_inactivity_timeout (gpointer data)
 {
-    #ifdef GDK_WINDOWING_X11
+    #ifdef HAVE_X11_EXTENSIONS_SCRNSAVER_H
     MidoriInactivityTimeout* mit = data;
     static Display* xdisplay = NULL;
     static XScreenSaverInfo* mit_info = NULL;
@@ -1532,7 +1532,7 @@ main (int    argc,
        N_("Display program version"), NULL },
        { G_OPTION_REMAINING, 0, 0, G_OPTION_ARG_STRING_ARRAY, &uris,
        N_("Addresses"), NULL },
-       #ifdef GDK_WINDOWING_X11
+       #ifdef HAVE_X11_EXTENSIONS_SCRNSAVER_H
        { "inactivity-reset", 'i', 0, G_OPTION_ARG_INT, &inactivity_reset,
        N_("Reset Midori after SECONDS seconds of inactivity"), N_("SECONDS") },
        #endif

diff --git a/wscript b/wscript
index e5d682aade8e2c1cfcefc797f0e12012c6db14f2..a64c9bf2fa2ed52ef9b2531a32abe630fdbbaa3e 100644 (file)
--- a/wscript
+++ b/wscript
@@ -209,7 +209,8 @@ def configure (conf):
         args = '--define-variable=target=win32'
     elif sys.platform != 'darwin':
         check_pkg ('x11')
-        conf.check (lib='Xss', mandatory=True)
+        conf.check (header_name='X11/extensions/scrnsaver.h', mandatory=False)
+        conf.check (lib='Xss', mandatory=False)
     check_pkg ('gtk+-2.0', '2.10.0', var='GTK', args=args)
     check_pkg ('webkit-1.0', '1.1.1', args=args)
     check_pkg ('libsoup-2.4', '2.25.2')