Merge tag 'upstream/0.3.6'

[debian/uanytun.git] / src / configure

diff --git a/src/configure b/src/configure
index 16d5cc7..8044552 100755 (executable)
--- a/src/configure
+++ b/src/configure
@@ -153,12 +153,12 @@ if [ -n "$ERRORS" ] && [ $EBUILD_COMPAT -ne 1 ]; then
 fi
 
 if [ $USE_CLANG -eq 0 ]; then
-  CFLAGS='-g -Wall -O2'
-  LDFLAGS='-g -Wall -O2'
+  CFLAGS=$CFLAGS'-g -Wall -O2'
+  LDFLAGS=$LDFLAGS'-g -Wall -O2'
   COMPILER='gcc'
 else
-  CFLAGS='-g -O2'
-  LDFLAGS='-g -O2'
+  CFLAGS=$CFLAGS'-g -O2'
+  LDFLAGS=$LDFLAGS'-g -O2'
   COMPILER='clang'
 fi
 
@@ -183,28 +183,33 @@ case $TARGET in
   ;;
 esac
 
-
+CRYPTO_LIB_NAME=""
 case $CRYPTO_LIB in
   gcrypt)
     CFLAGS=$CFLAGS' -DUSE_GCRYPT'
     LDFLAGS=$LDFLAGS' -lgcrypt'
-    echo "using gcrypt library"
+    CRYPTO_LIB_NAME="libgcrypt"
   ;;
   nettle)
     CFLAGS=$CFLAGS' -DUSE_NETTLE'
     LDFLAGS=$LDFLAGS' -lnettle'
-    echo "using nettle library"
+    CRYPTO_LIB_NAME="Nettle"
   ;;
   ssl)
     CFLAGS=$CFLAGS' -DUSE_SSL_CRYPTO'
     LDFLAGS=$LDFLAGS' -lcrypto'
-    echo "using ssl crypto library"
+    CRYPTO_LIB_NAME="OpenSSL"
   ;;
   none)
     CFLAGS=$CFLAGS' -DNO_CRYPT'
-    echo "disabling crypto"
+    CRYPTO_LIB_NAME="none"
+  ;;
+  *)
+    echo "unknown crypto library: $$CRYPTO_LIB"
+    exit 1
   ;;
 esac
+echo "crypto-library: $CRYPTO_LIB_NAME"
 
 if [ $PASSPHRASE -eq 0 ]; then
   CFLAGS=$CFLAGS' -DNO_PASSPHRASE'
@@ -239,7 +244,7 @@ LDFLAGS := $LDFLAGS
 STRIP := strip
 INSTALL := install
 
-PREFIX := $PREFIX
+prefix := $PREFIX
 SBINDIR := $SBINDIR
 ETCDIR := $ETCDIR
 EOF
@@ -263,14 +268,12 @@ else
 fi
 
 VERSION=`cat ../version`
-if which svn >/dev/null; then
-  SVN_REV=`svn info 2> /dev/null | grep "^Revision: " | awk '{print($2)}'`
-  if [ -n "$SVN_REV" ]; then
-    VERSION="$VERSION (svn$SVN_REV)"
-  fi
+if which git >/dev/null; then
+    GIT_HASH=`git rev-parse HEAD 2> /dev/null`
+    if [ -n "$GIT_HASH" ]; then
+        VERSION="$VERSION (git $GIT_HASH)"
+    fi
 fi
-HOSTNAME=`hostname`
-DATE=`date +"%d.%m.%Y %H:%M:%S %Z"`
 
 cat > version.h <<EOF
 /*
@@ -284,8 +287,8 @@ cat > version.h <<EOF
 #ifndef UANYTUN_version_h_INCLUDED
 #define UANYTUN_version_h_INCLUDED
 
-#define VERSION_STRING_0 "uanytun version $VERSION"
-#define VERSION_STRING_1 "built on $HOSTNAME, $DATE"
+#define VERSION_STRING "uanytun version $VERSION"
+#define CRYPTO_LIB_NAME "$CRYPTO_LIB_NAME"
 
 #endif