-rw-r--r-- | configure.ac | 11 | ||||
-rw-r--r-- | lib/consumer.cc | 2 |
2 files changed, 12 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index 50dd8d4..23e40da 100644 --- a/configure.ac +++ b/configure.ac | |||
@@ -15,2 +15,13 @@ AC_PATH_PROG([XSLTPROC],[xsltproc],[true]) | |||
15 | 15 | ||
16 | AC_MSG_CHECKING([for source tree version]) | ||
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)" | ||
19 | ( cd $srcdir && git diff-index $headrev | read dirt ) && PACKAGE_SRC_VERSION="${PACKAGE_SRC_VERSION}-dirty" | ||
20 | else | ||
21 | PACKAGE_SRC_VERSION="$PACKAGE_VERSION" | ||
22 | fi | ||
23 | AC_MSG_RESULT([$PACKAGE_SRC_VERSION]) | ||
24 | AC_SUBST([PACKAGE_SRC_VERSION]) | ||
25 | AC_DEFINE_UNQUOTED([PACKAGE_SRC_VERSION],["$PACKAGE_SRC_VERSION"],[more or less precise source tree version]) | ||
26 | |||
16 | PKG_CHECK_MODULES([OPENSSL],[openssl],,[ | 27 | PKG_CHECK_MODULES([OPENSSL],[openssl],,[ |
diff --git a/lib/consumer.cc b/lib/consumer.cc index f72ae08..76b6ea7 100644 --- a/lib/consumer.cc +++ b/lib/consumer.cc | |||
@@ -83,3 +83,3 @@ namespace opkele { | |||
83 | || (r=curl_easy_setopt(c,CURLOPT_DNS_USE_GLOBAL_CACHE,1)) | 83 | || (r=curl_easy_setopt(c,CURLOPT_DNS_USE_GLOBAL_CACHE,1)) |
84 | || (r=curl_easy_setopt(c,CURLOPT_USERAGENT,PACKAGE_NAME"/"PACKAGE_VERSION)) | 84 | || (r=curl_easy_setopt(c,CURLOPT_USERAGENT,PACKAGE_NAME"/"PACKAGE_SRC_VERSION)) |
85 | || (r=curl_easy_setopt(c,CURLOPT_TIMEOUT,20)) | 85 | || (r=curl_easy_setopt(c,CURLOPT_TIMEOUT,20)) |