--- gvpe/configure.ac	2004/01/29 19:22:05	1.24
+++ 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.5)
+AM_INIT_AUTOMAKE(vpe, 1.6)
 AM_CONFIG_HEADER(config.h)
 AM_MAINTAINER_MODE
 
@@ -241,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.])
@@ -265,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
@@ -361,12 +363,12 @@
 
 if test "$HMAC" -lt 12; then
 echo "***"
-echo "*** WARNING: The hmac length you have chosen ($HMAC) might be insecure"
+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) might be insecure"
+echo "*** WARNING: The random prefix you have chosen ($RAND) is probably insecure"
 fi
 
 echo "***"
@@ -379,6 +381,7 @@
 
 AC_OUTPUT(Makefile po/Makefile.in
 src/Makefile
+src/rohc/Makefile
 doc/Makefile
 lib/Makefile
 m4/Makefile