--- gvpe/configure.ac	2003/10/16 21:57:54	1.19
+++ gvpe/configure.ac	2004/05/10 18:57:07	1.26
@@ -3,7 +3,7 @@
 AC_PREREQ(2.57)
 AC_INIT(src/vped.C)
 AC_CANONICAL_TARGET
-AM_INIT_AUTOMAKE(vpe, 1.2)
+AM_INIT_AUTOMAKE(vpe, 1.6)
 AM_CONFIG_HEADER(config.h)
 AM_MAINTAINER_MODE
 
@@ -46,7 +46,10 @@
 # Define this here, not in acconfig's @TOP@ section, since definitions
 # in the latter don't make it into the configure-time tests.
 AC_DEFINE([_GNU_SOURCE], 1, [Enable GNU extenstions])
-AC_DEFINE([__USE_BSD], 1, [Enable BSD extensions])
+
+# do NOT define POSIX_SOURCE, sicne this clashes with many BSDs
+dnl AC_DEFINE([_POSIX_SOURCE], 1, [Enable POSIX 1003.1 extensions])
+dnl AC_DEFINE([_XOPEN_SOURCE], 500, [Enable XOPEN extensions])
 
 ALL_LINGUAS=""
 
@@ -61,8 +64,6 @@
 AC_PROG_MAKE_SET
 AC_PROG_RANLIB
 
-AC_ISC_POSIX
-
 AC_ARG_ENABLE(iftype,
   [AC_HELP_STRING(--enable-iftype[=TYPE/SUBTYPE], [
      Use kernel/net device interface TYPE/SUBTYPE.
@@ -147,9 +148,9 @@
 
 dnl Checks for header files.
 AC_CHECK_HEADERS([fcntl.h inttypes.h limits.h malloc.h stdint.h strings.h syslog.h unistd.h \
-	sys/file.h sys/ioctl.h sys/param.h sys/time.h netinet/in_systm.h sys/cygwin.h arpa/inet.h \
-        sys/poll.h sys/mman.h netinet/in.h])
-AC_CHECK_HEADERS([net/ethernet.h net/if.h netinet/ip.h netinet/tcp.h netinet/in_systm.h], [], [],
+	sys/file.h sys/ioctl.h sys/param.h sys/time.h netinet/in_systm.h sys/cygwin.h \
+        sys/mman.h netinet/in.h])
+AC_CHECK_HEADERS([arpa/inet.h net/ethernet.h net/if.h netinet/ip.h netinet/tcp.h netinet/in_systm.h], [], [],
 [
 #include <sys/types.h>
 #include <sys/socket.h>
@@ -206,7 +207,7 @@
 AC_HEADER_STDC
 
 dnl argl, could somebody catapult darwin into the 21st century???
-AC_CHECK_FUNCS(asprintf daemon get_current_dir_name putenv select strerror strsignal strtol unsetenv mlockall poll)
+AC_CHECK_FUNCS(asprintf daemon get_current_dir_name putenv select strerror strsignal strtol unsetenv mlockall)
 
 AC_FUNC_ALLOCA
 
@@ -240,20 +241,17 @@
   echo
   echo "**********************************************************************"
   echo "**********************************************************************"
-  echo "**** --enable-rohc not yet implemented *******************************"
-  echo "**********************************************************************"
-  echo "**** uuh sorry, I am such an ass, but I didn't find any rfc3095 (ROHC)"
-  echo "**** implementation to be used in GPL code on the web."
-  echo "**** so this option is just a fake. Please implement one and send it"
-  echo "**** to me ;)"
-  echo "**********************************************************************"
-  echo "**********************************************************************"
+  echo "**** --enable-rohc is highly experimental, do not use ****************"
   echo "**********************************************************************"
   echo "**********************************************************************"
   echo
+  rohc=true
+  AC_DEFINE_UNQUOTED(ENABLE_ROHC, 1, [ROHC support])
   ]
 )
 
+AM_CONDITIONAL(ROHC, test x$rohc = xtrue)
+
 AC_ARG_ENABLE(icmp,
   [AC_HELP_STRING(--enable-icmp, [enable icmp protocol support (default disabled).])],
   AC_DEFINE_UNQUOTED(ENABLE_ICMP, 1, [ICMP protocol support.])
@@ -264,12 +262,17 @@
   AC_DEFINE_UNQUOTED(ENABLE_TCP, 1, [TCP protocol support.])
 )
 
+AC_ARG_ENABLE(dns,
+  [AC_HELP_STRING(--enable-dns, [enable dns tunnel protocol support (DOES NOT WORK).])],
+  AC_DEFINE_UNQUOTED(ENABLE_DNS, 1, [DNS tunnel protocol support.])
+)
+
 AC_ARG_ENABLE(http-proxy,
   [AC_HELP_STRING(--enable-http-proxy, [enable http proxy connect support (default disabled).])],
   AC_DEFINE_UNQUOTED(ENABLE_HTTP_PROXY, 1, [http proxy connect support.])
 )
 
-HMAC=8    dnl see also the AC_HELP_STRING
+HMAC=12    dnl see also the AC_HELP_STRING
 AC_ARG_ENABLE(hmac-length,
   [AC_HELP_STRING(--enable-hmac-length=BYTES, [use a hmac of length BYTES bytes (default 12). Allowed values are 4, 8, 12, 16.])],
   HMAC=$enableval
@@ -331,13 +334,13 @@
    CXXFLAGS="$CXXFLAGS -fno-exceptions"
 fi
 
-if $CXX -v --help 2>&1 | grep -q ffunction-sections; then
-   CXXFLAGS="$CXXFLAGS -ffunction-sections"
-fi
-
-if $LD -v --help 2>&1 | grep -q gc-sections; then
-   LDFLAGS="$LDFLAGS -Wl,--gc-sections"
-fi
+dnl if $CXX -v --help 2>&1 | grep -q ffunction-sections; then
+dnl    CXXFLAGS="$CXXFLAGS -ffunction-sections"
+dnl fi
+dnl 
+dnl if $LD -v --help 2>&1 | grep -q gc-sections; then
+dnl    LDFLAGS="$LDFLAGS -Wl,--gc-sections"
+dnl fi
 
 AC_CONFIG_COMMANDS_POST([
 
@@ -352,14 +355,24 @@
 echo "*** RAND used:    $RAND"
 echo "*** Max. MTU:     $MTU"
 echo "*** Compression:  $COMPRESS"
-echo "***"
 
 if test "x$DIGEST" = xmd4; then
-echo "*** WARNING"
-echo "*** The digest you have chosen ($DIGEST) is known to be insecure"
 echo "***"
+echo "*** WARNING: The digest you have chosen ($DIGEST) is known to be insecure"
+fi
+
+if test "$HMAC" -lt 12; then
+echo "***"
+echo "*** WARNING: The hmac length you have chosen ($HMAC) is probably insecure"
 fi
 
+if test "$RAND" -lt 8; then
+echo "***"
+echo "*** WARNING: The random prefix you have chosen ($RAND) is probably insecure"
+fi
+
+echo "***"
+
 echo
 
 ])
@@ -368,6 +381,7 @@
 
 AC_OUTPUT(Makefile po/Makefile.in
 src/Makefile
+src/rohc/Makefile
 doc/Makefile
 lib/Makefile
 m4/Makefile