Merge pull request #5164 from rgerhards/configure-libcapng

build system: more precise error message on too-old lib

configure.ac

@@ -388,11 +388,17 @@ AC_ARG_ENABLE(libcap-ng,
 )
 
 if test "$enable_libcapng" = "yes"; then
+        PKG_CHECK_MODULES(
+                [LIBCAPNG_PRESENT],
+                [libcap-ng],
+                [AC_DEFINE([ENABLE_LIBCAPNG_PRESENT], [1], [Indicator that libcap-ng is present])],
+                [AC_MSG_ERROR(libcap-ng is not present.)]
+        )
         PKG_CHECK_MODULES(
                 [LIBCAPNG],
                 [libcap-ng >= 0.8.2],
                 [AC_DEFINE([ENABLE_LIBCAPNG], [1], [Indicator that libcap-ng is present])],
-                [AC_MSG_ERROR(libcap-ng is not present.)]
+                [AC_MSG_ERROR([libcap-ng is present, but outdated - need 0.8.2 or above.])]
         )
         CFLAGS="$CFLAGS $LIBCAPNG_CFLAGS"
         LIBS="$LIBS $LIBCAPNG_LIBS"

devtools/devcontainer.sh

@@ -40,10 +40,10 @@ fi
 printf '/rsyslog is mapped to %s \n' "$RSYSLOG_HOME"
 printf 'using container %s\n' "$RSYSLOG_DEV_CONTAINER"
 printf 'pulling container...\n'
+docker pull $RSYSLOG_DEV_CONTAINER
 printf 'user ids: %s:%s\n' $(id -u) $(id -g)
 printf 'container_uid: %s\n' ${RSYSLOG_CONTAINER_UID--u $(id -u):$(id -g)}
 printf 'container cmd: %s\n' $*
-docker pull $RSYSLOG_DEV_CONTAINER
 docker run $ti $optrm $DOCKER_RUN_EXTRA_OPTS \
 	-e RSYSLOG_CONFIGURE_OPTIONS_EXTRA \
 	-e RSYSLOG_CONFIGURE_OPTIONS_OVERRIDE \