summaryrefslogtreecommitdiffabout
authorMichael Krelin <hacker@klever.net>2007-11-20 18:39:51 (UTC)
committer Michael Krelin <hacker@klever.net>2007-11-20 18:39:51 (UTC)
commitc868af04ffd60a04c7a98a55cd92b5e12102b1e1 (patch) (side-by-side diff)
tree0878b62d8c49f6edb175ee6c0605c27613bce2ab
parentbc8cecfcf7e1dc593249200556e5553d7d025c05 (diff)
downloadlibopkele-c868af04ffd60a04c7a98a55cd92b5e12102b1e1.zip
libopkele-c868af04ffd60a04c7a98a55cd92b5e12102b1e1.tar.gz
libopkele-c868af04ffd60a04c7a98a55cd92b5e12102b1e1.tar.bz2
added more precise source tree version detection
Signed-off-by: Michael Krelin <hacker@klever.net>
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--configure.ac11
-rw-r--r--lib/consumer.cc2
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
@@ -10,12 +10,23 @@ AC_PROG_LIBTOOL
PKG_PROG_PKG_CONFIG
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/])
])
WANT_KONFORKA="yes"
AC_ARG_ENABLE([konforka],
diff --git a/lib/consumer.cc b/lib/consumer.cc
index f72ae08..76b6ea7 100644
--- a/lib/consumer.cc
+++ b/lib/consumer.cc
@@ -78,13 +78,13 @@ namespace opkele {
static CURLcode curl_misc_sets(CURL* c) {
CURLcode r;
(r=curl_easy_setopt(c,CURLOPT_FOLLOWLOCATION,1))
|| (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))
#endif
#ifdef DISABLE_CURL_SSL_VERIFYPEER
|| (r=curl_easy_setopt(c,CURLOPT_SSL_VERIFYPEER,0))