11 files changed, 10 insertions, 12 deletions
diff --git a/gmod/configure.ac b/gmod/configure.ac
index c26ca055be4..a73fb315445 100644
--- a/gmod/configure.ac
+++ b/gmod/configure.ac
@@ -1,7 +1,7 @@
 AC_INIT(gmod, 1.0)
+LT_INIT
 AM_INIT_AUTOMAKE
 
-AC_PROG_LIBTOOL
 AM_PROG_AS
 AC_PROG_CC
 AM_PROG_CC_C_O
diff --git a/sample-plugin/configure.ac b/sample-plugin/configure.ac
index 0007d0c0371..7defc83d033 100644
--- a/sample-plugin/configure.ac
+++ b/sample-plugin/configure.ac
@@ -1,7 +1,7 @@
 AC_INIT(sample_plugin, 1.0)
+LT_INIT
 AM_INIT_AUTOMAKE
 
-AC_PROG_LIBTOOL
 AM_PROG_AS
 AC_PROG_CC
 AM_PROG_CC_C_O
diff --git a/svm/configure.ac b/svm/configure.ac
index 530bb2fd3b6..8db5821420c 100644
--- a/svm/configure.ac
+++ b/svm/configure.ac
@@ -1,10 +1,10 @@
 AC_INIT(svm, 1.0)
+LT_INIT
 AM_INIT_AUTOMAKE
 
 AM_SILENT_RULES
 
 AM_PROG_AS
-AC_PROG_CC
-AC_PROG_LIBTOOL
+AC_PROG_CC_C_O
 
 AC_OUTPUT([Makefile])
diff --git a/vlib-api/configure.ac b/vlib-api/configure.ac
index 44d6ff1bf25..b5f3157a876 100644
--- a/vlib-api/configure.ac
+++ b/vlib-api/configure.ac
@@ -1,10 +1,10 @@
 AC_INIT(vlibapi, 1.0)
+LT_INIT
 AM_INIT_AUTOMAKE
 
 AM_SILENT_RULES
 
 AC_PROG_CC
 AM_PROG_CC_C_O
-AC_PROG_LIBTOOL
 
 AC_OUTPUT([Makefile])
diff --git a/vlib/configure.ac b/vlib/configure.ac
index 4fdcff12aaa..1a45d33ebbb 100644
--- a/vlib/configure.ac
+++ b/vlib/configure.ac
@@ -1,10 +1,10 @@
 AC_INIT(vlib, 1.1)
+LT_INIT
 AM_INIT_AUTOMAKE
 AM_SILENT_RULES
 
 AC_PROG_CC
 AM_PROG_CC_C_O
-AC_PROG_LIBTOOL
 
 AC_ARG_WITH(dpdk,
             AC_HELP_STRING([--with-dpdk],[Use the Intel dpdk]),
diff --git a/vnet/configure.ac b/vnet/configure.ac
index cc55dc3b4c1..b46a6787836 100644
--- a/vnet/configure.ac
+++ b/vnet/configure.ac
@@ -1,10 +1,10 @@
 AC_INIT(vnet, 1.1)
+LT_INIT
 AM_INIT_AUTOMAKE
 AM_SILENT_RULES
 
 AC_PROG_CC
 AM_PROG_CC_C_O
-AC_PROG_LIBTOOL
 AM_PROG_AS
 
 AC_ARG_WITH(dpdk,
diff --git a/vnet/vnet/devices/dpdk/vhost_user.c b/vnet/vnet/devices/dpdk/vhost_user.c
index 1500879f1c5..d6ed35facd4 100644
--- a/vnet/vnet/devices/dpdk/vhost_user.c
+++ b/vnet/vnet/devices/dpdk/vhost_user.c
@@ -679,7 +679,7 @@ dpdk_vhost_user_set_vring_kick(u32 hw_if_index, u8 idx, int fd)
 }
 
 #if RTE_VERSION >= RTE_VERSION_NUM(2, 2, 0, 0)
-dpdk_vhost_user_set_vring_enable(u32 hw_if_index, u8 idx, int enable)
+int dpdk_vhost_user_set_vring_enable(u32 hw_if_index, u8 idx, int enable)
 {
   dpdk_device_t * xd;
   struct vhost_virtqueue *vq;
diff --git a/vpp-api-test/configure.ac b/vpp-api-test/configure.ac
index 59345daf885..4d39bd896ef 100644
--- a/vpp-api-test/configure.ac
+++ b/vpp-api-test/configure.ac
@@ -1,7 +1,7 @@
 AC_INIT(vpp-api-test, 1.0)
+LT_INIT
 AM_INIT_AUTOMAKE
 
-AC_PROG_LIBTOOL
 AM_PROG_AS
 AC_PROG_CC
 AM_PROG_CC_C_O
diff --git a/vpp-japi/configure.ac b/vpp-japi/configure.ac
index d9778fe62c6..1607061d326 100644
--- a/vpp-japi/configure.ac
+++ b/vpp-japi/configure.ac
@@ -1,9 +1,9 @@
 AC_INIT(vpp-japi, 1.0.0)
+LT_INIT
 AC_CONFIG_MACRO_DIR([m4])
 AM_INIT_AUTOMAKE
 AM_SILENT_RULES
 
-AC_PROG_LIBTOOL
 AM_PROG_AS
 AC_PROG_CC
 AM_PROG_CC_C_O
diff --git a/vpp/Makefile.am b/vpp/Makefile.am
index 73e01b79c1c..0f2cf83f9b0 100644
--- a/vpp/Makefile.am
+++ b/vpp/Makefile.am
@@ -19,7 +19,6 @@ noinst_PROGRAMS =
 BUILT_SOURCES =
 bin_PROGRAMS = 
 CLEANFILES = 
-lib_LTLIBRARIES =
 
 bin_PROGRAMS += vpp
 
diff --git a/vpp/configure.ac b/vpp/configure.ac
index f2756a305ef..9a2d52e835a 100644
--- a/vpp/configure.ac
+++ b/vpp/configure.ac
@@ -2,7 +2,6 @@ AC_INIT(vpp, 1.1)
 AM_INIT_AUTOMAKE
 AM_SILENT_RULES
 
-AC_PROG_LIBTOOL
 AM_PROG_AS
 AC_PROG_CC
 AM_PROG_CC_C_O