author | Michael Krelin <hacker@klever.net> | 2007-11-20 20:23:35 (UTC) |
---|---|---|
committer | Michael Krelin <hacker@klever.net> | 2007-11-20 20:23:35 (UTC) |
commit | 287a35beef7c318a8eb38ad7753f681f4e57aa6a (patch) (unidiff) | |
tree | 613bce5c79db2b6839e60c1c88bc5c93d363511b | |
parent | d5af467c7312bf4a251440f23bbb92290d2a3d3c (diff) | |
download | libopkele-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>
-rw-r--r-- | configure.ac | 3 |
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]) | |||
6 | AC_PROG_INSTALL | 6 | AC_PROG_INSTALL |
7 | AC_PROG_CXX | 7 | AC_PROG_CXX |
8 | AC_PROG_CC | 8 | AC_PROG_CC |
9 | AC_PROG_LIBTOOL | 9 | AC_PROG_LIBTOOL |
10 | PKG_PROG_PKG_CONFIG | 10 | PKG_PROG_PKG_CONFIG |
11 | 11 | ||
12 | AC_HEADER_STDC | 12 | AC_HEADER_STDC |
13 | 13 | ||
14 | AC_PATH_PROG([XSLTPROC],[xsltproc],[true]) | 14 | AC_PATH_PROG([XSLTPROC],[xsltproc],[true]) |
15 | 15 | ||
16 | AC_MSG_CHECKING([for source tree version]) | 16 | AC_MSG_CHECKING([for source tree version]) |
17 | if headrev=$(cd $srcdir && git rev-parse --verify HEAD 2>/dev/null) ; then | 17 | if 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" |
20 | else | 21 | else |
21 | PACKAGE_SRC_VERSION="$PACKAGE_VERSION" | 22 | PACKAGE_SRC_VERSION="$PACKAGE_VERSION" |
22 | fi | 23 | fi |
23 | AC_MSG_RESULT([$PACKAGE_SRC_VERSION]) | 24 | AC_MSG_RESULT([$PACKAGE_SRC_VERSION]) |
24 | AC_SUBST([PACKAGE_SRC_VERSION]) | 25 | AC_SUBST([PACKAGE_SRC_VERSION]) |
25 | AC_DEFINE_UNQUOTED([PACKAGE_SRC_VERSION],["$PACKAGE_SRC_VERSION"],[more or less precise source tree version]) | 26 | AC_DEFINE_UNQUOTED([PACKAGE_SRC_VERSION],["$PACKAGE_SRC_VERSION"],[more or less precise source tree version]) |
26 | 27 | ||
27 | PKG_CHECK_MODULES([OPENSSL],[openssl],,[ | 28 | PKG_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 | ||