what it really boils down to is Tollef's summary
well, we require pcre, readline and rst2man to build.. I don't think
ncurses is excessive.
excerpt from irc:
(18:57:53) slink: Also should we make some curses or the other a hard dependency
in configure? atm building doc/sphinx fails if ! VARNISH_CURSES - because then
there is no varnish(hist|stat|top)_opt2rst
(19:15:40) slink: ok, i have fixed the latter, we just should not try to build
docs for tools we can't build
(19:31:42) fgs: or should we make curses mandatory?
(19:31:55) Mithrandir / thfeen: I wouldn't mind.
(19:32:20) slink: is there a use case for varnish without interactive consoles?
(19:33:59) Kristian: slink: I can see the "I don't really need it"-argument, I
just don't think I think that's worth worrying about.
(19:34:17) Kristian: I don't see why anyone would *need* to run without curses
available.
(19:34:29) Mithrandir / thfeen: well, we require pcre, readline and rst2man to
build.. I don't think ncurses is excessive.
>From c1909c0fb4f245d0f2c95b8d65b66937398c2347 Mon Sep 17 00:00:00 2001
From: Nils Goroll <[email protected]>
Date: Wed, 19 Mar 2014 20:10:46 +0100
Subject: [PATCH] create a hard dependency on some curses library
---
bin/Makefile.am | 16 +++++++++-------
configure.ac | 4 +++-
doc/sphinx/Makefile.am | 5 -----
man/Makefile.am | 10 ++--------
4 files changed, 14 insertions(+), 21 deletions(-)
diff --git a/bin/Makefile.am b/bin/Makefile.am
index 1f33d4e..8aa2ef9 100644
--- a/bin/Makefile.am
+++ b/bin/Makefile.am
@@ -3,10 +3,12 @@
# Disabling building of the tools while api is in flux
#SUBDIRS = varnishreplay
-SUBDIRS = varnishadm varnishd varnishlog varnishncsa varnishtest
-
-if VARNISH_CURSES
-SUBDIRS += varnishhist
-SUBDIRS += varnishstat
-SUBDIRS += varnishtop
-endif
+SUBDIRS = \
+ varnishadm \
+ varnishd \
+ varnishhist \
+ varnishlog \
+ varnishncsa \
+ varnishstat \
+ varnishtest \
+ varnishtop
diff --git a/configure.ac b/configure.ac
index e2a0b98..e2589f4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -86,7 +86,9 @@ LIBS="${save_LIBS}"
AC_SUBST(DL_LIBS)
AX_WITH_CURSES
-AM_CONDITIONAL(VARNISH_CURSES, test x$ax_cv_curses = xyes)
+if test "x$ax_cv_curses" != xyes; then
+ AC_MSG_ERROR([requires an X/Open-compatible Curses library])
+fi
save_LIBS="${LIBS}"
LIBS=""
diff --git a/doc/sphinx/Makefile.am b/doc/sphinx/Makefile.am
index bb44131..716e8da 100644
--- a/doc/sphinx/Makefile.am
+++ b/doc/sphinx/Makefile.am
@@ -197,9 +197,6 @@ include/varnishlog_synopsis.rst: $(top_builddir)/bin/varnishlog/varnishlog_opt2r
BUILT_SOURCES += include/varnishlog_options.rst \
include/varnishlog_synopsis.rst
-# tools which only get built when curses is available
-# XXX add varnishstat here when _opt2rst is ready
-if VARNISH_CURSES
include/varnishtop_options.rst: $(top_builddir)/bin/varnishtop/varnishtop_opt2rst
$(top_builddir)/bin/varnishtop/varnishtop_opt2rst options > $@
include/varnishtop_synopsis.rst: $(top_builddir)/bin/varnishtop/varnishtop_opt2rst
@@ -213,8 +210,6 @@ include/varnishhist_synopsis.rst: $(top_builddir)/bin/varnishhist/varnishhist_op
$(top_builddir)/bin/varnishhist/varnishhist_opt2rst synopsis > $@
BUILT_SOURCES += include/varnishhist_options.rst \
include/varnishhist_synopsis.rst
-endif
-
include/vmod_std.rst: $(top_builddir)/lib/libvmod_std/vmod_std.rst
cp $? $@
diff --git a/man/Makefile.am b/man/Makefile.am
index ae3e40d..c25804e 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -14,10 +14,12 @@ dist_man_MANS = \
vsl-query.7 \
varnishadm.1 \
varnishd.1 \
+ varnishhist.1 \
varnishlog.1 \
varnishncsa.1 \
varnishstat.1 \
varnishtest.1 \
+ varnishtop.1 \
vmod_directors.3 \
vmod_std.3
@@ -69,12 +71,6 @@ varnishstat.1: $(top_srcdir)/doc/sphinx/reference/varnishstat.rst
varnishtest.1: $(top_srcdir)/doc/sphinx/reference/varnishtest.rst
${RST2MAN} $(top_srcdir)/doc/sphinx/reference/varnishtest.rst $@
-# tools which only get built when curses is available
-# XXX add varnishstat here when _opt2rst is ready
-if VARNISH_CURSES
-dist_man_MANS += varnishtop.1 \
- varnishhist.1
-
varnishtop.1: \
$(top_srcdir)/doc/sphinx/reference/varnishtop.rst \
$(top_srcdir)/doc/sphinx/include/varnishtop_options.rst \
@@ -86,8 +82,6 @@ varnishhist.1: \
$(top_srcdir)/doc/sphinx/include/varnishhist_options.rst \
$(top_srcdir)/doc/sphinx/include/varnishhist_synopsis.rst
${RST2MAN} $(top_srcdir)/doc/sphinx/reference/varnishhist.rst $@
-endif
-
vmod_std.3: $(top_srcdir)/lib/libvmod_std/vmod_std.man.rst
${RST2MAN} $? $@
--
1.9.0
_______________________________________________
varnish-dev mailing list
[email protected]
https://www.varnish-cache.org/lists/mailman/listinfo/varnish-dev
