summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHadrien Boutteville <hadrien.boutteville@gmail.com>2014-07-18 17:39:38 +0200
committerThomas Petazzoni <thomas.petazzoni@free-electrons.com>2014-07-18 21:38:08 +0200
commit2d017035c4b52d04a9f0eb20e12b73219e8aa88b (patch)
treed1c933cbda9bcc8c774566a812f044d2f079f328
parente1433ad992d8bb99c2b0e44818f271db6794ccf6 (diff)
libsoup: add libsoup-gnome support
libsoup can build a libsoup-gnome library. Add support for libsoup-gnome as it is a dependency of Midori. Signed-off-by: Hadrien Boutteville <hadrien.boutteville@gmail.com> Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Cc: "Yann E. MORIN" <yann.morin.1998@free.fr> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-rw-r--r--package/libsoup/Config.in5
-rw-r--r--package/libsoup/libsoup.mk8
2 files changed, 12 insertions, 1 deletions
diff --git a/package/libsoup/Config.in b/package/libsoup/Config.in
index 874f50cc1..bc0ba950a 100644
--- a/package/libsoup/Config.in
+++ b/package/libsoup/Config.in
@@ -15,6 +15,11 @@ config BR2_PACKAGE_LIBSOUP
if BR2_PACKAGE_LIBSOUP
+config BR2_PACKAGE_LIBSOUP_GNOME
+ bool "libsoup-gnome"
+ help
+ Build libsoup-gnome library.
+
config BR2_PACKAGE_LIBSOUP_SSL
bool "https support"
select BR2_PACKAGE_GLIB_NETWORKING
diff --git a/package/libsoup/libsoup.mk b/package/libsoup/libsoup.mk
index 11585c896..abc8ac53d 100644
--- a/package/libsoup/libsoup.mk
+++ b/package/libsoup/libsoup.mk
@@ -18,11 +18,17 @@ ifneq ($(BR2_INET_IPV6),y)
LIBSOUP_CONF_ENV += soup_cv_ipv6=no
endif
-LIBSOUP_CONF_OPT = --disable-glibtest --without-gnome
+LIBSOUP_CONF_OPT = --disable-glibtest
LIBSOUP_DEPENDENCIES = host-pkgconf host-libglib2 \
libglib2 libxml2 sqlite host-intltool
+ifeq ($(BR2_PACKAGE_LIBSOUP_GNOME),y)
+LIBSOUP_CONF_OPT += --with-gnome
+else
+LIBSOUP_CONF_OPT += --without-gnome
+endif
+
ifeq ($(BR2_PACKAGE_LIBSOUP_SSL),y)
LIBSOUP_DEPENDENCIES += glib-networking
else