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) (unidiff)
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
@@ -13,6 +13,17 @@ AC_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])
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)"
19 ( cd $srcdir && git diff-index $headrev | read dirt ) && PACKAGE_SRC_VERSION="${PACKAGE_SRC_VERSION}-dirty"
20else
21 PACKAGE_SRC_VERSION="$PACKAGE_VERSION"
22fi
23AC_MSG_RESULT([$PACKAGE_SRC_VERSION])
24AC_SUBST([PACKAGE_SRC_VERSION])
25AC_DEFINE_UNQUOTED([PACKAGE_SRC_VERSION],["$PACKAGE_SRC_VERSION"],[more or less precise source tree version])
26
16PKG_CHECK_MODULES([OPENSSL],[openssl],,[ 27PKG_CHECK_MODULES([OPENSSL],[openssl],,[
17 AC_MSG_ERROR([no openssl library found. get one from http://www.openssl.org/]) 28 AC_MSG_ERROR([no openssl library found. get one from http://www.openssl.org/])
18]) 29])
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 {
81 || (r=curl_easy_setopt(c,CURLOPT_MAXREDIRS,5)) 81 || (r=curl_easy_setopt(c,CURLOPT_MAXREDIRS,5))
82 || (r=curl_easy_setopt(c,CURLOPT_DNS_CACHE_TIMEOUT,120)) 82 || (r=curl_easy_setopt(c,CURLOPT_DNS_CACHE_TIMEOUT,120))
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))
86 #ifdefDISABLE_CURL_SSL_VERIFYHOST 86 #ifdefDISABLE_CURL_SSL_VERIFYHOST
87 || (r=curl_easy_setopt(c,CURLOPT_SSL_VERIFYHOST,0)) 87 || (r=curl_easy_setopt(c,CURLOPT_SSL_VERIFYHOST,0))