Disable tools that require curses if no curses library was found.

git-svn-id: svn+ssh://projects.linpro.no/svn/varnish/trunk@2456 d4fa192b-c00b-0410-8231-f00ffab90ce4

diff --git a/varnish-cache/bin/Makefile.am b/varnish-cache/bin/Makefile.am
index 8e27812d185c61e5771eca4e939008b905a5eabe..2a7a646df63a4cd6a134c55ec88166002a355514 100644 (file)
--- a/varnish-cache/bin/Makefile.am
+++ b/varnish-cache/bin/Makefile.am
@@ -1,4 +1,7 @@
 # $Id$
 
-SUBDIRS = varnishadm varnishd varnishhist varnishlog varnishncsa \
-       varnishreplay varnishstat varnishtop
+SUBDIRS = varnishadm varnishd varnishlog varnishncsa varnishreplay
+
+if HAVE_CURSES
+SUBDIRS += varnishhist varnishstat varnishtop
+endif

diff --git a/varnish-cache/configure.ac b/varnish-cache/configure.ac
index 204124fb4806df94b77f1f4f013b9b425ccfb741..ec36bda7af1af23833c71e6cd127866a423a9aa3 100644 (file)
--- a/varnish-cache/configure.ac
+++ b/varnish-cache/configure.ac
@@ -38,15 +38,15 @@ AC_SUBST(DL_LIBS)
 
 save_LIBS="${LIBS}"
 LIBS=""
-AC_SEARCH_LIBS(initscr, [curses ncurses])
+AC_SEARCH_LIBS(initscr, [curses ncurses],
+       [have_curses=yes], [have_curses=no])
 CURSES_LIBS="${LIBS}"
 LIBS="${save_LIBS}"
 AC_SUBST(CURSES_LIBS)
-
-# people tend to forget about curses until the build breaks
-if test "$ac_cv_search_initscr" = no; then
-       AC_MSG_ERROR([curses or ncurses is required])
+if test "$have_curses" = no; then
+       AC_MSG_WARN([curses not found; some tools will not be built])
 fi
+AM_CONDITIONAL([HAVE_CURSES], [test x$have_curses = xyes])
 
 save_LIBS="${LIBS}"
 LIBS=""