--- gvpe/configure.ac	2005/03/01 06:27:20	1.33
+++ gvpe/configure.ac	2005/03/18 01:53:05	1.37
@@ -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(gvpe, 1.7)
+AM_INIT_AUTOMAKE(gvpe, 1.8)
 AC_CONFIG_HEADERS([config.h])
 AM_MAINTAINER_MODE
 
@@ -40,6 +40,14 @@
 #endif
 
 #endif
+
+// include clocale first because gettext.h might overwrite setlocale
+#if defined(HAVE_CLOCALE) && defined(__cplusplus)
+# include <clocale>
+#else
+# include <locale.h>
+#endif
+#include "gettext.h"
 ])
 
 dnl Include the macros from the m4/ directory
@@ -83,7 +91,9 @@
      Untested combinations are:
         "tincd/netbsd"
         "tincd/solaris"
-        "tincd/mingw";
+        "tincd/mingw"
+        "tincd/raw_socket"
+        "tincd/uml_socket";
      Broken combinations are:
         "tincd/cygwin";
      The default is to autodetect.
@@ -150,7 +160,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 \
@@ -268,7 +278,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,