Revision: 470
          http://vde.svn.sourceforge.net/vde/?rev=470&view=rev
Author:   fgiunchedi
Date:     2011-01-29 13:58:08 +0000 (Sat, 29 Jan 2011)

Log Message:
-----------
tab/space reformat

Modified Paths:
--------------
    trunk/vde-2/configure.ac

Modified: trunk/vde-2/configure.ac
===================================================================
--- trunk/vde-2/configure.ac    2011-01-29 13:41:17 UTC (rev 469)
+++ trunk/vde-2/configure.ac    2011-01-29 13:58:08 UTC (rev 470)
@@ -23,22 +23,24 @@
 # Checks for libraries.
 AC_CHECK_LIB([dl], [dlopen])
 AC_CHECK_LIB([crypto], [EVP_EncryptInit],
-               [add_cryptcab_support=yes],
-               [add_cryptcab_support=no ; warn_cryptcab=yes])
+  [add_cryptcab_support=yes],
+  [add_cryptcab_support=no ; warn_cryptcab=yes])
 AC_CHECK_LIB([pcap], [pcap_open_dead],
-               [add_pcap=yes],
-               [add_pcap=no ; warn_pcap=yes])
+  [add_pcap=yes],
+  [add_pcap=no ; warn_pcap=yes])
 
 # Checks for header files.
 AC_HEADER_STDC
 AC_HEADER_SYS_WAIT
-AC_CHECK_HEADERS([arpa/inet.h fcntl.h netdb.h netinet/in.h stddef.h stdint.h 
stdlib.h string.h strings.h sys/ioctl.h sys/param.h sys/socket.h sys/time.h 
syslog.h termio.h termios.h unistd.h sys/filio.h sys/bitypes.h sys/wait.h 
sys/select.h sys/signal.h sys/stropts.h termios.h sys/type32.h])
+AC_CHECK_HEADERS([arpa/inet.h fcntl.h netdb.h netinet/in.h stddef.h stdint.h \
+  stdlib.h string.h strings.h sys/ioctl.h sys/param.h sys/socket.h \
+  sys/time.h syslog.h termio.h termios.h unistd.h sys/filio.h sys/bitypes.h \
+  sys/wait.h sys/select.h sys/signal.h sys/stropts.h termios.h sys/type32.h])
 
 AC_CHECK_HEADERS([syslimits.h sys/syslimits.h])
 
-AC_CHECK_HEADERS([openssl/blowfish.h],
-                 [],
-                 [add_cryptcab_support=no ; warn_cryptcab=yes])
+AC_CHECK_HEADERS([openssl/blowfish.h], [],
+  [add_cryptcab_support=no ; warn_cryptcab=yes])
 
 # Checks for typedefs, structures, and compiler characteristics.
 AC_C_CONST
@@ -59,21 +61,25 @@
 AC_FUNC_REALLOC
 AC_FUNC_SELECT_ARGTYPES
 AC_FUNC_VPRINTF
-AC_CHECK_FUNCS([atexit dup2 gethostbyname gethostname gettimeofday inet_ntoa 
memmove memset putenv select setenv socket strchr strdup strerror strstr uname 
inet_aton sprintf readv random srandom index bcmp drand48 memmove gethostid 
revoke fchmod getopt_long_only funopen])
+AC_CHECK_FUNCS([atexit dup2 gethostbyname gethostname gettimeofday inet_ntoa \
+  memmove memset putenv select setenv socket strchr strdup strerror strstr \
+  uname inet_aton sprintf readv random srandom index bcmp drand48 memmove \
+  gethostid revoke fchmod getopt_long_only funopen])
 AC_REPLACE_FUNCS([open_memstream strndup])
 AC_CHECK_FUNC([poll],
-       [
-               AC_MSG_CHECKING([for poll sanity])
-               if expr "$build_os" : "darwin*" > /dev/null; then
-                       AC_MSG_RESULT([present but broken, emulating with 
select])
-                       AC_LIBOBJ([poll])
-                       AC_DEFINE([poll], [vde_poll], [Define to vde_poll if 
the replacement function should be used.])
-               else
-                       AC_DEFINE([HAVE_POLL], 1, [Define to 1 if your system 
has a working poll() function.])
-                       AC_MSG_RESULT([yes])
-               fi
-       ],
-       [])
+  [
+    AC_MSG_CHECKING([for poll sanity])
+    if expr "$build_os" : "darwin*" > /dev/null; then
+      AC_MSG_RESULT([present but broken, emulating with select])
+      AC_LIBOBJ([poll])
+      AC_DEFINE([poll], [vde_poll],
+                [Define to vde_poll if the replacement function should be 
used.])
+    else
+      AC_DEFINE([HAVE_POLL], 1, [Define to 1 if your system has a working 
poll() function.])
+      AC_MSG_RESULT([yes])
+    fi
+  ],
+  [])
 
 # All other nice checks I have to make for recostructing missing parts of
 # slirp's config.h file
@@ -84,126 +90,124 @@
 
 # Define VDE_LINUX or VDE_DARWIN
 case "$build_os" in
-       linux*)
-               AC_DEFINE([VDE_LINUX], 1, [If defined, this is a Linux system])
-               ;;
-       darwin*)
-               AC_DEFINE([VDE_DARWIN], 1, [If defined, this is a Darwin 
system])
-               darwin_gcc=yes
-               ;;
-       freebsd*)
-               AC_DEFINE([VDE_FREEBSD], 1, [If defined, this is a FreeBSD 
system])
-               ;;
-       *)
-               AC_MSG_ERROR([Unsupported architecture: $build_os. At the 
moment, only
-Linux, Darwin and FreeBSD are supported. Contributions are appreciated! :-)])
-               ;;
+  linux*)
+    AC_DEFINE([VDE_LINUX], 1, [If defined, this is a Linux system])
+  ;;
+  darwin*)
+    AC_DEFINE([VDE_DARWIN], 1, [If defined, this is a Darwin system])
+    darwin_gcc=yes
+  ;;
+  freebsd*)
+    AC_DEFINE([VDE_FREEBSD], 1, [If defined, this is a FreeBSD system])
+  ;;
+  *)
+    AC_MSG_ERROR([Unsupported OS: $build_os. At the moment, only Linux, Darwin
+and FreeBSD are supported. Contributions are appreciated! :-)])
+  ;;
 esac
 
 # Enable profiling options
 AC_ARG_ENABLE([profile],
-       AS_HELP_STRING([--enable-profile],
-               [Compile with debugging/profiling options]),
-       [if test $enableval = "yes"; then enable_profile=yes; fi])
+  AS_HELP_STRING([--enable-profile],
+    [Compile with debugging/profiling options]),
+  [if test $enableval = "yes"; then enable_profile=yes; fi])
 
 # Enable experimental features
 AC_ARG_ENABLE([experimental],
-       AS_HELP_STRING([--enable-experimental],
-               [Enable experimental features (async notifies, plugin support, 
packet counter)]),
-       [if test $enableval = "yes"; then enable_experimental=yes; fi])
+  AS_HELP_STRING([--enable-experimental],
+    [Enable experimental features (async notifies, plugin support, packet 
counter)]),
+  [if test $enableval = "yes"; then enable_experimental=yes; fi])
 
 # Disable vde_cryptcab? (depends on ssl, maybe unwanted)
 AC_ARG_ENABLE([cryptcab],
-       AS_HELP_STRING([--disable-cryptcab],
-               [Disable libcrypto-dependend vde_cryptcab compilation]),
-       [if test $enableval = "no" ; then add_cryptcab_support=no ; 
warn_cryptcab=no ; fi])
+  AS_HELP_STRING([--disable-cryptcab],
+    [Disable libcrypto-dependend vde_cryptcab compilation]),
+  [if test $enableval = "no" ; then add_cryptcab_support=no ; warn_cryptcab=no 
; fi])
 
 # Check of tuntap device
 AC_ARG_ENABLE([tuntap],
-    AS_HELP_STRING([--disable-tuntap],
-      [Disable tuntap compilation]), [:],
-       [case "$build_os" in
-               linux*)
-                       AC_CHECK_HEADER([linux/if_tun.h],
-                               [AC_DEFINE([HAVE_TUNTAP], 1, [If defined, 
tuntap support is compiled in])],
-                               [warn_tuntap=yes])
-                       can_make_libvdetap=yes
-                       can_make_vdetunctl=yes
-                       ;;
-               darwin*)
-                       # I don't use AC_CHECK_FILES because I need test -e and 
not test -r
-                       for i in /dev/tap0 /Library/Extensions/tap.kext ; do
-                               AC_MSG_CHECKING([for $i])
-                               if test -e "$i" ; then
-                                       AC_MSG_RESULT([yes])
-                                       definename="`echo "$i" | tr "a-z*" 
"A-ZP" | tr -c "0-9A-Z" "_"`"
-                                       AC_DEFINE_UNQUOTED([HAVE_$definename])
-                                       eval HAVE_$definename=yes
-                               else
-                                       AC_MSG_RESULT([no])
-                                       warn_tuntap=yes
-                               fi
-                       done
-                       
-                       if test "$HAVE__DEV_TAP0_" ; then
-                               AC_DEFINE([HAVE_TUNTAP], 1, [If defined, tuntap 
support is compiled in])
-                               if ! test "$HAVE__LIBRARY_EXTENSIONS_TAP_KEXT_" 
-o "$HAVE__SYSTEM_LIBRARY_EXTENSIONS_TAP_KEXT_" ; then
-                                       AC_MSG_WARN([/dev/tap0 exists, but the 
kext cannot be found. Let's hope your
+  AS_HELP_STRING([--disable-tuntap], [Disable tuntap compilation]), [:],
+  [case "$build_os" in
+    linux*)
+      AC_CHECK_HEADER([linux/if_tun.h],
+        [AC_DEFINE([HAVE_TUNTAP], 1, [If defined, tuntap support is compiled 
in])],
+        [warn_tuntap=yes])
+      can_make_libvdetap=yes
+      can_make_vdetunctl=yes
+      ;;
+    darwin*)
+      # I don't use AC_CHECK_FILES because I need test -e and not test -r
+      for i in /dev/tap0 /Library/Extensions/tap.kext ; do
+        AC_MSG_CHECKING([for $i])
+        if test -e "$i" ; then
+          AC_MSG_RESULT([yes])
+          definename="`echo "$i" | tr "a-z*" "A-ZP" | tr -c "0-9A-Z" "_"`"
+          AC_DEFINE_UNQUOTED([HAVE_$definename])
+          eval HAVE_$definename=yes
+        else
+          AC_MSG_RESULT([no])
+          warn_tuntap=yes
+        fi
+      done
+
+      if test "$HAVE__DEV_TAP0_" ; then
+        AC_DEFINE([HAVE_TUNTAP], 1, [If defined, tuntap support is compiled 
in])
+        if ! test "$HAVE__LIBRARY_EXTENSIONS_TAP_KEXT_" || 
"$HAVE__SYSTEM_LIBRARY_EXTENSIONS_TAP_KEXT_" ; then
+          AC_MSG_WARN([/dev/tap0 exists, but the kext cannot be found. Let's 
hope your
 configuration does work...])
-                               fi
-                       else
-                               warn_tuntap=yes
-                               AC_MSG_WARN([You do not have tuntap support. 
You can get it here:
+        fi
+      else
+        warn_tuntap=yes
+        AC_MSG_WARN([You do not have tuntap support. You can get it here:
 http://tuntaposx.sourceforge.net/])
-                       fi
-                       ;;
-               freebsd*)
-                       AC_CHECK_HEADER([net/if_tun.h],
-                               [AC_DEFINE([HAVE_TUNTAP], 1, [If defined, 
tuntap support is compiled in])],
-                               [warn_tuntap=yes])
-                       ;;
-       esac])
+      fi
+      ;;
+    freebsd*)
+      AC_CHECK_HEADER([net/if_tun.h],
+        [AC_DEFINE([HAVE_TUNTAP], 1, [If defined, tuntap support is compiled 
in])],
+        [warn_tuntap=yes])
+      ;;
+  esac])
 
 # Disable pcap support (pdump)? (depends on libpcap, maybe unwanted)
 AC_ARG_ENABLE([pcap],
-       AS_HELP_STRING([--disable-pcap],
-               [Disable pcap support (pdump plugin)]),
-       [if test $enableval = "no" ; then add_pcap=no ; warn_pcap=no ; fi])
+  AS_HELP_STRING([--disable-pcap],
+    [Disable pcap support (pdump plugin)]),
+  [if test $enableval = "no" ; then add_pcap=no ; warn_pcap=no ; fi])
 
 AC_ARG_ENABLE([kernel-switch],
-       AS_HELP_STRING([--enable-kernel-switch],
-               [Compile support for in-kernel switch. ]),
-       [if test $enableval = "yes"; then
-               enable_kernel_switch=yes
-               AC_DEFINE([USE_IPN], 1, [If defined, enable support for IPN 
socket])
-       fi])
+  AS_HELP_STRING([--enable-kernel-switch],
+    [Compile support for in-kernel switch. ]),
+  [if test $enableval = "yes"; then
+    enable_kernel_switch=yes
+    AC_DEFINE([USE_IPN], 1, [If defined, enable support for IPN socket])
+  fi])
 
 # python bindings
 AC_ARG_ENABLE([python],
-    AS_HELP_STRING([--disable-python],
-                   [Disable python bindings]),
-    [enable_python=$enableval],
-    [enable_python=yes]
+  AS_HELP_STRING([--disable-python], [Disable python bindings]),
+  [enable_python=$enableval],
+  [enable_python=yes]
 )
 
 if test x"$enable_python" = x"yes"; then
-    # check python
-    AM_PATH_PYTHON([2.5])
-    AC_PATH_PROG(PYTHON_CONFIG, python$PYTHON_VERSION-config)
-    if test x"$PYTHON_CONFIG" = x""; then
-        AC_PATH_PROG(PYTHON_CONFIG, python-config)
-    fi
-    if test x"$PYTHON_CONFIG" = x""; then
-        # not found, give up
-        enable_python=no
-    else
-        PYTHON_CFLAGS=`$PYTHON_CONFIG --includes`
-        PYTHON_LIBS=`$PYTHON_CONFIG --libs`
-        PYTHON_INCLUDES="$PYTHON_CFLAGS"
-    fi
-    AC_SUBST(PYTHON_CFLAGS)
-    AC_SUBST(PYTHON_INCLUDES)
-    AC_SUBST(PYTHON_LIBS)
+  # check python
+  AM_PATH_PYTHON([2.5])
+  AC_PATH_PROG(PYTHON_CONFIG, python$PYTHON_VERSION-config)
+  if test x"$PYTHON_CONFIG" = x""; then
+    AC_PATH_PROG(PYTHON_CONFIG, python-config)
+  fi
+  if test x"$PYTHON_CONFIG" = x""; then
+    # not found, give up
+    enable_python=no
+  else
+    PYTHON_CFLAGS=`$PYTHON_CONFIG --includes`
+    PYTHON_LIBS=`$PYTHON_CONFIG --libs`
+    PYTHON_INCLUDES="$PYTHON_CFLAGS"
+  fi
+  AC_SUBST(PYTHON_CFLAGS)
+  AC_SUBST(PYTHON_INCLUDES)
+  AC_SUBST(PYTHON_LIBS)
 fi
 
 
@@ -222,27 +226,27 @@
 AC_SUBST(CFLAGS)
 
 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]
-               )
+  [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]
+)
 AC_OUTPUT
 
 
@@ -251,74 +255,73 @@
 AS_ECHO "Configure results:"
 AS_ECHO
 if test x$add_cryptcab_support = "xyes" ; then
-       AS_ECHO " + VDE CryptCab............ enabled"
+  AS_ECHO " + VDE CryptCab............ enabled"
 else
-       AS_ECHO " - VDE CryptCab............ disabled"
+  AS_ECHO " - VDE CryptCab............ disabled"
 fi
 
 if test x$enable_python = "xyes" ; then
-       AS_ECHO " + Python Libraries........ enabled"
+  AS_ECHO " + Python Libraries........ enabled"
 else
-       AS_ECHO " - Python Libraries........ disabled"
+  AS_ECHO " - Python Libraries........ disabled"
 fi
 
 if test x$warn_tuntap = "xyes" ; then
-       AS_ECHO " - TAP support............. disabled"
+  AS_ECHO " - TAP support............. disabled"
 else
-       AS_ECHO " + TAP support............. enabled"
+  AS_ECHO " + TAP support............. enabled"
 fi
 
 if test x$add_pcap = "xyes" ; then
-       AS_ECHO " + pcap support............ enabled"
+  AS_ECHO " + pcap support............ enabled"
 else
-       AS_ECHO " - pcap support............ disabled"
+  AS_ECHO " - pcap support............ disabled"
 fi
 
 if test x$enable_experimental = "xyes" ; then
-       AS_ECHO " + Experimental features... enabled"
+  AS_ECHO " + Experimental features... enabled"
 else
-       AS_ECHO " - Experimental features... disabled"
+  AS_ECHO " - Experimental features... disabled"
 fi
 
 if test x$enable_profile = "xyes" ; then
-       AS_ECHO " + Profiling options....... enabled"
+  AS_ECHO " + Profiling options....... enabled"
 else
-       AS_ECHO " - Profiling options....... disabled"
+  AS_ECHO " - Profiling options....... disabled"
 fi
 
 if test x$enable_kernel_switch = "xyes" ; then
-       AS_ECHO " + Kernel switch........... enabled"
+  AS_ECHO " + Kernel switch........... enabled"
 else
-       AS_ECHO " - Kernel switch........... disabled"
+  AS_ECHO " - Kernel switch........... disabled"
 fi
 
 AS_ECHO
 AS_ECHO
 if ! test x$add_cryptcab_support = "xyes" ; then
-       if test x$warn_cryptcab = "xyes" ; then
-               AC_MSG_WARN([VDE CryptCab support has been disabled because 
libcrypto is
-not installed on your system, or because openssl/blowfish.h could not be
-found. Please install them if you want CryptCab to be compiled and installed.])
+  if test x$warn_cryptcab = "xyes" ; then
+    AC_MSG_WARN([VDE CryptCab support has been disabled because libcrypto is
+not installed on your system, or because openssl/blowfish.h could not be found.
+Please install them if you want CryptCab to be compiled and installed.])
     AS_ECHO
-       fi
+  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 it if you want Python libraries to be compiled and
-installed.])
+    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
+it if you want Python libraries to be compiled and installed.])
     AS_ECHO
 fi
 
 if ! test x$add_pcap = "xyes" ; then
-       if test x$warn_pcap = "xyes" ; then
+  if test x$warn_pcap = "xyes" ; then
     AC_MSG_WARN([VDE vde_pcapplug and packet dump plugin have been disabled
 because libpcap is not installed on your system, or because it is too old.
 Please install it if you want vde_pcapplug and pdump to be compiled and
 installed.])
     AS_ECHO
-       fi
+  fi
 fi
 
 AS_ECHO


This was sent by the SourceForge.net collaborative development platform, the 
world's largest Open Source development site.

------------------------------------------------------------------------------
Special Offer-- Download ArcSight Logger for FREE (a $49 USD value)!
Finally, a world-class log management solution at an even better price-free!
Download using promo code Free_Logger_4_Dev2Dev. Offer expires 
February 28th, so secure your free ArcSight Logger TODAY! 
http://p.sf.net/sfu/arcsight-sfd2d
_______________________________________________
vde-users mailing list
vde-users@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/vde-users

Reply via email to