[3.0] d499461 Stopgap fix to get FreeBSD 10-current compiling again.
Tollef Fog Heen
tfheen at varnish-cache.org
Thu May 24 14:47:43 CEST 2012
commit d499461fbe28d513211e6694ea22de88eb6e88a0
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date: Thu Apr 12 07:24:02 2012 +0000
Stopgap fix to get FreeBSD 10-current compiling again.
diff --git a/bin/varnishadm/varnishadm.c b/bin/varnishadm/varnishadm.c
index 68ebbf7..e67062f 100644
--- a/bin/varnishadm/varnishadm.c
+++ b/bin/varnishadm/varnishadm.c
@@ -38,7 +38,12 @@
#include <sys/socket.h>
#ifdef HAVE_LIBEDIT
-#include <editline/readline.h>
+# include <stdio.h>
+# ifdef HAVE_EDIT_READLINE_READLINE_H
+# include <edit/readline/readline.h>
+# else
+# include <editline/readline.h>
+# endif
#endif
#include "vcli.h"
diff --git a/configure.ac b/configure.ac
index 55b2281..0fbb620 100644
--- a/configure.ac
+++ b/configure.ac
@@ -150,6 +150,7 @@ AC_SUBST(PCRE_LIBS)
PKG_CHECK_MODULES([LIBEDIT], [libedit],
[AC_DEFINE([HAVE_LIBEDIT], [1], [Define we have libedit])],
[AC_CHECK_HEADERS([readline/readline.h])
+ AC_CHECK_HEADERS([edit/readline/readline.h])
AC_CHECK_LIB(edit, el_init,
[ AC_DEFINE([HAVE_LIBEDIT], [1], [Define we have libedit])
LIBEDIT_CFLAGS=""
More information about the varnish-commit
mailing list