check for brew version of readline

because the local OSX libedit doesn't really do what we want
wide-camp-1909 · Jul 12, 2018 · 3fd01a5 · 3fd01a5
1 parent a8d3363
commit 3fd01a5
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 1 deletion.
diff --git 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
@@ -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
@@ -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)
+
+