merged most changes from rail branch to trunk

1 files changed, 5 insertions, 1 deletions

diff --git a/src/configure b/src/configure
index d2f60a8..542b4b4 100755
--- a/src/configure
+++ b/src/configure
@@ -16,7 +16,7 @@
 #  tunneling and relaying of packets of any protocol.
 #
 #
-#  Copyright (C) 2007-2010 Christian Pointner <equinox@anytun.org>
+#  Copyright (C) 2007-2014 Christian Pointner <equinox@anytun.org>
 #
 #  This file is part of uAnytun.
 #
@@ -60,6 +60,7 @@ print_usage() {
   echo "          --no-manpage              dont't install manpage"
   echo "          --examplesdir=<DIR>       the path to the examples files (default: $PREFIX/share/examples)"
   echo "          --no-examples             dont't install example files"
+  echo "          --use-gcrypt              use libgcrypt (this is the default)"
   echo "          --use-ssl-crypto          use ssl crypto library instead of libgcrypt"
   echo "          --no-crypto               disable crypto at all (only NULL cipher)"
   echo "          --disable-passphrase      disable master key and salt passphrase"
@@ -97,6 +98,9 @@ do
   --no-examples)
     INSTALLEXAMPLES=0
   ;;
+  --use-gcrypt)
+    CRYPTO_LIB='gcrypt'
+  ;;
   --use-ssl-crypto)
     CRYPTO_LIB='ssl'
   ;;