Import libconf/nutconf features

ci_build.sh

@@ -293,6 +293,19 @@ for L in $NODE_LABELS ; do
         "NUT_BUILD_CAPS=cppunit"|"NUT_BUILD_CAPS=cppunit=yes")
             [ -n "$CANBUILD_CPPUNIT_TESTS" ] || CANBUILD_CPPUNIT_TESTS=yes ;;
 
+        # Currently we don't build --with-nutconf" by default, unless desired
+        # explicitly by developers' local workflow (or NUT CI farm recipes),
+        # that codebase needs some clean-up first... This should cover both
+        # the tool and the cppunit tests for it (if active per above).
+        "NUT_BUILD_CAPS=nutconf=no")
+            [ -n "$CANBUILD_NUTCONF" ] || CANBUILD_NUTCONF=no ;;
+        "NUT_BUILD_CAPS=nutconf=no-gcc")
+            [ -n "$CANBUILD_NUTCONF" ] || CANBUILD_NUTCONF=no-gcc ;;
+        "NUT_BUILD_CAPS=nutconf=no-clang")
+            [ -n "$CANBUILD_NUTCONF" ] || CANBUILD_NUTCONF=no-clang ;;
+        "NUT_BUILD_CAPS=nutconf"|"NUT_BUILD_CAPS=nutconf=yes")
+            [ -n "$CANBUILD_NUTCONF" ] || CANBUILD_NUTCONF=yes ;;
+
         # Some (QEMU) builders have issues running valgrind as a tool
         "NUT_BUILD_CAPS=valgrind=no")
             [ -n "$CANBUILD_VALGRIND_TESTS" ] || CANBUILD_VALGRIND_TESTS=no ;;
@@ -1060,6 +1073,21 @@ default|default-alldrv|default-alldrv:no-distcheck|default-all-errors|default-sp
         CONFIG_OPTS+=("--enable-cppunit=no")
     fi
 
+    if [ -z "${CANBUILD_NUTCONF-}" ] \
+    || ( [ "${CANBUILD_NUTCONF-}" = "no-gcc" ] && [ "$COMPILER_FAMILY" = "GCC" ] ) \
+    || ( [ "${CANBUILD_NUTCONF-}" = "no-clang" ] && [ "$COMPILER_FAMILY" = "CLANG" ] ) \
+    ; then
+        CANBUILD_NUTCONF=no
+    fi
+
+    if [ "${CANBUILD_NUTCONF-}" = yes ] ; then
+        echo "WARNING: Build agent says it can build nutconf, enabling the experimental feature" >&2
+        CONFIG_OPTS+=("--with-nutconf=yes")
+    elif [ "${CANBUILD_NUTCONF-}" = no ] ; then
+        echo "WARNING: Build agent says it can not build nutconf (or did not say anything), disabling the feature" >&2
+        CONFIG_OPTS+=("--with-nutconf=no")
+    fi
+
     if [ "${CANBUILD_VALGRIND_TESTS-}" = no ] ; then
         echo "WARNING: Build agent says it has a broken valgrind, adding configure option to skip tests with it" >&2
         CONFIG_OPTS+=("--with-valgrind=no")

common/Makefile.am

@@ -9,13 +9,22 @@
 @NUT_AM_MAKE_CAN_EXPORT@export CCACHE_PATH=@CCACHE_PATH@
 @NUT_AM_MAKE_CAN_EXPORT@export PATH=@PATH_DURING_CONFIGURE@
 
-AM_CFLAGS = -I$(top_srcdir)/include
+AM_CFLAGS = -I$(top_builddir)/include -I$(top_srcdir)/include
+AM_CXXFLAGS = -I$(top_builddir)/include -I$(top_srcdir)/include
 AM_LDFLAGS = -no-undefined
 EXTRA_DIST =
 
 noinst_LTLIBRARIES = libparseconf.la libcommon.la libcommonclient.la
+if WITH_NUTCONF
+# We define the recipe below in any case, but only activate it by default
+# if the build configuration tells us to:
+noinst_LTLIBRARIES += libnutconf.la
+endif
+
 libparseconf_la_SOURCES = parseconf.c
 
+libnutconf_la_SOURCES = nutconf.cpp nutstream.cpp nutwriter.cpp nutipc.cpp
+
 # do not hard depend on '../include/nut_version.h', since it blocks
 # 'dist', and is only required for actual build, in which case
 # BUILT_SOURCES (in ../include) will ensure nut_version.h will