From 4ebda6701fb400b9db3b4a6e55fef73ed8e9ec40 Mon Sep 17 00:00:00 2001 From: Bill Erickson Date: Tue, 11 Jan 2022 10:14:12 -0500 Subject: [PATCH] LPXXX RediSRF libhiredis compile support TEMP disable booking until alt. method of configuration is in place. Signed-off-by: Bill Erickson --- Makefile.am | 1 + Open-ILS/src/Makefile.am | 2 +- configure.ac | 9 +++++++++ 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index 7032ac2b7b..d995c5a8b3 100644 --- a/Makefile.am +++ b/Makefile.am @@ -33,6 +33,7 @@ ACLOCAL_AMFLAGS = -I m4 export TMP = @TMP@ export APXS2 = @APXS2@ export LIBXML2_HEADERS = @LIBXML2_HEADERS@ +export HIREDIS_HEADERS = @HIREDIS_HEADERS@ export DBI_LIBS = @DBI_LIBS@ export OPENSRF_HEADERS = @OPENSRF_HEADERS@ export OPENSRF_LIBS = @OPENSRF_LIBS@ diff --git a/Open-ILS/src/Makefile.am b/Open-ILS/src/Makefile.am index 1391e8135d..a49ad74ce2 100644 --- a/Open-ILS/src/Makefile.am +++ b/Open-ILS/src/Makefile.am @@ -16,7 +16,7 @@ export STAFF_CLIENT_BUILD_ID = `/bin/cat @top_srcdir@/Open-ILS/xul/staff_client/build/BUILD_ID` export DEF_LDFLAGS = -L. -L$(TMP) -L$(OPENSRF_LIBS) -export DEF_CFLAGS = -D_LARGEFILE64_SOURCE -pipe -g -Wall -O2 -fPIC -I@top_srcdir@/include -I$(LIBXML2_HEADERS) -I$(APACHE2_HEADERS) -I$(APR_HEADERS) -I$(LIBXML2_HEADERS)/libxml -I$(TMP) -I$(OPENSRF_HEADERS) +export DEF_CFLAGS = -D_LARGEFILE64_SOURCE -pipe -g -Wall -O2 -fPIC -I@top_srcdir@/include -I$(LIBXML2_HEADERS) -I$(APACHE2_HEADERS) -I$(APR_HEADERS) -I$(LIBXML2_HEADERS)/libxml -I$(TMP) -I$(OPENSRF_HEADERS) -I$(HIREDIS_HEADERS) export DEF_LDLIBS = -lopensrf diff --git a/configure.ac b/configure.ac index 53608d945b..35e7278a4b 100644 --- a/configure.ac +++ b/configure.ac @@ -187,6 +187,12 @@ AC_ARG_WITH([libxml2], [LIBXML2_HEADERS=/usr/include/libxml2/]) AC_SUBST([LIBXML2_HEADERS]) +AC_ARG_WITH([hiredis], +[ --with-hiredis=path location of the hiredis headers (default is /usr/include/hiredis/))], +[HIREDIS_HEADERS=${withval}], +[HIREDIS_HEADERS=/usr/include/hiredis/]) +AC_SUBST([HIREDIS_HEADERS]) + AC_ARG_WITH([dbi], [ --with-dbi=path location of the libdbi driver libraries (default is /usr/lib/x86_64-linux-gnu/dbd/)], [DBI_LIBS=${withval}], @@ -291,6 +297,7 @@ if test "x$openils_core" = "xtrue"; then AC_CHECK_LIB([opensrf], [osrfMessageFree], [], AC_MSG_ERROR(*** OpenILS requires libopensrf)) AC_CHECK_LIB([readline], [main], [], AC_MSG_ERROR(*** OpenILS requires libreadline)) AC_CHECK_LIB([xml2], [main], [], AC_MSG_ERROR(*** OpenILS requires libxml2)) + AC_CHECK_LIB([hiredis], [redisConnect], [], AC_MSG_ERROR(***OpenSRF requires libhiredis)) AC_CHECK_LIB([xslt], [main], [], AC_MSG_ERROR(*** OpenILS requires libxslt)) AC_CHECK_LIB([pq], [main], [], AC_MSG_ERROR(*** OpenILS requires libpq)) PKG_CHECK_MODULES(pcre, libpcre >= 3.0.0) @@ -417,6 +424,8 @@ AC_MSG_RESULT(libxml2 headers location: ${LIBXML2_HEADERS}) AC_MSG_RESULT(libdbi location: ${DBI_LIBS}) AC_MSG_RESULT(OpenSRF headers location: ${OPENSRF_HEADERS}) AC_MSG_RESULT(OpenSRF libraries location: ${OPENSRF_LIBS}) +AC_MSG_RESULT(libhiredis headers location: ${HIREDIS_HEADERS}) + AC_MSG_RESULT([----------------------------------------------------------------------]) -- 2.11.0