| 1 |
blueness 12/08/23 20:59:46 |
| 2 |
|
| 3 |
Added: varnish-3.0.3-automagic.patch |
| 4 |
Log: |
| 5 |
Version bump |
| 6 |
|
| 7 |
(Portage version: 2.1.11.9/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 www-servers/varnish/files/varnish-3.0.3-automagic.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/varnish/files/varnish-3.0.3-automagic.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/varnish/files/varnish-3.0.3-automagic.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: varnish-3.0.3-automagic.patch |
| 16 |
=================================================================== |
| 17 |
diff -Naur varnish-3.0.3.orig//configure.ac varnish-3.0.3/configure.ac |
| 18 |
--- varnish-3.0.3.orig//configure.ac 2012-08-20 05:20:40.000000000 -0400 |
| 19 |
+++ varnish-3.0.3/configure.ac 2012-08-23 15:58:15.000000000 -0400 |
| 20 |
@@ -87,15 +87,20 @@ |
| 21 |
|
| 22 |
save_LIBS="${LIBS}" |
| 23 |
LIBS="" |
| 24 |
-AC_SEARCH_LIBS(initscr, [curses ncurses], |
| 25 |
- [have_curses=yes], [have_curses=no]) |
| 26 |
-CURSES_LIBS="${LIBS}" |
| 27 |
-LIBS="${save_LIBS}" |
| 28 |
-AC_SUBST(CURSES_LIBS) |
| 29 |
-if test "$have_curses" = no; then |
| 30 |
- AC_MSG_WARN([curses not found; some tools will not be built]) |
| 31 |
-fi |
| 32 |
-AC_CHECK_HEADERS([ncurses/curses.h curses.h]) |
| 33 |
+AC_ARG_WITH([tools], AS_HELP_STRING([--without-tools], |
| 34 |
+ [Don't build additional tools: varnishhist, varnishstat, varnishtop, varnishsizes (default: test)])) |
| 35 |
+ |
| 36 |
+AS_IF([test "x$with_tools" != "xno"], [ |
| 37 |
+ AC_SEARCH_LIBS(initscr, [curses ncurses], |
| 38 |
+ [have_curses=yes], [have_curses=no]) |
| 39 |
+ CURSES_LIBS="${LIBS}" |
| 40 |
+ LIBS="${save_LIBS}" |
| 41 |
+ AC_SUBST(CURSES_LIBS) |
| 42 |
+ if test "$have_curses" = no; then |
| 43 |
+ AC_MSG_ERROR([curses not found, required to build additional tools]) |
| 44 |
+ fi |
| 45 |
+ AC_CHECK_HEADERS([ncurses/curses.h curses.h]) |
| 46 |
+]) |
| 47 |
AM_CONDITIONAL([HAVE_CURSES], [test x$have_curses = xyes]) |
| 48 |
|
| 49 |
save_LIBS="${LIBS}" |
| 50 |
@@ -147,17 +152,13 @@ |
| 51 |
AC_SUBST(PCRE_CFLAGS) |
| 52 |
AC_SUBST(PCRE_LIBS) |
| 53 |
|
| 54 |
-PKG_CHECK_MODULES([LIBEDIT], [libedit], |
| 55 |
- [AC_DEFINE([HAVE_LIBEDIT], [1], [Define we have libedit])], |
| 56 |
- [AC_CHECK_HEADERS([readline/readline.h]) |
| 57 |
- AC_CHECK_HEADERS([edit/readline/readline.h]) |
| 58 |
- AC_CHECK_LIB(edit, el_init, |
| 59 |
- [ AC_DEFINE([HAVE_LIBEDIT], [1], [Define we have libedit]) |
| 60 |
- LIBEDIT_CFLAGS="" |
| 61 |
- LIBEDIT_LIBS="-ledit ${CURSES_LIBS}" |
| 62 |
- ], |
| 63 |
- [AC_MSG_WARN([libedit not found, disabling libedit support])], |
| 64 |
- [${CURSES_LIBS}])]) |
| 65 |
+AC_ARG_WITH([libedit], AS_HELP_STRING([--with-libedit], |
| 66 |
+ [Enable support for libedit in varnishadm (default: disabled)])) |
| 67 |
+AS_IF([test "x$with_libedit" = "xyes"], [ |
| 68 |
+ PKG_CHECK_MODULES([LIBEDIT], [libedit], |
| 69 |
+ [AC_DEFINE([HAVE_LIBEDIT], [1], [Define we have libedit])], |
| 70 |
+ [AC_MSG_ERROR([libedit not found])]) |
| 71 |
+]) |
| 72 |
|
| 73 |
# Checks for header files. |
| 74 |
AC_HEADER_STDC |
Archives