summaryrefslogtreecommitdiffabout
path: root/configure.ac
authorMichael Krelin <hacker@klever.net>2007-11-20 20:23:35 (UTC)
committer Michael Krelin <hacker@klever.net>2007-11-20 20:23:35 (UTC)
commit287a35beef7c318a8eb38ad7753f681f4e57aa6a (patch) (side-by-side diff)
tree613bce5c79db2b6839e60c1c88bc5c93d363511b /configure.ac
parentd5af467c7312bf4a251440f23bbb92290d2a3d3c (diff)
downloadlibopkele-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>
Diffstat (limited to 'configure.ac') (more/less context) (show whitespace changes)
-rw-r--r--configure.ac3
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
@@ -2,33 +2,34 @@ AC_INIT([libopkele], [0.3.1], [libopkele-bugs@klever.net])
AC_CONFIG_SRCDIR([include/opkele/opkele-config.h])
AC_CONFIG_HEADERS([config.h include/opkele/acconfig.h])
AM_INIT_AUTOMAKE([dist-bzip2])
AC_PROG_INSTALL
AC_PROG_CXX
AC_PROG_CC
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)"
+ PACKAGE_SRC_VERSION="$(cd $srcdir && git describe --tags $headrev)"
+ test "$PACKAGE_SRC_VERSION" = "$PACKAGE_VERSION" || PACKAGE_SRC_VERSION="${PACKAGE_VERSION}:${PACKAGE_SRC_VERSION}"
( 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],
AC_HELP_STRING([--disable-konforka],[do not use konforka library (default: use if found)]),
[