-rw-r--r-- | configure.ac | 3 |
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 @@ | |||
1 | AC_INIT([libopkele], [0.3.1], [libopkele-bugs@klever.net]) | 1 | AC_INIT([libopkele], [0.3.1], [libopkele-bugs@klever.net]) |
2 | AC_CONFIG_SRCDIR([include/opkele/opkele-config.h]) | 2 | AC_CONFIG_SRCDIR([include/opkele/opkele-config.h]) |
3 | AC_CONFIG_HEADERS([config.h include/opkele/acconfig.h]) | 3 | AC_CONFIG_HEADERS([config.h include/opkele/acconfig.h]) |
4 | AM_INIT_AUTOMAKE([dist-bzip2]) | 4 | AM_INIT_AUTOMAKE([dist-bzip2]) |
5 | 5 | ||
6 | AC_PROG_INSTALL | 6 | AC_PROG_INSTALL |
7 | AC_PROG_CXX | 7 | AC_PROG_CXX |
8 | AC_PROG_CC | 8 | AC_PROG_CC |
9 | AC_PROG_LIBTOOL | 9 | AC_PROG_LIBTOOL |
10 | PKG_PROG_PKG_CONFIG | 10 | PKG_PROG_PKG_CONFIG |
11 | 11 | ||
12 | AC_HEADER_STDC | 12 | AC_HEADER_STDC |
13 | 13 | ||
14 | AC_PATH_PROG([XSLTPROC],[xsltproc],[true]) | 14 | AC_PATH_PROG([XSLTPROC],[xsltproc],[true]) |
15 | 15 | ||
16 | AC_MSG_CHECKING([for source tree version]) | 16 | AC_MSG_CHECKING([for source tree version]) |
17 | if headrev=$(cd $srcdir && git rev-parse --verify HEAD 2>/dev/null) ; then | 17 | if 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" |
20 | else | 21 | else |
21 | PACKAGE_SRC_VERSION="$PACKAGE_VERSION" | 22 | PACKAGE_SRC_VERSION="$PACKAGE_VERSION" |
22 | fi | 23 | fi |
23 | AC_MSG_RESULT([$PACKAGE_SRC_VERSION]) | 24 | AC_MSG_RESULT([$PACKAGE_SRC_VERSION]) |
24 | AC_SUBST([PACKAGE_SRC_VERSION]) | 25 | AC_SUBST([PACKAGE_SRC_VERSION]) |
25 | AC_DEFINE_UNQUOTED([PACKAGE_SRC_VERSION],["$PACKAGE_SRC_VERSION"],[more or less precise source tree version]) | 26 | AC_DEFINE_UNQUOTED([PACKAGE_SRC_VERSION],["$PACKAGE_SRC_VERSION"],[more or less precise source tree version]) |
26 | 27 | ||
27 | PKG_CHECK_MODULES([OPENSSL],[openssl],,[ | 28 | PKG_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 | ||
31 | WANT_KONFORKA="yes" | 32 | WANT_KONFORKA="yes" |
32 | AC_ARG_ENABLE([konforka], | 33 | AC_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 | ) |
38 | if test "${WANT_KONFORKA}" = "yes" ; then | 39 | if 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]) |