From 2438b95b7f7930902d021aa749308ea8ae5652ca Mon Sep 17 00:00:00 2001 From: Florian Forster Date: Sun, 6 Sep 2009 12:06:12 +0200 Subject: [PATCH] =?utf8?q?src/owniptc:=20Moved=20the=20=E2=80=9Csrc/libipt?= =?utf8?q?c=E2=80=9D=20directory=20to=20=E2=80=9Csrc/owniptc=E2=80=9D=20to?= =?utf8?q?=20avoid=20build=20issues.?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit 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. --- configure.in | 2 +- src/Makefile.am | 6 +++--- src/iptables.c | 2 +- src/{libiptc => owniptc}/Makefile.am | 0 src/{libiptc => owniptc}/README.collectd | 0 src/{libiptc => owniptc}/ipt_kernel_headers.h | 0 src/{libiptc => owniptc}/libip4tc.c | 0 src/{libiptc => owniptc}/libip6tc.c | 0 src/{libiptc => owniptc}/libip6tc.h | 0 src/{libiptc => owniptc}/libiptc.c | 0 src/{libiptc => owniptc}/libiptc.h | 0 src/{libiptc => owniptc}/libxtc.h | 0 src/{libiptc => owniptc}/linux_list.h | 0 src/{libiptc => owniptc}/xtables.h | 0 14 files changed, 5 insertions(+), 5 deletions(-) rename src/{libiptc => owniptc}/Makefile.am (100%) rename src/{libiptc => owniptc}/README.collectd (100%) rename src/{libiptc => owniptc}/ipt_kernel_headers.h (100%) rename src/{libiptc => owniptc}/libip4tc.c (100%) rename src/{libiptc => owniptc}/libip6tc.c (100%) rename src/{libiptc => owniptc}/libip6tc.h (100%) rename src/{libiptc => owniptc}/libiptc.c (100%) rename src/{libiptc => owniptc}/libiptc.h (100%) rename src/{libiptc => owniptc}/libxtc.h (100%) rename src/{libiptc => owniptc}/linux_list.h (100%) rename src/{libiptc => owniptc}/xtables.h (100%) diff --git a/configure.in b/configure.in index 062f8aa5..533e398b 100644 --- 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 39027951..c01998e8 100644 --- 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 12275cd0..9f56d590 100644 --- 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 #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 -- 2.30.2