--- configure.orig	2011-11-23 16:42:05 UTC
+++ configure
@@ -5318,7 +5318,7 @@ else
     lt_cv_sys_max_cmd_len=8192;
     ;;
 
-  netbsd* | freebsd* | openbsd* | darwin* | dragonfly*)
+  netbsd* | bsdsunix* | freebsd* | openbsd* | darwin* | dragonfly*)
     # This has been around since 386BSD, at least.  Likely further.
     if test -x /sbin/sysctl; then
       lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
@@ -5753,6 +5753,20 @@ darwin* | rhapsody*)
   lt_cv_deplibs_check_method=pass_all
   ;;
 
+bsdsunix*)
+  if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
+    case $host_cpu in
+    i*86 )
+      lt_cv_deplibs_check_method='file_magic (BSDSUniX)/i[3-9]86 (compact )?demand paged shared library'
+      lt_cv_file_magic_cmd=/usr/bin/file
+      lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
+      ;;
+    esac
+  else
+    lt_cv_deplibs_check_method=pass_all
+  fi
+  ;;
+
 freebsd* | dragonfly*)
   if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
     case $host_cpu in
@@ -9911,7 +9925,7 @@ fi
       ;;
 
     # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
-    freebsd* | dragonfly*)
+    bsdsunix* | freebsd* | dragonfly*)
       archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
       hardcode_libdir_flag_spec='-R$libdir'
       hardcode_direct=yes
@@ -10875,6 +10889,22 @@ dgux*)
   shlibpath_var=LD_LIBRARY_PATH
   ;;
 
+bsdsunix*)
+  if test -x /usr/bin/objformat; then
+    objformat=`/usr/bin/objformat`
+  else
+    objformat=elf
+  fi
+  version_type=bsdsunix-$objformat
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  need_version=no
+  need_lib_prefix=no
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  hardcode_into_libs=yes
+  ;;
+
 freebsd* | dragonfly*)
   # DragonFly does not have aout.  When/if they implement a new
   # versioning mechanism, adjust this.
@@ -12859,11 +12889,11 @@ fi
         ld_shlibs_CXX=no
         ;;
 
-      freebsd-elf*)
+      bsdsunix-elf* | freebsd-elf*)
         archive_cmds_need_lc_CXX=no
         ;;
 
-      freebsd* | dragonfly*)
+      bsdsunix* | freebsd* | dragonfly*)
         # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
         # conventions
         ld_shlibs_CXX=yes
@@ -13850,7 +13880,7 @@ lt_prog_compiler_static_CXX=
 	    ;;
 	esac
 	;;
-      freebsd* | dragonfly*)
+      bsdsunix* | freebsd* | dragonfly*)
 	# FreeBSD uses GNU C++
 	;;
       hpux9* | hpux10* | hpux11*)
@@ -14721,6 +14751,22 @@ dgux*)
   shlibpath_var=LD_LIBRARY_PATH
   ;;
 
+bsdsunix*)
+  if test -x /usr/bin/objformat; then
+    objformat=`/usr/bin/objformat`
+  else
+    objformat=elf 
+  fi
+  version_type=bsdsunix-$objformat
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  need_version=no
+  need_lib_prefix=no
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  hardcode_into_libs=yes
+  ;;
+
 freebsd* | dragonfly*)
   # DragonFly does not have aout.  When/if they implement a new
   # versioning mechanism, adjust this.
@@ -17050,6 +17096,11 @@ $as_echo "#define VDE_DARWIN 1" >>confde
 
     darwin_gcc=yes
   ;;
+  bsdsunix*)
+
+$as_echo "#define VDE_BSDSUNIX 1" >>confdefs.h
+
+  ;;
   freebsd*)
 
 $as_echo "#define VDE_FREEBSD 1" >>confdefs.h
@@ -17141,7 +17192,7 @@ $as_echo "$as_me: WARNING: You do not ha
 http://tuntaposx.sourceforge.net/" >&2;}
       fi
       ;;
-    freebsd*)
+    bsdsunix* | freebsd*)
       ac_fn_c_check_header_mongrel "$LINENO" "net/if_tun.h" "ac_cv_header_net_if_tun_h" "$ac_includes_default"
 if test "x$ac_cv_header_net_if_tun_h" = xyes; then :
 
@@ -17583,7 +17634,7 @@ fi
 
 
 
-CFLAGS="-Wall -O2 $CFLAGS"
+CFLAGS="-Wall  $CFLAGS"
 
 
 ac_config_files="$ac_config_files Makefile doc/Makefile include/Makefile man/Makefile src/Makefile src/lib/Makefile src/lib/vdesnmp.pc src/lib/vdemgmt.pc src/lib/vdeplug.pc src/lib/vdehist.pc src/lib/python/Makefile src/vde_switch/Makefile src/kvde_switch/Makefile src/vde_over_ns/Makefile src/common/Makefile src/vdetaplib/Makefile src/vde_l3/Makefile src/vde_cryptcab/Makefile src/slirpvde/Makefile src/vde_switch/plugins/Makefile"