| author | Michael Krelin <hacker@klever.net> | 2007-11-20 20:28:04 (UTC) |
|---|---|---|
| committer | Michael Krelin <hacker@klever.net> | 2007-11-20 20:28:04 (UTC) |
| commit | 2937fe0e47a7ff46c5ad1aee3ad764e56ca6d49b (patch) (side-by-side diff) | |
| tree | b41caa692cec461472f7e416b5d37a16b385adb2 | |
| parent | 287a35beef7c318a8eb38ad7753f681f4e57aa6a (diff) | |
| download | libopkele-2937fe0e47a7ff46c5ad1aee3ad764e56ca6d49b.zip libopkele-2937fe0e47a7ff46c5ad1aee3ad764e56ca6d49b.tar.gz libopkele-2937fe0e47a7ff46c5ad1aee3ad764e56ca6d49b.tar.bz2 | |
simplify source tree version even more
Signed-off-by: Michael Krelin <hacker@klever.net>
| -rw-r--r-- | configure.ac | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index 58afeb3..1ea8de9 100644 --- a/configure.ac +++ b/configure.ac @@ -1,43 +1,44 @@ 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="$(cd $srcdir && git describe --tags $headrev)" - test "$PACKAGE_SRC_VERSION" = "$PACKAGE_VERSION" || PACKAGE_SRC_VERSION="${PACKAGE_VERSION}:${PACKAGE_SRC_VERSION}" + test "$PACKAGE_SRC_VERSION" = "$PACKAGE_VERSION" \ + -o "${PACKAGE_SRC_VERSION#${PACKAGE_VERSION}-}" != "$PACKAGE_SRC_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)]), [ test "${enableval}" = "no" && WANT_KONFORKA="no" ] ) if test "${WANT_KONFORKA}" = "yes" ; then PKG_CHECK_MODULES([KONFORKA],[konforka],[ AC_SUBST([KONFORKA_CFLAGS]) AC_SUBST([KONFORKA_LIBS]) AC_DEFINE([HAVE_KONFORKA],,[defined in presence of konforka library]) |