From 835e0707f206ae8c88cd96d1056445e71ad9f6aa Mon Sep 17 00:00:00 2001 From: Francis Dupont Date: Mon, 11 Dec 2017 01:45:34 +0100 Subject: [PATCH] [5400] Checkpoint (80% done) --- Makefile.am | 2 +- configure.ac | 67 ++++++++++----------- src/hooks/dhcp/lease_cmds/tests/Makefile.am | 6 -- 3 files changed, 32 insertions(+), 43 deletions(-) diff --git a/Makefile.am b/Makefile.am index 2e34d16daf..8a82914038 100644 --- a/Makefile.am +++ b/Makefile.am @@ -2,7 +2,7 @@ ACLOCAL_AMFLAGS = -I m4macros ${ACLOCAL_FLAGS} # ^^^^^^^^ This has to be the first line and cannot come later in this # Makefile.am due to some bork in some versions of autotools. -SUBDIRS = compatcheck tools doc . ext src m4macros @PREMIUM_DIR@ +SUBDIRS = compatcheck tools doc . ext src m4macros @PREMIUM_DIR@ @CONTRIB_DIR@ USE_LCOV=@USE_LCOV@ LCOV=@LCOV@ diff --git a/configure.ac b/configure.ac index 2fa156d5b5..4f4aad4d52 100644 --- a/configure.ac +++ b/configure.ac @@ -1,7 +1,7 @@ # -*- Autoconf -*- # Process this file with autoconf to produce a configure script. -AC_PREREQ([2.59]) +AC_PREREQ([2.69]) # For released versions, this is in x.y.z format. # For GIT versions, this is x.y.z-git, where x.y.z denotes the software @@ -72,13 +72,20 @@ AC_ARG_ENABLE([debug], AM_CONDITIONAL([DEBUG_ENABLED], [test x$debug_enabled = xyes]) AM_COND_IF([DEBUG_ENABLED], [AC_DEFINE([ENABLE_DEBUG], [1], [Enable low-performing debugging facilities?])]) +# Include premium configuration PREMIUM_DIR= -if test -d "${srcdir}/premium"; then - PREMIUM_DIR=premium - AC_CONFIG_SUBDIRS([premium]) +# m4_sinclude includes the file if it exists at autoreconf time +m4_sinclude(premium/config.m4) +if test x$PREMIUM_DIR != x]; then + AX_PREMIUM fi -AC_SUBST(PREMIUM_DIR) +# Include contrib configuration +CONTRIB_DIR= +m4_sinclude(contrib/config.m4) +if test x$CONTRIB_DIR != x]; then + AX_CONTRIB +fi # Libtool configuration # @@ -1358,21 +1365,6 @@ AC_CONFIG_COMMANDS([permissions], [ chmod +x tools/path_replacer.sh ]) -AM_CONDITIONAL(PREMIUM, test -d "$srcdir/premium/src") - -AC_MSG_CHECKING([if premium package is available]) -if test -d "$srcdir/premium/src"; then - - # Define it in the config.h, so C++ code could use it. - AC_DEFINE([PREMIUM], [1], [Kea-premium package found]) - - # Export it here, so code in configure could use it. - PREMIUM=1 - AC_MSG_RESULT(yes) -else - AC_MSG_RESULT(no) -fi - AC_OUTPUT dnl Print the results @@ -1389,19 +1381,22 @@ cat > config.report << END -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- Package: - Name: ${PACKAGE_NAME} - Version: ${PACKAGE_VERSION} - Extended version:${EXTENDED_VERSION} - OS Family: ${OS_TYPE} - Using GNU sed: ${GNU_SED} + Name: ${PACKAGE_NAME} + Version: ${PACKAGE_VERSION} + Extended version: ${EXTENDED_VERSION} + OS Family: ${OS_TYPE} + Using GNU sed: ${GNU_SED} END if test "$PREMIUM" != ""; then cat >> config.report << END - Premium package: yes + Premium package: yes + Tier1 Packages: ${TIER1_PACKAGES} + Tier2 Packages: ${TIER2_PACKAGES} + Included Packages: ${INCLUDED_PACKAGES} END else cat >> config.report << END - Premium package: no + Premium package: no END fi cat >> config.report << END @@ -1462,9 +1457,9 @@ ${CRYPTO_NAME}: ${DISABLED_CRYPTO}: no Log4cplus: - LOG4CPLUS_VERSION: ${LOG4CPLUS_VERSION} + LOG4CPLUS_VERSION: ${LOG4CPLUS_VERSION} LOG4CPLUS_INCLUDES: ${LOG4CPLUS_INCLUDES} - LOG4CPLUS_LIBS: ${LOG4CPLUS_LIBS} + LOG4CPLUS_LIBS: ${LOG4CPLUS_LIBS} Flex/bison: FLEX: ${LEX} @@ -1536,14 +1531,14 @@ fi cat >> config.report << END Developer: - Enable Debugging: $debug_enabled - Google Tests: $enable_gtest - Valgrind: $found_valgrind - C++ Code Coverage: $USE_LCOV - Logger checks: $enable_logger_checks + Enable Debugging: $debug_enabled + Google Tests: $enable_gtest + Valgrind: $found_valgrind + C++ Code Coverage: $USE_LCOV + Logger checks: $enable_logger_checks Generate Documentation: $enable_generate_docs - Parser Generation: $enable_generate_parser - Kea-shell: $enable_shell + Parser Generation: $enable_generate_parser + Kea-shell: $enable_shell END diff --git a/src/hooks/dhcp/lease_cmds/tests/Makefile.am b/src/hooks/dhcp/lease_cmds/tests/Makefile.am index 0e987d2cd6..cc198b4cad 100644 --- a/src/hooks/dhcp/lease_cmds/tests/Makefile.am +++ b/src/hooks/dhcp/lease_cmds/tests/Makefile.am @@ -33,12 +33,6 @@ lease_cmds_unittests_CPPFLAGS = $(AM_CPPFLAGS) $(GTEST_INCLUDES) $(LOG4CPLUS_INC lease_cmds_unittests_LDFLAGS = $(AM_LDFLAGS) $(CRYPTO_LDFLAGS) $(GTEST_LDFLAGS) lease_cmds_unittests_CXXFLAGS = $(AM_CXXFLAGS) -if USE_CLANGPP -# This is to workaround unused variables tcout and tcerr in -# log4cplus's streams.h and unused parameters from some of the -# Boost headers. -lease_cmds_unittests_CXXFLAGS += -Wno-unused-parameter -endif lease_cmds_unittests_LDADD = $(top_builddir)/src/lib/dhcpsrv/libkea-dhcpsrv.la lease_cmds_unittests_LDADD += $(top_builddir)/src/lib/dhcp/libkea-dhcp++.la -- 2.47.2