summaryrefslogtreecommitdiffabout
Unidiff
Diffstat (more/less context) (ignore 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
@@ -1,42 +1,43 @@
1AC_INIT([libopkele], [0.3.1], [libopkele-bugs@klever.net]) 1AC_INIT([libopkele], [0.3.1], [libopkele-bugs@klever.net])
2AC_CONFIG_SRCDIR([include/opkele/opkele-config.h]) 2AC_CONFIG_SRCDIR([include/opkele/opkele-config.h])
3AC_CONFIG_HEADERS([config.h include/opkele/acconfig.h]) 3AC_CONFIG_HEADERS([config.h include/opkele/acconfig.h])
4AM_INIT_AUTOMAKE([dist-bzip2]) 4AM_INIT_AUTOMAKE([dist-bzip2])
5 5
6AC_PROG_INSTALL 6AC_PROG_INSTALL
7AC_PROG_CXX 7AC_PROG_CXX
8AC_PROG_CC 8AC_PROG_CC
9AC_PROG_LIBTOOL 9AC_PROG_LIBTOOL
10PKG_PROG_PKG_CONFIG 10PKG_PROG_PKG_CONFIG
11 11
12AC_HEADER_STDC 12AC_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]) 16AC_MSG_CHECKING([for source tree version])
17if headrev=$(cd $srcdir && git rev-parse --verify HEAD 2>/dev/null) ; then 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)" 18 PACKAGE_SRC_VERSION="$(cd $srcdir && git describe --tags $headrev)"
19 test "$PACKAGE_SRC_VERSION" = "$PACKAGE_VERSION" || PACKAGE_SRC_VERSION="${PACKAGE_VERSION}:${PACKAGE_SRC_VERSION}"
19 ( cd $srcdir && git diff-index $headrev | read dirt ) && PACKAGE_SRC_VERSION="${PACKAGE_SRC_VERSION}-dirty" 20 ( cd $srcdir && git diff-index $headrev | read dirt ) && PACKAGE_SRC_VERSION="${PACKAGE_SRC_VERSION}-dirty"
20else 21else
21 PACKAGE_SRC_VERSION="$PACKAGE_VERSION" 22 PACKAGE_SRC_VERSION="$PACKAGE_VERSION"
22fi 23fi
23AC_MSG_RESULT([$PACKAGE_SRC_VERSION]) 24AC_MSG_RESULT([$PACKAGE_SRC_VERSION])
24AC_SUBST([PACKAGE_SRC_VERSION]) 25AC_SUBST([PACKAGE_SRC_VERSION])
25AC_DEFINE_UNQUOTED([PACKAGE_SRC_VERSION],["$PACKAGE_SRC_VERSION"],[more or less precise source tree version]) 26AC_DEFINE_UNQUOTED([PACKAGE_SRC_VERSION],["$PACKAGE_SRC_VERSION"],[more or less precise source tree version])
26 27
27PKG_CHECK_MODULES([OPENSSL],[openssl],,[ 28PKG_CHECK_MODULES([OPENSSL],[openssl],,[
28 AC_MSG_ERROR([no openssl library found. get one from http://www.openssl.org/]) 29 AC_MSG_ERROR([no openssl library found. get one from http://www.openssl.org/])
29]) 30])
30 31
31WANT_KONFORKA="yes" 32WANT_KONFORKA="yes"
32AC_ARG_ENABLE([konforka], 33AC_ARG_ENABLE([konforka],
33 AC_HELP_STRING([--disable-konforka],[do not use konforka library (default: use if found)]), 34 AC_HELP_STRING([--disable-konforka],[do not use konforka library (default: use if found)]),
34 [ 35 [
35 test "${enableval}" = "no" && WANT_KONFORKA="no" 36 test "${enableval}" = "no" && WANT_KONFORKA="no"
36 ] 37 ]
37) 38)
38if test "${WANT_KONFORKA}" = "yes" ; then 39if test "${WANT_KONFORKA}" = "yes" ; then
39 PKG_CHECK_MODULES([KONFORKA],[konforka],[ 40 PKG_CHECK_MODULES([KONFORKA],[konforka],[
40 AC_SUBST([KONFORKA_CFLAGS]) 41 AC_SUBST([KONFORKA_CFLAGS])
41 AC_SUBST([KONFORKA_LIBS]) 42 AC_SUBST([KONFORKA_LIBS])
42 AC_DEFINE([HAVE_KONFORKA],,[defined in presence of konforka library]) 43 AC_DEFINE([HAVE_KONFORKA],,[defined in presence of konforka library])