[experimental-ims] 7e51d6f Stopgap fix to get FreeBSD 10-current compiling again.

[Poul-Henning Kamp]

commit 7e51d6ff15713f5e4d424b179428c6fd8afe29ca
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 bb5cc8e..f3b8b69 100644
--- 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 <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 <errno.h>
diff --git a/configure.ac b/configure.ac
index 33b0a60..e6ecfb9 100644
--- 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=""