From: Alan T. DeKok Date: Tue, 10 Jul 2018 20:29:35 +0000 (-0400) Subject: check for brew version of readline X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3fd01a5a167bf02498af05ab14fd2465cfd1f312;p=thirdparty%2Ffreeradius-server.git 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 9af524aa67a..bb03b1e27af 100644 --- 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 25d67dc6a5d..f65dcf9e038 100644 --- 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 084adf818ac..07d0569e1b6 100755 --- 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) + +