--- gvpe/configure.ac	2005/03/18 01:53:05	1.37
+++ gvpe/configure.ac	2005/03/25 16:05:22	1.41
@@ -4,7 +4,7 @@
 AC_INIT
 AC_CONFIG_SRCDIR([src/gvpe.C])
 AC_CANONICAL_TARGET
-AM_INIT_AUTOMAKE(gvpe, 1.8)
+AM_INIT_AUTOMAKE(gvpe, 1.9)
 AC_CONFIG_HEADERS([config.h])
 AM_MAINTAINER_MODE
 
@@ -41,13 +41,11 @@
 
 #endif
 
-// include clocale first because gettext.h might overwrite setlocale
-#if defined(HAVE_CLOCALE) && defined(__cplusplus)
-# include <clocale>
+#if HAVE_CLOCALE
+# define CLOCALE <clocale>
 #else
-# include <locale.h>
+# define CLOCALE <locale.h>
 #endif
-#include "gettext.h"
 ])
 
 dnl Include the macros from the m4/ directory
@@ -81,15 +79,17 @@
 AC_ARG_ENABLE(iftype,
   [AS_HELP_STRING(--enable-iftype=TYPE/SUBTYPE,
      Use kernel/net device interface TYPE/SUBTYPE.
-     Working combinations are:
+     Working combinations are (see doc/gvpe.osdep.5.pod):
         "native/linux"
         "tincd/linux"
+        "tincd/netbsd"
         "tincd/freebsd"
         "tincd/openbsd"
+        "native/darwin"
         "tincd/darwin"
         "native/cygwin";
      Untested combinations are:
-        "tincd/netbsd"
+        "tincd/bsd"
         "tincd/solaris"
         "tincd/mingw"
         "tincd/raw_socket"
@@ -120,7 +120,7 @@
        AC_DEFINE(HAVE_FREEBSD, 1, [FreeBSD])
      ;;
      *darwin*)
-       IFTYPE=tincd
+       IFTYPE=native
        IFSUBTYPE=darwin
        AC_DEFINE(HAVE_DARWIN, 1, [Darwin (MacOS/X)])
      ;;