--- gvpe/configure.ac	2004/05/30 17:36:00	1.29
+++ gvpe/configure.ac	2005/03/23 17:03:58	1.39
@@ -2,9 +2,9 @@
 
 AC_PREREQ(2.59)
 AC_INIT
-AC_CONFIG_SRCDIR([src/vped.C])
+AC_CONFIG_SRCDIR([src/gvpe.C])
 AC_CANONICAL_TARGET
-AM_INIT_AUTOMAKE(vpe, 1.7)
+AM_INIT_AUTOMAKE(gvpe, 1.9)
 AC_CONFIG_HEADERS([config.h])
 AM_MAINTAINER_MODE
 
@@ -19,22 +19,33 @@
 ])
 
 AH_BOTTOM([
+typedef unsigned char u8;
+typedef signed char s8;
+
 #if __CYGWIN__
 
-typedef unsigned char u8;
 typedef unsigned short u16;
 typedef unsigned int u32;
+typedef signed short s16;
+typedef signed int s32;
 
 #else
 #include <inttypes.h>
 
 /* old modula-2 habits */
-typedef unsigned char u8;
 typedef uint16_t u16;
 typedef uint32_t u32;
+typedef int16_t s16;
+typedef int32_t s32;
 #endif
 
 #endif
+
+#if HAVE_CLOCALE
+# define CLOCALE <clocale>
+#else
+# define CLOCALE <locale.h>
+#endif
 ])
 
 dnl Include the macros from the m4/ directory
@@ -76,9 +87,12 @@
         "tincd/darwin"
         "native/cygwin";
      Untested combinations are:
+        "native/darwin"
         "tincd/netbsd"
         "tincd/solaris"
-        "tincd/mingw";
+        "tincd/mingw"
+        "tincd/raw_socket"
+        "tincd/uml_socket";
      Broken combinations are:
         "tincd/cygwin";
      The default is to autodetect.
@@ -105,7 +119,7 @@
        AC_DEFINE(HAVE_FREEBSD, 1, [FreeBSD])
      ;;
      *darwin*)
-       IFTYPE=tincd
+       IFTYPE=native
        IFSUBTYPE=darwin
        AC_DEFINE(HAVE_DARWIN, 1, [Darwin (MacOS/X)])
      ;;
@@ -145,7 +159,7 @@
 dnl Checks for libraries.
 
 AC_LANG(C++)
-AC_CHECK_HEADERS(ext/hash_map)
+AC_CHECK_HEADERS(ext/hash_map clocale)
 
 dnl Checks for header files.
 AC_CHECK_HEADERS([fcntl.h inttypes.h limits.h malloc.h stdint.h strings.h syslog.h unistd.h \
@@ -228,6 +242,12 @@
 fi
 dnl tinc_ZLIB
 
+AC_ARG_ENABLE(static-daemon,
+  [AS_HELP_STRING(--enable-static-daemon,enable statically linked daemon.)],
+  [LDFLAGS_DAEMON=-static]
+)
+AC_SUBST(LDFLAGS_DAEMON)
+
 AC_ARG_ENABLE(rohc,
   [AS_HELP_STRING(--enable-rohc,enable robust header compression (rfc3095).)],
   [
@@ -257,7 +277,12 @@
 
 AC_ARG_ENABLE(dns,
   [AS_HELP_STRING(--enable-dns,enable dns tunnel protocol support (DOES NOT WORK).)],
-  AC_DEFINE_UNQUOTED(ENABLE_DNS, 1, [DNS tunnel protocol support.])
+  [
+    AC_CHECK_HEADER(gmp.h,,[AC_MSG_ERROR([gmp.h not found, required for --enable-dns])])
+    AC_CHECK_LIB(gmp,main,,[AC_MSG_ERROR([libgmp not found, required for --enable-dns])])
+
+    AC_DEFINE_UNQUOTED(ENABLE_DNS, 1, [DNS tunnel protocol support.])
+  ]
 )
 
 AC_ARG_ENABLE(http-proxy,
@@ -265,21 +290,23 @@
   AC_DEFINE_UNQUOTED(ENABLE_HTTP_PROXY, 1, [http proxy connect support.])
 )
 
-HMAC=12    dnl see also the AS_HELP_STRING()
+HMAC=12
 AC_ARG_ENABLE(hmac-length,
-  [AS_HELP_STRING(--enable-hmac-length=BYTES,use a hmac of length BYTES bytes (default 12). Allowed values are 4, 8, 12, 16.)],
+  [AS_HELP_STRING(--enable-hmac-length=BYTES,[
+      use a hmac of length BYTES bytes (default 12). Allowed values are 4, 8, 12, 16.])],
   HMAC=$enableval
 )
 AC_DEFINE_UNQUOTED(HMACLENGTH, $HMAC, [Size of HMAC in each packet in bytes.])
 
-RAND=8   dnl see also the AS_HELP_STRING()
+RAND=8
 AC_ARG_ENABLE(rand-length,
-  [AS_HELP_STRING(--enable-rand-length=BYTES,use BYTES bytes of extra randomness (default 8). Allowed values are 0, 4, 8.)],
+  [AS_HELP_STRING(--enable-rand-length=BYTES,
+      [use BYTES bytes of extra randomness (default 8). Allowed values are 0, 4, 8.])],
   RAND=$enableval
 )
 AC_DEFINE_UNQUOTED(RAND_SIZE, $RAND, [Add this many bytes of randomness to each packet.])
 
-MTU=1500   dnl see also the AS_HELP_STRING()
+MTU=1500
 AC_ARG_ENABLE(mtu,
   [AS_HELP_STRING(--enable-max-mtu=BYTES,enable mtu sizes upto BYTES bytes (default 1500). Use 9100 for jumbogram support.)],
   MTU=$enableval
@@ -297,9 +324,9 @@
 
 CIPHER=bf_cbc
 AC_ARG_ENABLE(cipher,
-  [AS_HELP_STRING(--enable-cipher,
-     Select the symmetric cipher (default "bf"). Must be one of
-     "bf" (blowfish), "aes-128" (rijndael), "aes-192" or "aes-256".)],
+  [AS_HELP_STRING(--enable-cipher,[
+      Select the symmetric cipher (default "bf").
+      Must be one of "bf" (blowfish), "aes-128" (rijndael), "aes-192" or "aes-256".])],
   if test "x$enableval" = xbf     ; then CIPHER=bf_cbc     ; fi
   if test "x$enableval" = xaes-128; then CIPHER=aes_128_cbc; fi
   if test "x$enableval" = xaes-192; then CIPHER=aes_192_cbc; fi
@@ -309,9 +336,9 @@
 
 DIGEST=sha1
 AC_ARG_ENABLE(digest,
-  [AS_HELP_STRING(--enable-digest,
-     Select the digets algorithm to use (default "sha1"). Must be one of
-     "sha1", "ripemd160", "md5" or "md4" (insecure).)],
+  [AS_HELP_STRING(--enable-digest,[
+      Select the digets algorithm to use (default "sha1"). Must be one of
+      "sha1", "ripemd160", "md5" or "md4" (insecure).])],
   if test "x$enableval" = xsha1     ; then DIGEST=sha1     ; fi
   if test "x$enableval" = xripemd160; then DIGEST=ripemd160; fi
   if test "x$enableval" = xmd5      ; then DIGEST=md5      ; fi
@@ -374,7 +401,6 @@
 
 AC_CONFIG_FILES([Makefile po/Makefile.in
 src/Makefile
-src/rohc/Makefile
 doc/Makefile
 lib/Makefile
 m4/Makefile