Revision: 520
http://vde.svn.sourceforge.net/vde/?rev=520&view=rev
Author: danielel
Date: 2011-12-15 14:33:27 +0000 (Thu, 15 Dec 2011)
Log Message:
-----------
branched to vde-router from r519
Revision Links:
--------------
http://vde.svn.sourceforge.net/vde/?rev=519&view=rev
Modified Paths:
--------------
branches/vde-router/vde-2/configure.ac
branches/vde-router/vde-2/src/Makefile.am
Added Paths:
-----------
branches/vde-router/
Modified: branches/vde-router/vde-2/configure.ac
===================================================================
--- trunk/vde-2/configure.ac 2011-12-03 11:13:56 UTC (rev 519)
+++ branches/vde-router/vde-2/configure.ac 2011-12-15 14:33:27 UTC (rev
520)
@@ -1,4 +1,4 @@
-# -*- Autoconf -*-
+# -*- Autoconf -*-/
# Process this file with autoconf to produce a configure script.
AC_PREREQ(2.59)
@@ -25,6 +25,9 @@
AC_CHECK_LIB([crypto], [EVP_EncryptInit],
[add_cryptcab_support=yes],
[add_cryptcab_support=no ; warn_cryptcab=yes])
+AC_CHECK_LIB([pthread], [pthread_create],
+ [enable_router=yes],
+ [enable_router=no ; warn_router=yes])
AC_CHECK_LIB([pcap], [pcap_open_dead],
[add_pcap=yes],
[add_pcap=no ; warn_pcap=yes])
@@ -124,6 +127,12 @@
[Disable libcrypto-dependend vde_cryptcab compilation]),
[if test $enableval = "no" ; then add_cryptcab_support=no ; warn_cryptcab=no
; fi])
+# Disable vde_router? (depends on lpthread, maybe unwanted)
+AC_ARG_ENABLE([router],
+ AS_HELP_STRING([--disable-router],
+ [Disable libpthread-dependent vde_router compilation]),
+ [if test $enableval = "no" ; then enable_router=no ; warn_router=no ; fi])
+
# Check of tuntap device
AC_ARG_ENABLE([tuntap],
AS_HELP_STRING([--disable-tuntap], [Disable tuntap compilation]), [:],
@@ -212,6 +221,7 @@
AM_CONDITIONAL(ENABLE_CRYPTCAB, test "$add_cryptcab_support" = yes)
+AM_CONDITIONAL(ENABLE_ROUTER, test "$enable_router" = yes)
AM_CONDITIONAL(ENABLE_PYTHON, test "$enable_python" = yes)
AM_CONDITIONAL(ENABLE_PCAP, test "$add_pcap" = yes)
AM_CONDITIONAL(CAN_MAKE_LIBVDETAP, test "$can_make_libvdetap" = yes)
@@ -244,6 +254,7 @@
[src/vdetaplib/Makefile]
[src/vde_l3/Makefile]
[src/vde_cryptcab/Makefile]
+ [src/vde_router/Makefile]
[src/slirpvde/Makefile]
[src/vde_switch/plugins/Makefile]
)
@@ -260,6 +271,12 @@
AS_ECHO " - VDE CryptCab............ disabled"
fi
+if test x$enable_router = "xyes" ; then
+ AS_ECHO " + VDE Router.............. enabled"
+else
+ AS_ECHO " - VDE Router.............. disabled"
+fi
+
if test x$enable_python = "xyes" ; then
AS_ECHO " + Python Libraries........ enabled"
else
@@ -307,6 +324,14 @@
fi
fi
+if ! test x$enable_router = "xyes" ; then
+ if test x$warn_router = "xyes" ; then
+ AC_MSG_WARN([VDE Router support has been disabled because libpthread is
+not installed on your system.])
+ AS_ECHO
+ fi
+fi
+
if ! test x$enable_python = "xyes" ; then
AC_MSG_WARN([Python libraries support has been disabled because python is
not installed on your system, or because it could not be found. Please install
Modified: branches/vde-router/vde-2/src/Makefile.am
===================================================================
--- trunk/vde-2/src/Makefile.am 2011-12-03 11:13:56 UTC (rev 519)
+++ branches/vde-router/vde-2/src/Makefile.am 2011-12-15 14:33:27 UTC (rev
520)
@@ -31,6 +31,10 @@
SUBDIRS += vde_cryptcab
endif
+if ENABLE_ROUTER
+ SUBDIRS += vde_router
+endif
+
if ENABLE_KERNEL_SWITCH
SUBDIRS += kvde_switch
endif
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
10 Tips for Better Server Consolidation
Server virtualization is being driven by many needs.
But none more important than the need to reduce IT complexity
while improving strategic productivity. Learn More!
http://www.accelacomm.com/jaw/sdnl/114/51507609/
_______________________________________________
vde-users mailing list
vde-users@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/vde-users
