check for brew version of readline

because the local OSX libedit doesn't really do what we want

diff --git a/Make.inc.in b/Make.inc.in
index 9af524aa67ad2a25bcb669eba4e9598aa259b10d..bb03b1e27af27b9445a7fc5d93300c130396fb15 100644 (file)
--- a/Make.inc.in
+++ b/Make.inc.in
@@ -112,7 +112,12 @@ RADIR              = ${radacctdir}
 bm_shared_libs  = yes
 bm_static_libs  = yes
 
-LIBREADLINE    = @LIBREADLINE@
+LIBREADLINE            = @LIBREADLINE@
+LIBREADLINE_PREFIX     = @LIBREADLINE_PREFIX@
+ifneq "$(LIBREADLINE_PREFIX)" ""
+LIBREADLINE_CFLAGS     = -I$(LIBREADLINE_PREFIX)/include
+LIBREADLINE_LDFLAGS    = -L$(LIBREADLINE_PREFIX)/lib
+endif
 
 #
 #  Version to use for packaging and other Make related things

diff --git a/acinclude.m4 b/acinclude.m4
index 25d67dc6a5d27d51506bbe6a99cac1a6a9a4dbf2..f65dcf9e038213f1e2f1042a6924c33637330ea7 100644 (file)
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -534,7 +534,10 @@ if test "$vl_cv_lib_readline" != "no"; then
     AC_CHECK_HEADERS(history.h readline/history.h)
   fi
 fi
+LIBREADLINE_PREFIX=$(brew --prefix readline 2>/dev/null)
+
 AC_SUBST(LIBREADLINE)
+AC_SUBST(LIBREADLINE_PREFIX)
 ])dnl
 
 AC_INCLUDE(aclocal.m4)

diff --git a/configure b/configure
index 084adf818ace780d683f7a3713dd95f64d079dbb..07d0569e1b648f3cbaf9feffab8d1a92f281b473 100755 (executable)
--- a/configure
+++ b/configure
@@ -641,6 +641,7 @@ PCAP_LIBS
 OPENSSL_CPPFLAGS
 OPENSSL_LDFLAGS
 OPENSSL_LIBS
+LIBREADLINE_PREFIX
 LIBREADLINE
 KQUEUE_LDFLAGS
 KQUEUE_LIBS
@@ -9242,6 +9243,9 @@ done
 
   fi
 fi
+LIBREADLINE_PREFIX=$(brew --prefix readline 2>/dev/null)
+
+