| -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 @@ -13,6 +13,17 @@ AC_HEADER_STDC AC_PATH_PROG([XSLTPROC],[xsltproc],[true]) +AC_MSG_CHECKING([for source tree version]) +if headrev=$(cd $srcdir && git rev-parse --verify HEAD 2>/dev/null) ; then + PACKAGE_SRC_VERSION="${PACKAGE_VERSION}:$(cd $srcdir && git describe --tags $headrev)" + ( cd $srcdir && git diff-index $headrev | read dirt ) && PACKAGE_SRC_VERSION="${PACKAGE_SRC_VERSION}-dirty" +else + PACKAGE_SRC_VERSION="$PACKAGE_VERSION" +fi +AC_MSG_RESULT([$PACKAGE_SRC_VERSION]) +AC_SUBST([PACKAGE_SRC_VERSION]) +AC_DEFINE_UNQUOTED([PACKAGE_SRC_VERSION],["$PACKAGE_SRC_VERSION"],[more or less precise source tree version]) + PKG_CHECK_MODULES([OPENSSL],[openssl],,[ AC_MSG_ERROR([no openssl library found. get one from http://www.openssl.org/]) ]) diff --git a/lib/consumer.cc b/lib/consumer.cc index f72ae08..76b6ea7 100644 --- a/lib/consumer.cc +++ b/lib/consumer.cc @@ -81,7 +81,7 @@ namespace opkele { || (r=curl_easy_setopt(c,CURLOPT_MAXREDIRS,5)) || (r=curl_easy_setopt(c,CURLOPT_DNS_CACHE_TIMEOUT,120)) || (r=curl_easy_setopt(c,CURLOPT_DNS_USE_GLOBAL_CACHE,1)) - || (r=curl_easy_setopt(c,CURLOPT_USERAGENT,PACKAGE_NAME"/"PACKAGE_VERSION)) + || (r=curl_easy_setopt(c,CURLOPT_USERAGENT,PACKAGE_NAME"/"PACKAGE_SRC_VERSION)) || (r=curl_easy_setopt(c,CURLOPT_TIMEOUT,20)) #ifdef DISABLE_CURL_SSL_VERIFYHOST || (r=curl_easy_setopt(c,CURLOPT_SSL_VERIFYHOST,0)) |