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

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

Parent Directory Parent Directory | Revision Log Revision Log


Revision 1.1 - (show annotations) (download)
Thu Aug 23 20:59:46 2012 UTC (2 years ago) by blueness
Branch: MAIN
Version bump

(Portage version: 2.1.11.9/cvs/Linux x86_64)

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

  ViewVC Help
Powered by ViewVC 1.1.20