Make the mainwindow's version string shorter when

[claws.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index f647b2e654cd2fb3ef174e8befe7289c434c66e4..4c4b18dd7688eb61f1c3b1683b1cf627e51d116a 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -7,19 +7,34 @@ AC_CONFIG_MACRO_DIR([m4])
 PACKAGE=claws-mail
 
 dnl version number
-MAJOR_VERSION=3
-MINOR_VERSION=9
-MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=116
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
-if test \( $EXTRA_VERSION -eq 0 \) -o \( "x$EXTRA_RELEASE" != "x" \); then
-    VERSION=${MAJOR_VERSION}.${MINOR_VERSION}.${MICRO_VERSION}${EXTRA_RELEASE}${EXTRA_GTK2_VERSION}
+GIT_VERSION=`git describe --abbrev=6 --dirty --always`
+MAJOR_VERSION=`echo $GIT_VERSION | cut -f1 -d- | cut -f1 -d.`
+MINOR_VERSION=`echo $GIT_VERSION | cut -f1 -d- | cut -f2 -d.`
+MICRO_VERSION=`echo $GIT_VERSION | cut -f1 -d- | cut -f3 -d.`
+EXTRA_VERSION=`echo $GIT_VERSION | cut -f2 -d-`
+
+if test \( "x$EXTRA_VERSION" != "x" \); then
+    VERSION=${MAJOR_VERSION}.${MINOR_VERSION}.${MICRO_VERSION}git${EXTRA_VERSION}
 else
-    VERSION=${MAJOR_VERSION}.${MINOR_VERSION}.${MICRO_VERSION}cvs${EXTRA_VERSION}${EXTRA_GTK2_VERSION}
+    VERSION=${MAJOR_VERSION}.${MINOR_VERSION}.${MICRO_VERSION}
+    EXTRA_VERSION=0
+fi
+
+if test \( "x$HASH_VERSION" != "x" \); then
+    if test \( "x$DIRTY_VERSION" != "x" \); then
+        VERSION=${VERSION}+${HASH_VERSION}+local
+    else
+        VERSION=${VERSION}+${HASH_VERSION}
+    fi
+fi
+
+if test \( "x$EXTRA_RELEASE" != "x" \); then
+    VERSION=${VERSION}${EXTRA_RELEASE}${EXTRA_GTK2_VERSION}
 fi
 
 dnl set $target
@@ -35,6 +50,8 @@ AC_SUBST(MAJOR_VERSION)
 AC_SUBST(MINOR_VERSION)
 AC_SUBST(MICRO_VERSION)
 AC_SUBST(EXTRA_VERSION)
+AC_SUBST(GIT_VERSION)
+AC_SUBST(HASH_VERSION)
 
 AC_CHECK_PROG(HAVE_GTK_ICON_CACHE, gtk-update-icon-cache, yes, no)
 AM_CONDITIONAL(UPDATE_GTK_ICON_CACHE, test x"$HAVE_GTK_ICON_CACHE" = xyes)
@@ -148,7 +165,7 @@ fi
 CFLAGS="$CFLAGS -Wall"
 
 if test $USE_MAINTAINER_MODE = yes; then
-       CFLAGS="-g -Wall -Wno-pointer-sign"
+       CFLAGS="-g -Wall -Wno-pointer-sign -DUSE_MAINTAINER_MODE"
 fi
 
 pthread_name=