Add configure summary for the ipset userspace tool

diff --git a/configure.ac b/configure.ac
index 7e7cf7511fcf7ac85196f8718facb65e90b8f631..eae42958315d8f101413ca820f2e806228075d2c 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -206,3 +206,39 @@ dnl Generate output
 AC_CONFIG_FILES([Makefile include/libipset/Makefile
        lib/Makefile lib/libipset.pc src/Makefile])
 AC_OUTPUT
+
+dnl Summary
+AC_MSG_RESULT([])
+AC_MSG_RESULT([$PACKAGE userspace tool configuration:])
+if test "x$enable_settype_modules" != "xyes"; then
+       AC_MSG_RESULT([    Dynamic module loading: disabled])
+else
+       AC_MSG_RESULT([    Dynamic module loading: enabled])
+fi
+IPSET_ALL_MODULES="`ls lib/ipset_*.c|sed -e 's/lib\///' -e 's/\.c$//'`"
+AC_MSG_RESULT([    Static modules:])
+if test "x$SETTYPE_MODLIST" = "x"; then
+       for mod in $IPSET_ALL_MODULES; do
+               AC_MSG_RESULT([        ${mod}])
+       done
+       AC_MSG_RESULT([    Dynamic modules:])
+elif echo $SETTYPE_MODLIST | grep "all" >/dev/null; then
+       AC_MSG_RESULT([    Dynamic modules:])
+       for mod in $IPSET_ALL_MODULES; do
+               AC_MSG_RESULT([        ${mod}])
+       done
+else
+       for mod in $IPSET_ALL_MODULES; do
+               if echo $SETTYPE_MODLIST | grep $mod >/dev/null; then
+                       :
+               else
+                       AC_MSG_RESULT([        ${mod}])
+               fi
+       done
+       AC_MSG_RESULT([    Dynamic modules:])
+       for mod in $IPSET_ALL_MODULES; do
+               if echo $SETTYPE_MODLIST | grep $mod >/dev/null; then
+                       AC_MSG_RESULT([        ${mod}])
+               fi
+       done
+fi

diff --git a/lib/Make_extra.am b/lib/Make_extra.am
index 743f2bda87d61ec84237fbb583c0fc1f3c7e967f..e5e498c399f54cc03b9de36fcc8abe21845d897b 100644 (file)
--- a/lib/Make_extra.am
+++ b/lib/Make_extra.am
@@ -4,14 +4,16 @@ if ENABLE_SETTYPE_MODULES
 AM_CFLAGS += -DENABLE_SETTYPE_MODULES \
                 -DIPSET_MODSDIR="\"$(IPSET_MODSDIR)\""
 IPSET_SETTYPE_MODULES = yes
-IPSET_SETTYPE_DYNAMIC = $(if $(findstring all,$(SETTYPE_MODLIST)), \
+IPSET_SETTYPE_DYN = $(if $(findstring all,$(SETTYPE_MODLIST)), \
                                   $(IPSET_SETTYPE_LIST), $(SETTYPE_MODLIST))
 else
-IPSET_SETTYPE_DYNAMIC =
+IPSET_SETTYPE_DYN =
 endif
 
-IPSET_SETTYPE_STATIC = $(filter-out $(IPSET_SETTYPE_DYNAMIC), \
+IPSET_SETTYPE_STATIC = $(filter-out $(IPSET_SETTYPE_DYN), \
                             $(IPSET_SETTYPE_LIST))
+IPSET_SETTYPE_DYNAMIC = $(filter $(IPSET_SETTYPE_LIST), \
+                            $(IPSET_SETTYPE_DYN))
 IPSET_SETTYPE_STATIC_OBJECTS  = $(patsubst %.c, %.lo, $(IPSET_SETTYPE_STATIC))
 
 IPSET_SETTYPE_DYNAMIC_OBJECTS = $(patsubst %.c, %.lo, $(IPSET_SETTYPE_DYNAMIC))