author | Michael Krelin <hacker@klever.net> | 2007-11-20 18:39:51 (UTC) |
---|---|---|
committer | Michael Krelin <hacker@klever.net> | 2007-11-20 18:39:51 (UTC) |
commit | c868af04ffd60a04c7a98a55cd92b5e12102b1e1 (patch) (unidiff) | |
tree | 0878b62d8c49f6edb175ee6c0605c27613bce2ab /configure.ac | |
parent | bc8cecfcf7e1dc593249200556e5553d7d025c05 (diff) | |
download | libopkele-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>
-rw-r--r-- | configure.ac | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac index 50dd8d4..23e40da 100644 --- a/configure.ac +++ b/configure.ac | |||
@@ -1,39 +1,50 @@ | |||
1 | AC_INIT([libopkele], [0.3], [libopkele-bugs@klever.net]) | 1 | AC_INIT([libopkele], [0.3], [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]) | ||
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)" | ||
19 | ( cd $srcdir && git diff-index $headrev | read dirt ) && PACKAGE_SRC_VERSION="${PACKAGE_SRC_VERSION}-dirty" | ||
20 | else | ||
21 | PACKAGE_SRC_VERSION="$PACKAGE_VERSION" | ||
22 | fi | ||
23 | AC_MSG_RESULT([$PACKAGE_SRC_VERSION]) | ||
24 | AC_SUBST([PACKAGE_SRC_VERSION]) | ||
25 | AC_DEFINE_UNQUOTED([PACKAGE_SRC_VERSION],["$PACKAGE_SRC_VERSION"],[more or less precise source tree version]) | ||
26 | |||
16 | PKG_CHECK_MODULES([OPENSSL],[openssl],,[ | 27 | PKG_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 | ]) |
19 | 30 | ||
20 | WANT_KONFORKA="yes" | 31 | WANT_KONFORKA="yes" |
21 | AC_ARG_ENABLE([konforka], | 32 | AC_ARG_ENABLE([konforka], |
22 | AC_HELP_STRING([--disable-konforka],[do not use konforka library (default: use if found)]), | 33 | AC_HELP_STRING([--disable-konforka],[do not use konforka library (default: use if found)]), |
23 | [ | 34 | [ |
24 | test "${enableval}" = "no" && WANT_KONFORKA="no" | 35 | test "${enableval}" = "no" && WANT_KONFORKA="no" |
25 | ] | 36 | ] |
26 | ) | 37 | ) |
27 | if test "${WANT_KONFORKA}" = "yes" ; then | 38 | if test "${WANT_KONFORKA}" = "yes" ; then |
28 | PKG_CHECK_MODULES([KONFORKA],[konforka],[ | 39 | PKG_CHECK_MODULES([KONFORKA],[konforka],[ |
29 | AC_SUBST([KONFORKA_CFLAGS]) | 40 | AC_SUBST([KONFORKA_CFLAGS]) |
30 | AC_SUBST([KONFORKA_LIBS]) | 41 | AC_SUBST([KONFORKA_LIBS]) |
31 | AC_DEFINE([HAVE_KONFORKA],,[defined in presence of konforka library]) | 42 | AC_DEFINE([HAVE_KONFORKA],,[defined in presence of konforka library]) |
32 | AC_DEFINE([OPKELE_HAVE_KONFORKA],,[defined in presence of konforka library]) | 43 | AC_DEFINE([OPKELE_HAVE_KONFORKA],,[defined in presence of konforka library]) |
33 | AC_SUBST([KONFORKA_KONFORKA],[konforka]) | 44 | AC_SUBST([KONFORKA_KONFORKA],[konforka]) |
34 | ],[true]) | 45 | ],[true]) |
35 | fi | 46 | fi |
36 | 47 | ||
37 | WANT_DOXYGEN="yes" | 48 | WANT_DOXYGEN="yes" |
38 | AC_ARG_ENABLE([doxygen], | 49 | AC_ARG_ENABLE([doxygen], |
39 | AC_HELP_STRING([--disable-doxygen],[do not generate documentation]), | 50 | AC_HELP_STRING([--disable-doxygen],[do not generate documentation]), |