Fix readline finding on FreeBSD -current

a716ea33 · Poul-Henning Kamp · Lasse Karstensen · 5a01820c · a716ea33 · a716ea33
Commit a716ea33 authored Aug 27, 2014 by Poul-Henning Kamp Committed by Lasse Karstensen Sep 22, 2014
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 2 deletions

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

configure.ac configure.ac +1 -0

No files found.
--- a/bin/varnishadm/varnishadm.c
+++ b/bin/varnishadm/varnishadm.c
@@ -34,9 +34,11 @@

 #include <stdio.h>

-#ifdef HAVE_LIBEDIT
+#if defined(HAVE_EDIT_READLINE_READLINE_H)
+#  include <edit/readline/readline.h>
+#elif defined(HAVE_LIBEDIT)
 #  include <editline/readline.h>
-#elif HAVE_READLINE_READLINE_H
+#elif defined (HAVE_READLINE_READLINE_H)
 #  include <readline/readline.h>
 #  ifdef HAVE_READLINE_HISTORY_H
 #    include <readline/history.h>

--- a/configure.ac
+++ b/configure.ac
@@ -164,6 +164,7 @@ PKG_CHECK_MODULES([LIBEDIT], [libedit],
 AC_HEADER_STDC
 AC_HEADER_SYS_WAIT
 AC_HEADER_TIME
+AC_CHECK_HEADERS([edit/readline/readline.h])
 AC_CHECK_HEADERS([sys/param.h])
 AC_CHECK_HEADERS([sys/types.h])
 AC_CHECK_HEADERS([sys/endian.h])