--- gvpe/configure.ac	2011/03/08 17:33:30	1.58
+++ gvpe/configure.ac	2013/07/13 04:10:29	1.61
@@ -1,6 +1,6 @@
 dnl Process this file with autoconf to produce a configure script.
 
-AC_PREREQ(2.59)
+AC_PREREQ(2.69)
 AC_INIT
 AC_CONFIG_SRCDIR([src/gvpe.C])
 AC_CANONICAL_TARGET
@@ -48,9 +48,6 @@
 #endif
 ])
 
-dnl Include the macros from the m4/ directory
-AM_ACLOCAL_INCLUDE(m4)
-
 AM_GNU_GETTEXT([external])
 AM_GNU_GETTEXT_VERSION(0.11.5)
 
@@ -353,7 +350,7 @@
   [AS_HELP_STRING(--enable-max-mtu=BYTES,enable mtu sizes upto BYTES bytes (default 1500). Use 9100 for jumbogram support.)],
   MTU=$enableval
 )
-AC_DEFINE_UNQUOTED(MAX_MTU, $MTU + 14, [Maximum MTU supported.])
+AC_DEFINE_UNQUOTED(MAX_MTU, ($MTU + 14), [Maximum MTU supported.])
 
 COMPRESS=1
 AC_ARG_ENABLE(compression,
@@ -380,7 +377,7 @@
 AC_ARG_ENABLE(digest,
   [AS_HELP_STRING(--enable-digest=CIPHER,[
       Select the digest algorithm to use (default "ripemd160"). Must be one of
-      "sha512", "sha256", "sha1" (somewhat insecure), "ripemd160", "md5" (insecure) or "md4" (insecure).])],
+      "sha512", "sha256", "sha1" (legacy), "ripemd160", "md5" (insecure) or "md4" (insecure).])],
   if test "x$enableval" = xsha512   ; then DIGEST=sha512   ; fi
   if test "x$enableval" = xsha256   ; then DIGEST=sha256   ; fi
   if test "x$enableval" = xsha1     ; then DIGEST=sha1     ; fi
@@ -440,12 +437,12 @@
 
 if test "x$DIGEST" = xmd5; then
 echo "***"
-echo "*** WARNING: The digest you have chosen ($DIGEST) is probably insecure"
+echo "*** WARNING: The digest you have chosen ($DIGEST) is quite insecure"
 fi
 
 if test "$HMAC" -lt 12; then
 echo "***"
-echo "*** WARNING: The hmac length you have chosen ($HMAC) is probably insecure"
+echo "*** WARNING: The hmac length you have chosen ($HMAC) is quite insecure"
 fi
 
 if test "$RAND" -lt 8; then