X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=vnet%2Fconfigure.ac;h=6a5281b09866523bdcb081c9bbfb893cd33f9707;hb=696f1adec0df3b8f161862566dd9c86174302658;hp=a570389e3fb311922fca58a48265854d58cd8c95;hpb=cb9cadad578297ffd78fa8a33670bdf1ab669e7e;p=vpp.git

diff --git a/vnet/configure.ac b/vnet/configure.ac
index a570389e3fb..6a5281b0986 100644
--- a/vnet/configure.ac
+++ b/vnet/configure.ac
@@ -1,26 +1,49 @@
 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
-AC_PROG_LIBTOOL
-AM_PROG_AS
 
 AC_ARG_WITH(dpdk,
-            AC_HELP_STRING([--with-dpdk],[Use the Intel dpdk]),
+            AC_HELP_STRING([--with-dpdk],[Use 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(dpdk_crypto,
+            AC_HELP_STRING([--with-dpdk-crypto],[Use DPDK cryptodev]),
+            [with_dpdk_crypto=1],
+            [with_dpdk_crypto=0])
+
+AC_ARG_WITH(ipsec,
+            AC_HELP_STRING([--without-ipsec],[Disable ipsec]),
+            [with_ipsec=0],
+            [with_ipsec=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_CRYPTO, test "$with_dpdk_crypto" = "1")
+AC_SUBST(DPDK_CRYPTO,[-DDPDK_CRYPTO=${with_dpdk_crypto}])
 
 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_IPV6SR, test "$with_ipv6sr" = "1")
+AC_SUBST(IPV6SR,[-DIPV6SR=${with_ipv6sr}])
+
+AM_CONDITIONAL(ENABLE_TESTS, test "$enable_tests" = "1")
 
 AC_OUTPUT([Makefile])