From e6d8e10606a07aa81a00c37cb5c6bcea943607cc Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sat, 30 Apr 2011 12:00:12 +0200 Subject: [PATCH] Show libSoup version from pkg-config in about:version --- midori/midori-view.c | 7 ------- wscript | 1 + 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/midori/midori-view.c b/midori/midori-view.c index 3ccfce09..31d6612c 100644 --- a/midori/midori-view.c +++ b/midori/midori-view.c @@ -4221,13 +4221,6 @@ midori_view_set_uri (MidoriView* view, #define WEBKIT_USER_AGENT_MAJOR_VERSION 532 #define WEBKIT_USER_AGENT_MINOR_VERSION 1 #endif - #if defined (HAVE_LIBSOUP_2_29_3) - #define LIBSOUP_VERSION "2.29.3" - #elif defined (HAVE_LIBSOUP_2_27_90) - #define LIBSOUP_VERSION "2.27.90" - #else - #define LIBSOUP_VERSION "2.25.2" - #endif #ifdef G_ENABLE_DEBUG #define DEBUGGING " (Debug)" #else diff --git a/wscript b/wscript index beee2432..80cc1909 100644 --- a/wscript +++ b/wscript @@ -209,6 +209,7 @@ def configure (conf): check_pkg ('libsoup-2.4', '2.27.90', False, var='LIBSOUP_2_27_90') check_pkg ('libsoup-2.4', '2.29.3', False, var='LIBSOUP_2_29_3') check_pkg ('libsoup-2.4', '2.29.91', False, var='LIBSOUP_2_29_91') + conf.define ('LIBSOUP_VERSION', conf.check_cfg (modversion='libsoup-2.4')) check_pkg ('libxml-2.0', '2.6') check_pkg ('sqlite3', '3.0', True, var='SQLITE')