src/owniptc: Moved the “src/libiptc” directory to “src/owniptc” to avoid build issues.

If there is a system-wide version of this library available, the “-I.”
argument (added automatically by automake :() will lead to the shipped
header files being used. Later, the binary is linked with the
system-wide library, which leads to severe problems when API/ABI
incompatibilities have been introduced in other versions.

diff --git a/configure.in b/configure.in
index 062f8aa55a471a05438bccaf83fbbf58f6d45272..533e398bae19bc33536b8ad0f607ccff412f5403 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -3250,7 +3250,7 @@ AC_SUBST(LCC_VERSION_STRING)
 
 AC_CONFIG_FILES(src/libcollectdclient/lcc_features.h)
 
-AC_OUTPUT(Makefile src/Makefile src/collectd.conf src/libiptc/Makefile src/libcollectdclient/Makefile src/libcollectdclient/libcollectdclient.pc src/liboconfig/Makefile src/liboping/Makefile bindings/Makefile)
+AC_OUTPUT(Makefile src/Makefile src/collectd.conf src/owniptc/Makefile src/libcollectdclient/Makefile src/libcollectdclient/libcollectdclient.pc src/liboconfig/Makefile src/liboping/Makefile bindings/Makefile)
 
 if test "x$with_librrd" = "xyes" \
        && test "x$librrd_threadsafe" != "xyes"

diff --git a/src/Makefile.am b/src/Makefile.am
index 39027951ad1b74fdb5a05f5ac0a47d13cf6d0ebf..c01998e8bab9610bd3b2af6c575a99b1efab01c6 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,6 +1,6 @@
 SUBDIRS = libcollectdclient
 if BUILD_WITH_OWN_LIBIPTC
-SUBDIRS += libiptc
+SUBDIRS += owniptc
 endif
 if BUILD_WITH_OWN_LIBOCONFIG
 SUBDIRS += liboconfig
@@ -341,8 +341,8 @@ pkglib_LTLIBRARIES += iptables.la
 iptables_la_SOURCES = iptables.c
 iptables_la_LDFLAGS = -module -avoid-version
 if BUILD_WITH_OWN_LIBIPTC
-iptables_la_LIBADD  = libiptc/libiptc.la
-iptables_la_DEPENDENCIES = libiptc/libiptc.la
+iptables_la_LIBADD  = owniptc/libiptc.la
+iptables_la_DEPENDENCIES = owniptc/libiptc.la
 else
 iptables_la_LDFLAGS += -liptc
 endif

diff --git a/src/iptables.c b/src/iptables.c
index 12275cd09921aa594ba0e2f80e49b6c3da296780..9f56d590fcb1616411d0ba553b4e745919f1a660 100644 (file)
--- a/src/iptables.c
+++ b/src/iptables.c
@@ -28,7 +28,7 @@
 #include "configfile.h"
 
 #if OWN_LIBIPTC
-# include "libiptc/libiptc.h"
+# include "owniptc/libiptc.h"
 #else
 # include <libiptc/libiptc.h>
 #endif

diff --git a/src/libiptc/Makefile.am b/src/owniptc/Makefile.am
similarity index 100%
rename from src/libiptc/Makefile.am
rename to src/owniptc/Makefile.am

diff --git a/src/libiptc/README.collectd b/src/owniptc/README.collectd
similarity index 100%
rename from src/libiptc/README.collectd
rename to src/owniptc/README.collectd

diff --git a/src/libiptc/ipt_kernel_headers.h b/src/owniptc/ipt_kernel_headers.h
similarity index 100%
rename from src/libiptc/ipt_kernel_headers.h
rename to src/owniptc/ipt_kernel_headers.h

diff --git a/src/libiptc/libip4tc.c b/src/owniptc/libip4tc.c
similarity index 100%
rename from src/libiptc/libip4tc.c
rename to src/owniptc/libip4tc.c

diff --git a/src/libiptc/libip6tc.c b/src/owniptc/libip6tc.c
similarity index 100%
rename from src/libiptc/libip6tc.c
rename to src/owniptc/libip6tc.c

diff --git a/src/libiptc/libip6tc.h b/src/owniptc/libip6tc.h
similarity index 100%
rename from src/libiptc/libip6tc.h
rename to src/owniptc/libip6tc.h

diff --git a/src/libiptc/libiptc.c b/src/owniptc/libiptc.c
similarity index 100%
rename from src/libiptc/libiptc.c
rename to src/owniptc/libiptc.c

diff --git a/src/libiptc/libiptc.h b/src/owniptc/libiptc.h
similarity index 100%
rename from src/libiptc/libiptc.h
rename to src/owniptc/libiptc.h

diff --git a/src/libiptc/libxtc.h b/src/owniptc/libxtc.h
similarity index 100%
rename from src/libiptc/libxtc.h
rename to src/owniptc/libxtc.h

diff --git a/src/libiptc/linux_list.h b/src/owniptc/linux_list.h
similarity index 100%
rename from src/libiptc/linux_list.h
rename to src/owniptc/linux_list.h

diff --git a/src/libiptc/xtables.h b/src/owniptc/xtables.h
similarity index 100%
rename from src/libiptc/xtables.h
rename to src/owniptc/xtables.h