Commit ccd736b3 authored by Francis Dupont's avatar Francis Dupont

[5210] Added kea-shell and log4cplus to distcheck (tentative)

parent e620bcab
...@@ -10,6 +10,8 @@ GENHTML=@GENHTML@ ...@@ -10,6 +10,8 @@ GENHTML=@GENHTML@
DISTCHECK_GTEST_CONFIGURE_FLAG=@DISTCHECK_GTEST_CONFIGURE_FLAG@ DISTCHECK_GTEST_CONFIGURE_FLAG=@DISTCHECK_GTEST_CONFIGURE_FLAG@
DISTCHECK_CRYPTO_CONFIGURE_FLAG=@DISTCHECK_CRYPTO_CONFIGURE_FLAG@ DISTCHECK_CRYPTO_CONFIGURE_FLAG=@DISTCHECK_CRYPTO_CONFIGURE_FLAG@
DISTCHECK_BOOST_CONFIGURE_FLAG=@DISTCHECK_BOOST_CONFIGURE_FLAG@ DISTCHECK_BOOST_CONFIGURE_FLAG=@DISTCHECK_BOOST_CONFIGURE_FLAG@
DISTCHECK_LOG4CPLUS_CONFIGURE_FLAG=@DISTCHECK_LOG4CPLUS_CONFIGURE_FLAG@
DISTCHECK_KEA_SHELL_CONFIGURE_FLAG=@DISTCHECK_KEA_SHELL_CONFIGURE_FLAG@
DISTCLEANFILES = config.report DISTCLEANFILES = config.report
...@@ -25,6 +27,12 @@ DISTCHECK_CONFIGURE_FLAGS += $(DISTCHECK_CRYPTO_CONFIGURE_FLAG) ...@@ -25,6 +27,12 @@ DISTCHECK_CONFIGURE_FLAGS += $(DISTCHECK_CRYPTO_CONFIGURE_FLAG)
# Keep the Boost configuration which becomes sensible # Keep the Boost configuration which becomes sensible
DISTCHECK_CONFIGURE_FLAGS += $(DISTCHECK_BOOST_CONFIGURE_FLAG) DISTCHECK_CONFIGURE_FLAGS += $(DISTCHECK_BOOST_CONFIGURE_FLAG)
# Keep the log4cplus path too
DISTCHECK_CONFIGURE_FLAGS += $(DISTCHECK_LOG4CPLUS_CONFIGURE_FLAG)
# Keep kea-shell if enabled
DISTCHECK_CONFIGURE_FLAGS += $(DISTCHECK_KEA_SHELL_CONFIGURE_FLAG)
dist_doc_DATA = AUTHORS COPYING ChangeLog README dist_doc_DATA = AUTHORS COPYING ChangeLog README
.PHONY: check-valgrind check-valgrind-suppress .PHONY: check-valgrind check-valgrind-suppress
......
...@@ -407,6 +407,7 @@ AC_ARG_ENABLE(shell, [AC_HELP_STRING([--enable-shell], ...@@ -407,6 +407,7 @@ AC_ARG_ENABLE(shell, [AC_HELP_STRING([--enable-shell],
[enable kea-shell, a text management client for Control Agent [default=no]])], [enable kea-shell, a text management client for Control Agent [default=no]])],
enable_shell=$enableval, enable_shell=no) enable_shell=$enableval, enable_shell=no)
DISTCHECK_KEA_SHELL_CONFIGURE_FLAG=
PKGPYTHONDIR= PKGPYTHONDIR=
m4_define_default([_AM_PYTHON_INTERPRETER_LIST], m4_define_default([_AM_PYTHON_INTERPRETER_LIST],
[python3 python3.9 python3.8 python3.7 python3.6 python3.5 python3.4 dnl [python3 python3.9 python3.8 python3.7 python3.6 python3.5 python3.4 dnl
...@@ -427,12 +428,14 @@ if test "x$enable_shell" != xno ; then ...@@ -427,12 +428,14 @@ if test "x$enable_shell" != xno ; then
eval PKGPYTHONDIR="\"$OLD\"" eval PKGPYTHONDIR="\"$OLD\""
done done
prefix="$saved_prefix" prefix="$saved_prefix"
DISTCHECK_KEA_SHELL_CONFIGURE_FLAG="--enable-shell"
else else
PYTHON=no PYTHON=no
fi fi
# Export to makefiles the info whether we have shell enabled or not # Export to makefiles the info whether we have shell enabled or not
AM_CONDITIONAL(KEA_SHELL, test x$enable_shell != xno) AM_CONDITIONAL(KEA_SHELL, test x$enable_shell != xno)
AC_SUBST(DISTCHECK_KEA_SHELL_CONFIGURE_FLAG)
AC_SUBST(PKGPYTHONDIR) AC_SUBST(PKGPYTHONDIR)
# produce PIC unless we disable shared libraries. need this for python bindings. # produce PIC unless we disable shared libraries. need this for python bindings.
...@@ -757,6 +760,7 @@ fi ...@@ -757,6 +760,7 @@ fi
AM_CONDITIONAL(HAVE_CQL, test "$CQL_CONFIG" != "") AM_CONDITIONAL(HAVE_CQL, test "$CQL_CONFIG" != "")
# Check for log4cplus # Check for log4cplus
DISTCHECK_LOG4CPLUS_CONFIGURE_FLAG=
log4cplus_path="yes" log4cplus_path="yes"
AC_ARG_WITH([log4cplus], AC_ARG_WITH([log4cplus],
AC_HELP_STRING([--with-log4cplus=PATH], AC_HELP_STRING([--with-log4cplus=PATH],
...@@ -765,6 +769,7 @@ AC_ARG_WITH([log4cplus], ...@@ -765,6 +769,7 @@ AC_ARG_WITH([log4cplus],
if test "${log4cplus_path}" = "no" ; then if test "${log4cplus_path}" = "no" ; then
AC_MSG_ERROR([Need log4cplus]) AC_MSG_ERROR([Need log4cplus])
elif test "${log4cplus_path}" != "yes" ; then elif test "${log4cplus_path}" != "yes" ; then
DISTCHECK_LOG4CPLUS_CONFIGURE_FLAG="-with-log4cplus=${log4cplus_path}"
LOG4CPLUS_INCLUDES="-I${log4cplus_path}/include" LOG4CPLUS_INCLUDES="-I${log4cplus_path}/include"
LOG4CPLUS_LIBS="-L${log4cplus_path}/lib" LOG4CPLUS_LIBS="-L${log4cplus_path}/lib"
else else
...@@ -778,10 +783,12 @@ else ...@@ -778,10 +783,12 @@ else
break break
fi fi
done done
DISTCHECK_LOG4CPLUS_CONFIGURE_FLAG="-with-log4cplus"
fi fi
LOG4CPLUS_LIBS="$LOG4CPLUS_LIBS -llog4cplus" LOG4CPLUS_LIBS="$LOG4CPLUS_LIBS -llog4cplus"
AC_SUBST(DISTCHECK_LOG4CPLUS_CONFIGURE_FLAG)
AC_SUBST(LOG4CPLUS_LIBS) AC_SUBST(LOG4CPLUS_LIBS)
AC_SUBST(LOG4CPLUS_INCLUDES) AC_SUBST(LOG4CPLUS_INCLUDES)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment