Re: [ANNOUNCE] ipset 6.12 released

[Neutron Soutmun <neo.neutron@gmail.com>]

[-- Attachment #1: Type: text/plain, Size: 384 bytes --]

Hi,

> However, I'll find the solution for the build system when the
> --disable-dependency-tracking is being parse.

The attached file is a patch to solve the
--disable-dependency-tracking is being parse issue and also fixes the
ipset does not build out of the source tree as the configure script
could not check for the lib/ipset_*.c.

Please review.

Best regards,
Neutron Soutmun

[-- Attachment #2: 0001-build-fix-build-failed-on-disable-dependency-trackin.patch --]
[-- Type: application/octet-stream, Size: 2468 bytes --]

From f1fdaa691bb9a0420865e017b54799c7012533d4 Mon Sep 17 00:00:00 2001
From: Neutron Soutmun <neo.neutron@gmail.com>
Date: Thu, 10 May 2012 21:53:55 +0700
Subject: [PATCH] build: fix build failed on --disable-dependency-tracking

* lib/Make_extra.am:
  - Add macro flags to enable/disable the dependency tracking build
    depends on the configuration.
* configure.ac:
  - Fix the userspace tool configuration section error when build
    out of source tree.
---
 configure.ac      |    2 +-
 lib/Make_extra.am |   15 ++++++++++-----
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/configure.ac b/configure.ac
index d9a71d3..af19bf4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -222,7 +222,7 @@ if test "x$enable_settype_modules" != "xyes"; then
 else
 	AC_MSG_RESULT([    Dynamic module loading: enabled])
 fi
-IPSET_ALL_MODULES="`ls lib/ipset_*.c|sed -e 's/lib\///' -e 's/\.c$//'`"
+IPSET_ALL_MODULES="`ls ${srcdir}/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
diff --git a/lib/Make_extra.am b/lib/Make_extra.am
index e5e498c..47da701 100644
--- a/lib/Make_extra.am
+++ b/lib/Make_extra.am
@@ -26,11 +26,16 @@ BUILT_SOURCES = ipset_settype_check types_init.c ipset_settype_modules
 CLEANFILES = ipset_settype_check types_init.c $(IPSET_SETTYPE_ALL_MODULES)
 
 ipset_%.lo: ipset_%.c
-	depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`; \
-	$(LTCOMPILE) -D_INIT=ipset_$*_init \
-	  $(if $(findstring ipset_$*.c,$(IPSET_SETTYPE_STATIC)), -DTYPE_INCLUSIVE,)\
-	  -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< && \
-	$(am__mv) $$depbase.Tpo $$depbase.Plo
+@am__fastdepCC_TRUE@	depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`; \
+@am__fastdepCC_TRUE@	$(LTCOMPILE) -D_INIT=ipset_$*_init \
+		$(if $(findstring ipset_$*.c,$(IPSET_SETTYPE_STATIC)), -DTYPE_INCLUSIVE,)\
+		-MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< && \
+@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LTCOMPILE) -D_INIT=ipset_$*_init \
+		$(if $(findstring ipset_$*.c,$(IPSET_SETTYPE_STATIC)), -DTYPE_INCLUSIVE,)\
+		-c -o $@ $<
 
 ipset_%.la: $(lib_LTLIBRARIES) ipset_%.lo
 	lobj="$(patsubst %.la, %.lo, $@)"; \
-- 
1.7.10