-rw-r--r-- | configure.ac | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac index e636253..606e644 100644 --- a/configure.ac +++ b/configure.ac | |||
@@ -1,47 +1,48 @@ | |||
1 | AC_INIT([libopkele], [2.0.4], [libopkele-bugs@klever.net]) | 1 | AC_INIT([libopkele], [2.0.4], [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 | AC_CONFIG_MACRO_DIR([aclocal.d]) | 4 | AC_CONFIG_MACRO_DIR([aclocal.d]) |
5 | AC_CONFIG_AUX_DIR([aux.d]) | 5 | AC_CONFIG_AUX_DIR([aux.d]) |
6 | AM_INIT_AUTOMAKE([dist-bzip2]) | 6 | AM_INIT_AUTOMAKE([dist-bzip2]) |
7 | 7 | ||
8 | AC_PROG_INSTALL | 8 | AC_PROG_INSTALL |
9 | AC_PROG_CXX | 9 | AC_PROG_CXX |
10 | AC_PROG_CC | 10 | AC_PROG_CC |
11 | AC_PROG_LIBTOOL | 11 | AC_PROG_LIBTOOL |
12 | PKG_PROG_PKG_CONFIG | 12 | PKG_PROG_PKG_CONFIG |
13 | 13 | ||
14 | AC_HEADER_STDC | 14 | AC_HEADER_STDC |
15 | AC_CHECK_FUNCS([timegm]) | 15 | AC_CHECK_FUNCS([timegm]) |
16 | AC_CHECK_HEADERS([ext/algorithm.h]) | ||
16 | 17 | ||
17 | AC_PATH_PROG([XSLTPROC],[xsltproc],[true]) | 18 | AC_PATH_PROG([XSLTPROC],[xsltproc],[true]) |
18 | 19 | ||
19 | AC_MSG_CHECKING([for source tree version]) | 20 | AC_MSG_CHECKING([for source tree version]) |
20 | if headrev=$(cd $srcdir && git rev-parse --verify HEAD 2>/dev/null) ; then | 21 | if headrev=$(cd $srcdir && git rev-parse --verify HEAD 2>/dev/null) ; then |
21 | PACKAGE_SRC_VERSION="$(cd $srcdir && git describe --tags $headrev)" | 22 | PACKAGE_SRC_VERSION="$(cd $srcdir && git describe --tags $headrev)" |
22 | test "$PACKAGE_SRC_VERSION" = "$PACKAGE_VERSION" \ | 23 | test "$PACKAGE_SRC_VERSION" = "$PACKAGE_VERSION" \ |
23 | -o "${PACKAGE_SRC_VERSION#${PACKAGE_VERSION}-}" != "$PACKAGE_SRC_VERSION" || PACKAGE_SRC_VERSION="${PACKAGE_VERSION}:${PACKAGE_SRC_VERSION}" | 24 | -o "${PACKAGE_SRC_VERSION#${PACKAGE_VERSION}-}" != "$PACKAGE_SRC_VERSION" || PACKAGE_SRC_VERSION="${PACKAGE_VERSION}:${PACKAGE_SRC_VERSION}" |
24 | ( cd $srcdir && git diff-index $headrev | read dirt ) && PACKAGE_SRC_VERSION="${PACKAGE_SRC_VERSION}-dirty" | 25 | ( cd $srcdir && git diff-index $headrev | read dirt ) && PACKAGE_SRC_VERSION="${PACKAGE_SRC_VERSION}-dirty" |
25 | else | 26 | else |
26 | PACKAGE_SRC_VERSION="$PACKAGE_VERSION" | 27 | PACKAGE_SRC_VERSION="$PACKAGE_VERSION" |
27 | fi | 28 | fi |
28 | AC_MSG_RESULT([$PACKAGE_SRC_VERSION]) | 29 | AC_MSG_RESULT([$PACKAGE_SRC_VERSION]) |
29 | AC_SUBST([PACKAGE_SRC_VERSION]) | 30 | AC_SUBST([PACKAGE_SRC_VERSION]) |
30 | AC_DEFINE_UNQUOTED([PACKAGE_SRC_VERSION],["$PACKAGE_SRC_VERSION"],[more or less precise source tree version]) | 31 | AC_DEFINE_UNQUOTED([PACKAGE_SRC_VERSION],["$PACKAGE_SRC_VERSION"],[more or less precise source tree version]) |
31 | 32 | ||
32 | tr1_mem_std="false" | 33 | tr1_mem_std="false" |
33 | tr1_mem_boost="false" | 34 | tr1_mem_boost="false" |
34 | AC_CHECK_SHAREDPTR(std::tr1,tr1/memory,[ tr1_mem_std=true ]) | 35 | AC_CHECK_SHAREDPTR(std::tr1,tr1/memory,[ tr1_mem_std=true ]) |
35 | AC_CHECK_SHAREDPTR(boost,boost/shared_ptr.hpp,[ tr1_mem_boost=true ]) | 36 | AC_CHECK_SHAREDPTR(boost,boost/shared_ptr.hpp,[ tr1_mem_boost=true ]) |
36 | tr1_mem="" | 37 | tr1_mem="" |
37 | AC_ARG_WITH([tr1-memory], | 38 | AC_ARG_WITH([tr1-memory], |
38 | AC_HELP_STRING([--with-tr1-memory=<boost|std>],[select tr1/memory (shared_ptr<>) implementation to use]), | 39 | AC_HELP_STRING([--with-tr1-memory=<boost|std>],[select tr1/memory (shared_ptr<>) implementation to use]), |
39 | [ tr1_mem="$withval" ] | 40 | [ tr1_mem="$withval" ] |
40 | ) | 41 | ) |
41 | AC_MSG_CHECKING([for tr1/memory implementation to use]) | 42 | AC_MSG_CHECKING([for tr1/memory implementation to use]) |
42 | test -z "$tr1_mem" && $tr1_mem_std && tr1_mem=std | 43 | test -z "$tr1_mem" && $tr1_mem_std && tr1_mem=std |
43 | test -z "$tr1_mem" && $tr1_mem_boost && tr1_mem=boost | 44 | test -z "$tr1_mem" && $tr1_mem_boost && tr1_mem=boost |
44 | if test -z "$tr1_mem" ; then | 45 | if test -z "$tr1_mem" ; then |
45 | AC_MSG_RESULT([none found]) | 46 | AC_MSG_RESULT([none found]) |
46 | else | 47 | else |
47 | AC_MSG_RESULT([$tr1_mem]) | 48 | AC_MSG_RESULT([$tr1_mem]) |