use new libnftnl library name

Adapt the current code to use the new library name libnftnl.

Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>

diff --git a/INSTALL b/INSTALL
index 0672b1d10d6e8eab1c15c38d456457ef93d10d09..ba6f7a38a0f49c04227f4233b0ccf8b53213b06e 100644 (file)
--- a/INSTALL
+++ b/INSTALL
@@ -8,7 +8,7 @@ Installation instructions for nftables
 
   - libmnl: git://git.netfilter.org/libmnl.git
 
-  - libnftables: git://git.netfilter.org/libnftables.git
+  - libnftnl: git://git.netfilter.org/libnftnl.git
 
   - flex
 

diff --git a/configure.ac b/configure.ac
index ca14d835e4c3e71fc6f11f64bfd360ee7f761d8f..d0a8595a358d950a59a03f317a82d3e950c3c5e6 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -54,7 +54,7 @@ AC_CHECK_LIB([mnl], [mnl_socket_open], ,
             AC_MSG_ERROR([No suitable version of libmnl found]))
 
 AC_CHECK_LIB([nftables], [nft_rule_alloc], ,
-            AC_MSG_ERROR([No suitable version of libnftables found]))
+            AC_MSG_ERROR([No suitable version of libnftnl found]))
 
 AC_CHECK_LIB([gmp], [__gmpz_init], ,
             AC_MSG_ERROR([No suitable version of libgmp found]))

diff --git a/include/netlink.h b/include/netlink.h
index 85e84343b690549a8a6b18371df75565907006b0..fbaaaeba9c8af6892b029ddee89d13e1c544d18f 100644 (file)
--- a/include/netlink.h
+++ b/include/netlink.h
@@ -1,11 +1,11 @@
 #ifndef NFTABLES_NETLINK_H
 #define NFTABLES_NETLINK_H
 
-#include <libnftables/table.h>
-#include <libnftables/chain.h>
-#include <libnftables/rule.h>
-#include <libnftables/expr.h>
-#include <libnftables/set.h>
+#include <libnftnl/table.h>
+#include <libnftnl/chain.h>
+#include <libnftnl/rule.h>
+#include <libnftnl/expr.h>
+#include <libnftnl/set.h>
 
 #include <linux/netlink.h>
 #include <linux/netfilter/nf_tables.h>

diff --git a/src/mnl.c b/src/mnl.c
index d457e319af7138744e47124988265c037e422b71..b867902274f0d9d5db31aa3068ab3aeb6da9f942 100644 (file)
--- a/src/mnl.c
+++ b/src/mnl.c
@@ -9,11 +9,11 @@
  */
 
 #include <libmnl/libmnl.h>
-#include <libnftables/table.h>
-#include <libnftables/chain.h>
-#include <libnftables/rule.h>
-#include <libnftables/expr.h>
-#include <libnftables/set.h>
+#include <libnftnl/table.h>
+#include <libnftnl/chain.h>
+#include <libnftnl/rule.h>
+#include <libnftnl/expr.h>
+#include <libnftnl/set.h>
 
 #include <linux/netfilter/nfnetlink.h>
 #include <linux/netfilter/nf_tables.h>

diff --git a/src/netlink.c b/src/netlink.c
index b776b3cc5be38726589f9de4c3daf6ad75ec8022..7f69995d8805b6f8683a60cb7c9ba87362e9c8ba 100644 (file)
--- a/src/netlink.c
+++ b/src/netlink.c
@@ -14,10 +14,10 @@
 #include <errno.h>
 #include <libmnl/libmnl.h>
 
-#include <libnftables/table.h>
-#include <libnftables/chain.h>
-#include <libnftables/expr.h>
-#include <libnftables/set.h>
+#include <libnftnl/table.h>
+#include <libnftnl/chain.h>
+#include <libnftnl/expr.h>
+#include <libnftnl/set.h>
 #include <linux/netfilter/nf_tables.h>
 
 #include <nftables.h>