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