/[gentoo-x86]/www-servers/varnish/files/varnish-3.0.2-automagic.patch
Gentoo

Contents of /www-servers/varnish/files/varnish-3.0.2-automagic.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 1.1 - (show annotations) (download)
Wed Dec 14 22:55:14 2011 UTC (2 years, 4 months ago) by radhermit
Branch: MAIN
Revbump to fix automagic dependencies. Add libedit and tools use flags.

(Portage version: 2.2.0_alpha79/cvs/Linux x86_64)

1 --- varnish-3.0.2/configure.ac.orig
2 +++ varnish-3.0.2/configure.ac
3 @@ -87,15 +87,20 @@
4
5 save_LIBS="${LIBS}"
6 LIBS=""
7 -AC_SEARCH_LIBS(initscr, [curses ncurses],
8 - [have_curses=yes], [have_curses=no])
9 -CURSES_LIBS="${LIBS}"
10 -LIBS="${save_LIBS}"
11 -AC_SUBST(CURSES_LIBS)
12 -if test "$have_curses" = no; then
13 - AC_MSG_WARN([curses not found; some tools will not be built])
14 -fi
15 -AC_CHECK_HEADERS([ncurses/curses.h curses.h])
16 +AC_ARG_WITH([tools], AS_HELP_STRING([--without-tools],
17 + [Don't build additional tools: varnishhist, varnishstat, varnishtop, varnishsizes (default: test)]))
18 +
19 +AS_IF([test "x$with_tools" != "xno"], [
20 + AC_SEARCH_LIBS(initscr, [curses ncurses],
21 + [have_curses=yes], [have_curses=no])
22 + CURSES_LIBS="${LIBS}"
23 + LIBS="${save_LIBS}"
24 + AC_SUBST(CURSES_LIBS)
25 + if test "$have_curses" = no; then
26 + AC_MSG_ERROR([curses not found, required to build additional tools])
27 + fi
28 + AC_CHECK_HEADERS([ncurses/curses.h curses.h])
29 +])
30 AM_CONDITIONAL([HAVE_CURSES], [test x$have_curses = xyes])
31
32 save_LIBS="${LIBS}"
33 @@ -147,9 +152,13 @@
34 AC_SUBST(PCRE_CFLAGS)
35 AC_SUBST(PCRE_LIBS)
36
37 -PKG_CHECK_MODULES([LIBEDIT], [libedit],
38 - [AC_DEFINE([HAVE_LIBEDIT], [1], [Define we have libedit])],
39 - [AC_MSG_WARN([libedit not found, disabling libedit support])])
40 +AC_ARG_WITH([libedit], AS_HELP_STRING([--with-libedit],
41 + [Enable support for libedit in varnishadm (default: disabled)]))
42 +AS_IF([test "x$with_libedit" = "xyes"], [
43 + PKG_CHECK_MODULES([LIBEDIT], [libedit],
44 + [AC_DEFINE([HAVE_LIBEDIT], [1], [Define we have libedit])],
45 + [AC_MSG_ERROR([libedit not found])])
46 +])
47
48 # Checks for header files.
49 AC_HEADER_STDC

  ViewVC Help
Powered by ViewVC 1.1.20