summaryrefslogtreecommitdiffstats
path: root/x11
diff options
context:
space:
mode:
authorPavel Vinogradov2018-11-14 20:31:29 -0500
committerPavel Vinogradov2018-11-14 20:39:34 -0500
commitfaa03c47c96ed05bb56e356b265f1b51f4d6bf50 (patch)
tree7a6e680ceb841fd9965f6f6d1f401f74ae72d821 /x11
parent9d8dbd562215acaa055c2183067fa2cfee8c0ba0 (diff)
x11/conky: converted libmicrohttpd to optional dependency
Diffstat (limited to 'x11')
-rwxr-xr-xx11/conky/CONFIGURE7
-rwxr-xr-xx11/conky/DEPENDS5
-rw-r--r--x11/conky/HISTORY3
3 files changed, 11 insertions, 4 deletions
diff --git a/x11/conky/CONFIGURE b/x11/conky/CONFIGURE
index aecb49c8f6..64b5eda44b 100755
--- a/x11/conky/CONFIGURE
+++ b/x11/conky/CONFIGURE
@@ -4,8 +4,6 @@ config_query_option CONKY_OPTS 'enable METAR weather support?' n \
'-DBUILD_WEATHER_METAR=on' '-DBUILD_WEATHER_METAR=off' &&
config_query_option CONKY_OPTS 'enable XOAP weather support?' n \
'-DBUILD_WEATHER_XOAP=on' '-DBUILD_WEATHER_XOAP=off' &&
-config_query_option CONKY_OPTS 'enable support HTTP?' n \
- '-DBUILD_HTTP=on' '-DBUILD_HTTP=off' &&
config_query_option CONKY_OPTS 'enable support for IBM/Lenovo laptops?' n \
'-DBUILD_IBM=on' '-DBUILD_IBM=off' &&
config_query_option CONKY_OPTS 'enable support for iconv?' n \
@@ -21,4 +19,7 @@ config_query_option CONKY_OPTS 'enable support for per task IO stats?' y \
config_query_option CONKY_OPTS 'enable support XShape?' y \
'-DBUILD_XSHAPE=on' '-DBUILD_XSHAPE=off' &&
config_query_option CONKY_OPTS 'enable support for IPv4 port monitoring?' y \
- '-DBUILD_PORT_MONITORS=on' '-DBUILD_PORT_MONITORS=off'
+ '-DBUILD_PORT_MONITORS=on' '-DBUILD_PORT_MONITORS=off' &&
+
+list_remove 'CONKY_OPTS' '-DBUILD_HTTP=on' &&
+list_remove 'CONKY_OPTS' '-DBUILD_HTTP=off'
diff --git a/x11/conky/DEPENDS b/x11/conky/DEPENDS
index b9845a5692..7f3a97f86a 100755
--- a/x11/conky/DEPENDS
+++ b/x11/conky/DEPENDS
@@ -1,8 +1,11 @@
depends glib2 &&
depends cmake &&
depends LUA &&
-depends libmicrohttpd &&
+optional_depends libmicrohttpd \
+ "-DBUILD_HTTP=on" \
+ "-DBUILD_HTTP=off" \
+ "for HTTP support" &&
optional_depends libx11 \
"-DBUILD_X11=on" \
diff --git a/x11/conky/HISTORY b/x11/conky/HISTORY
index 1be83dee0f..8766a18aa1 100644
--- a/x11/conky/HISTORY
+++ b/x11/conky/HISTORY
@@ -1,3 +1,6 @@
+2018-11-14 Pavel Vinogradov <public@sourcemage.org>
+ * CONFIGURE, DEPENDS: made libmicrohttpd optional
+
2018-08-06 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de>
* DEPENDS: make dependency on LUA mandatory, depend on libmicrohttpd