X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=vnet%2Fconfigure.ac;h=439e5c680ad3ddc84e3a5db218f633e9dacb08ee;hb=b93222f7e49560917a3744e2b01d6ef14fa5174d;hp=b46a67878366f99dc6f6138c721ad0cdcf363157;hpb=2126b35f5f1aef32415c82dffd5ec78571c2b968;p=vpp.git

diff --git a/vnet/configure.ac b/vnet/configure.ac
index b46a6787836..439e5c680ad 100644
--- a/vnet/configure.ac
+++ b/vnet/configure.ac
@@ -1,7 +1,9 @@
 AC_INIT(vnet, 1.1)
+AC_CONFIG_AUX_DIR(config)
+AC_CONFIG_HEADERS(config/config.h)
 LT_INIT
 AM_INIT_AUTOMAKE
-AM_SILENT_RULES
+AM_SILENT_RULES([yes])
 
 AC_PROG_CC
 AM_PROG_CC_C_O
@@ -12,39 +14,30 @@ AC_ARG_WITH(dpdk,
             [with_dpdk=1],
             [with_dpdk=0])
 
-AC_ARG_WITH(virl,
-            AC_HELP_STRING([--with-virl],[Compile for virl citizenship]),
-            [with_virl=1],
-            [with_virl=0])
-
 AC_ARG_WITH(ipsec,
             AC_HELP_STRING([--without-ipsec],[Disable ipsec]),
             [with_ipsec=0],
             [with_ipsec=1])
 
-AC_ARG_WITH(vcgn,
-            AC_HELP_STRING([--without-vcgn],[Disable vcgn]),
-            [with_vcgn=0],
-            [with_vcgn=1])
-
 AC_ARG_WITH(ipv6sr,
             AC_HELP_STRING([--without-ipv6sr],[Disable ipv6sr]),
             [with_ipv6sr=0],
             [with_ipv6sr=1])
 
+AC_ARG_ENABLE(tests,
+              AC_HELP_STRING([--enable-tests], [Build unit tests]),
+              [enable_tests=1],
+              [enable_tests=0])
+
 AM_CONDITIONAL(WITH_DPDK, test "$with_dpdk" = "1")
 AC_SUBST(DPDK,[-DDPDK=${with_dpdk}])
 
-AM_CONDITIONAL(WITH_VIRL, test "$with_virl" = "1")
-AC_SUBST(VIRL,[-DVIRL=${with_virl}])
-
 AM_CONDITIONAL(WITH_IPSEC, test "$with_ipsec" = "1")
 AC_SUBST(IPSEC,[-DIPSEC=${with_ipsec}])
 
-AM_CONDITIONAL(WITH_VCGN, test "$with_vcgn" = "1")
-AC_SUBST(VCGN,[-DVCGN=${with_vcgn}])
-
 AM_CONDITIONAL(WITH_IPV6SR, test "$with_ipv6sr" = "1")
 AC_SUBST(IPV6SR,[-DIPV6SR=${with_ipv6sr}])
 
+AM_CONDITIONAL(ENABLE_TESTS, test "$enable_tests" = "1")
+
 AC_OUTPUT([Makefile])