Stopgap fix to get FreeBSD 10-current compiling again.

7e51d6ff · Poul-Henning Kamp · 9dc28b2c · 7e51d6ff · 7e51d6ff
Commit 7e51d6ff authored Apr 12, 2012 by Poul-Henning Kamp
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 2 deletions

varnishadm.c bin/varnishadm/varnishadm.c +6 -2

configure.ac configure.ac +1 -0

No files found.
--- a/bin/varnishadm/varnishadm.c
+++ b/bin/varnishadm/varnishadm.c
@@ -32,8 +32,12 @@
 #include <sys/socket.h>
 #ifdef HAVE_LIBEDIT
-#include <stdio.h>
+#  include <stdio.h>
-#include <editline/readline.h>
+#  ifdef HAVE_EDIT_READLINE_READLINE_H
+#    include <edit/readline/readline.h>
+#  else
+#    include <editline/readline.h>
+#  endif
 #endif
 #include <errno.h>

--- a/configure.ac
+++ b/configure.ac
@@ -145,6 +145,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=""