Merge branch 'autotool-fixes' into 'master'

Get basename of branch without --short option, this requires a git > 1.7.10

Don't use --short in symbolic-ref. 

See merge request !45

src/Makefile.am

@@ -63,7 +63,7 @@ libswiftsim_mpi_la_SHORTNAME = mpi
 version.h: version.h.in $(AM_SOURCES) $(include_HEADERS) $(noinst_HEADERS)
 	if test "X$(GIT_CMD)" != "X"; then \
 	    GIT_REVISION=`$(GIT_CMD) describe --abbrev=8  --always --tags --dirty`; \
-	    GIT_BRANCH=`$(GIT_CMD) symbolic-ref --short HEAD`; \
+	    GIT_BRANCH=`$(GIT_CMD) symbolic-ref HEAD| sed 's,.*/,,'`; \
 	    sed -e "s,@PACKAGE_VERSION\@,$(PACKAGE_VERSION)," \
 	        -e "s,@GIT_REVISION\@,$${GIT_REVISION}," \
 	        -e "s,@GIT_BRANCH\@,$${GIT_BRANCH}," version.h.in > version.h; \