summaryrefslogtreecommitdiffabout
authorMichael Krelin <hacker@klever.net>2007-11-20 20:23:35 (UTC)
committer Michael Krelin <hacker@klever.net>2007-11-20 20:23:35 (UTC)
commit287a35beef7c318a8eb38ad7753f681f4e57aa6a (patch) (unidiff)
tree613bce5c79db2b6839e60c1c88bc5c93d363511b
parentd5af467c7312bf4a251440f23bbb92290d2a3d3c (diff)
downloadlibopkele-287a35beef7c318a8eb38ad7753f681f4e57aa6a.zip
libopkele-287a35beef7c318a8eb38ad7753f681f4e57aa6a.tar.gz
libopkele-287a35beef7c318a8eb38ad7753f681f4e57aa6a.tar.bz2
sanitized source tree version string a bit
Signed-off-by: Michael Krelin <hacker@klever.net>
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--configure.ac3
1 files changed, 2 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac
index 71851da..58afeb3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -6,25 +6,26 @@ AM_INIT_AUTOMAKE([dist-bzip2])
6AC_PROG_INSTALL 6AC_PROG_INSTALL
7AC_PROG_CXX 7AC_PROG_CXX
8AC_PROG_CC 8AC_PROG_CC
9AC_PROG_LIBTOOL 9AC_PROG_LIBTOOL
10PKG_PROG_PKG_CONFIG 10PKG_PROG_PKG_CONFIG
11 11
12AC_HEADER_STDC 12AC_HEADER_STDC
13 13
14AC_PATH_PROG([XSLTPROC],[xsltproc],[true]) 14AC_PATH_PROG([XSLTPROC],[xsltproc],[true])
15 15
16AC_MSG_CHECKING([for source tree version]) 16AC_MSG_CHECKING([for source tree version])
17if headrev=$(cd $srcdir && git rev-parse --verify HEAD 2>/dev/null) ; then 17if headrev=$(cd $srcdir && git rev-parse --verify HEAD 2>/dev/null) ; then
18 PACKAGE_SRC_VERSION="${PACKAGE_VERSION}:$(cd $srcdir && git describe --tags $headrev)" 18 PACKAGE_SRC_VERSION="$(cd $srcdir && git describe --tags $headrev)"
19 test "$PACKAGE_SRC_VERSION" = "$PACKAGE_VERSION" || PACKAGE_SRC_VERSION="${PACKAGE_VERSION}:${PACKAGE_SRC_VERSION}"
19 ( cd $srcdir && git diff-index $headrev | read dirt ) && PACKAGE_SRC_VERSION="${PACKAGE_SRC_VERSION}-dirty" 20 ( cd $srcdir && git diff-index $headrev | read dirt ) && PACKAGE_SRC_VERSION="${PACKAGE_SRC_VERSION}-dirty"
20else 21else
21 PACKAGE_SRC_VERSION="$PACKAGE_VERSION" 22 PACKAGE_SRC_VERSION="$PACKAGE_VERSION"
22fi 23fi
23AC_MSG_RESULT([$PACKAGE_SRC_VERSION]) 24AC_MSG_RESULT([$PACKAGE_SRC_VERSION])
24AC_SUBST([PACKAGE_SRC_VERSION]) 25AC_SUBST([PACKAGE_SRC_VERSION])
25AC_DEFINE_UNQUOTED([PACKAGE_SRC_VERSION],["$PACKAGE_SRC_VERSION"],[more or less precise source tree version]) 26AC_DEFINE_UNQUOTED([PACKAGE_SRC_VERSION],["$PACKAGE_SRC_VERSION"],[more or less precise source tree version])
26 27
27PKG_CHECK_MODULES([OPENSSL],[openssl],,[ 28PKG_CHECK_MODULES([OPENSSL],[openssl],,[
28 AC_MSG_ERROR([no openssl library found. get one from http://www.openssl.org/]) 29 AC_MSG_ERROR([no openssl library found. get one from http://www.openssl.org/])
29]) 30])
30 31