author | Michael Krelin <hacker@klever.net> | 2009-09-01 20:19:45 (UTC) |
---|---|---|
committer | Michael Krelin <hacker@klever.net> | 2009-09-01 20:19:45 (UTC) |
commit | 5e8d46cb591582918f4d3d4bbdbd29fee207498a (patch) (unidiff) | |
tree | 32d202bde2c99722433eb601390f38a168be640f /configure.ac | |
parent | da3fe98e5c75940135fcd9bb45b36eed62d8b4dc (diff) | |
download | libopkele-5e8d46cb591582918f4d3d4bbdbd29fee207498a.zip libopkele-5e8d46cb591582918f4d3d4bbdbd29fee207498a.tar.gz libopkele-5e8d46cb591582918f4d3d4bbdbd29fee207498a.tar.bz2 |
updated news and bumped version to 2.0.32.0.3public/master
Signed-off-by: Michael Krelin <hacker@klever.net>
-rw-r--r-- | configure.ac | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index 9fc5c9d..5fb6bec 100644 --- a/configure.ac +++ b/configure.ac | |||
@@ -1,97 +1,97 @@ | |||
1 | AC_INIT([libopkele], [2.0.2], [libopkele-bugs@klever.net]) | 1 | AC_INIT([libopkele], [2.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 | 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 | 16 | ||
17 | AC_PATH_PROG([XSLTPROC],[xsltproc],[true]) | 17 | AC_PATH_PROG([XSLTPROC],[xsltproc],[true]) |
18 | 18 | ||
19 | AC_MSG_CHECKING([for source tree version]) | 19 | AC_MSG_CHECKING([for source tree version]) |
20 | if headrev=$(cd $srcdir && git rev-parse --verify HEAD 2>/dev/null) ; then | 20 | if headrev=$(cd $srcdir && git rev-parse --verify HEAD 2>/dev/null) ; then |
21 | PACKAGE_SRC_VERSION="$(cd $srcdir && git describe --tags $headrev)" | 21 | PACKAGE_SRC_VERSION="$(cd $srcdir && git describe --tags $headrev)" |
22 | test "$PACKAGE_SRC_VERSION" = "$PACKAGE_VERSION" \ | 22 | test "$PACKAGE_SRC_VERSION" = "$PACKAGE_VERSION" \ |
23 | -o "${PACKAGE_SRC_VERSION#${PACKAGE_VERSION}-}" != "$PACKAGE_SRC_VERSION" || PACKAGE_SRC_VERSION="${PACKAGE_VERSION}:${PACKAGE_SRC_VERSION}" | 23 | -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" | 24 | ( cd $srcdir && git diff-index $headrev | read dirt ) && PACKAGE_SRC_VERSION="${PACKAGE_SRC_VERSION}-dirty" |
25 | else | 25 | else |
26 | PACKAGE_SRC_VERSION="$PACKAGE_VERSION" | 26 | PACKAGE_SRC_VERSION="$PACKAGE_VERSION" |
27 | fi | 27 | fi |
28 | AC_MSG_RESULT([$PACKAGE_SRC_VERSION]) | 28 | AC_MSG_RESULT([$PACKAGE_SRC_VERSION]) |
29 | AC_SUBST([PACKAGE_SRC_VERSION]) | 29 | AC_SUBST([PACKAGE_SRC_VERSION]) |
30 | AC_DEFINE_UNQUOTED([PACKAGE_SRC_VERSION],["$PACKAGE_SRC_VERSION"],[more or less precise source tree version]) | 30 | AC_DEFINE_UNQUOTED([PACKAGE_SRC_VERSION],["$PACKAGE_SRC_VERSION"],[more or less precise source tree version]) |
31 | 31 | ||
32 | tr1_mem_std="false" | 32 | tr1_mem_std="false" |
33 | tr1_mem_boost="false" | 33 | tr1_mem_boost="false" |
34 | AC_CHECK_SHAREDPTR(std::tr1,tr1/memory,[ tr1_mem_std=true ]) | 34 | AC_CHECK_SHAREDPTR(std::tr1,tr1/memory,[ tr1_mem_std=true ]) |
35 | AC_CHECK_SHAREDPTR(boost,boost/shared_ptr.hpp,[ tr1_mem_boost=true ]) | 35 | AC_CHECK_SHAREDPTR(boost,boost/shared_ptr.hpp,[ tr1_mem_boost=true ]) |
36 | tr1_mem="" | 36 | tr1_mem="" |
37 | AC_ARG_WITH([tr1-memory], | 37 | AC_ARG_WITH([tr1-memory], |
38 | AC_HELP_STRING([--with-tr1-memory=<boost|std>],[select tr1/memory (shared_ptr<>) implementation to use]), | 38 | AC_HELP_STRING([--with-tr1-memory=<boost|std>],[select tr1/memory (shared_ptr<>) implementation to use]), |
39 | [ tr1_mem="$withval" ] | 39 | [ tr1_mem="$withval" ] |
40 | ) | 40 | ) |
41 | AC_MSG_CHECKING([for tr1/memory implementation to use]) | 41 | AC_MSG_CHECKING([for tr1/memory implementation to use]) |
42 | test -z "$tr1_mem" && $tr1_mem_std && tr1_mem=std | 42 | test -z "$tr1_mem" && $tr1_mem_std && tr1_mem=std |
43 | test -z "$tr1_mem" && $tr1_mem_boost && tr1_mem=boost | 43 | test -z "$tr1_mem" && $tr1_mem_boost && tr1_mem=boost |
44 | if test -z "$tr1_mem" ; then | 44 | if test -z "$tr1_mem" ; then |
45 | AC_MSG_RESULT([none found]) | 45 | AC_MSG_RESULT([none found]) |
46 | else | 46 | else |
47 | AC_MSG_RESULT([$tr1_mem]) | 47 | AC_MSG_RESULT([$tr1_mem]) |
48 | fi | 48 | fi |
49 | case "$tr1_mem" in | 49 | case "$tr1_mem" in |
50 | std) | 50 | std) |
51 | $tr1_mem_std || AC_MSG_ERROR([std implementation requested, but not found]) | 51 | $tr1_mem_std || AC_MSG_ERROR([std implementation requested, but not found]) |
52 | OPKELE_TR1_MEM_NS=std::tr1 | 52 | OPKELE_TR1_MEM_NS=std::tr1 |
53 | OPKELE_TR1_MEM_HEADER=tr1/memory | 53 | OPKELE_TR1_MEM_HEADER=tr1/memory |
54 | ;; | 54 | ;; |
55 | boost) | 55 | boost) |
56 | $tr1_mem_boost || AC_MSG_ERROR([boost implementation requested, but not found]) | 56 | $tr1_mem_boost || AC_MSG_ERROR([boost implementation requested, but not found]) |
57 | OPKELE_TR1_MEM_NS=boost | 57 | OPKELE_TR1_MEM_NS=boost |
58 | OPKELE_TR1_MEM_HEADER=boost/shared_ptr.hpp | 58 | OPKELE_TR1_MEM_HEADER=boost/shared_ptr.hpp |
59 | ;; | 59 | ;; |
60 | *) | 60 | *) |
61 | AC_MSG_ERROR([no shared_ptr<> implementation found]) | 61 | AC_MSG_ERROR([no shared_ptr<> implementation found]) |
62 | ;; | 62 | ;; |
63 | esac | 63 | esac |
64 | AC_SUBST([OPKELE_TR1_MEM_NS]) | 64 | AC_SUBST([OPKELE_TR1_MEM_NS]) |
65 | AC_SUBST([OPKELE_TR1_MEM_HEADER]) | 65 | AC_SUBST([OPKELE_TR1_MEM_HEADER]) |
66 | 66 | ||
67 | AC_MSG_CHECKING([for deprecated attribute support]) | 67 | AC_MSG_CHECKING([for deprecated attribute support]) |
68 | AC_COMPILE_IFELSE([ | 68 | AC_COMPILE_IFELSE([ |
69 | int __attribute__((deprecated)) deprecated_function(); | 69 | int __attribute__((deprecated)) deprecated_function(); |
70 | ],[ | 70 | ],[ |
71 | AC_MSG_RESULT([yes]) | 71 | AC_MSG_RESULT([yes]) |
72 | AC_DEFINE([OPKELE_DEPRECATE],[__attribute__((deprecated))],[deprecated function attribute]) | 72 | AC_DEFINE([OPKELE_DEPRECATE],[__attribute__((deprecated))],[deprecated function attribute]) |
73 | ],[ | 73 | ],[ |
74 | AC_MSG_RESULT([no]) | 74 | AC_MSG_RESULT([no]) |
75 | AC_DEFINE([OPKELE_DEPRECATE],,[deprecated function attribute]) | 75 | AC_DEFINE([OPKELE_DEPRECATE],,[deprecated function attribute]) |
76 | ] | 76 | ] |
77 | ) | 77 | ) |
78 | 78 | ||
79 | AC_LANG_PUSH([C++]) | 79 | AC_LANG_PUSH([C++]) |
80 | AC_MSG_CHECKING([for abi::__cxa_demangle]) | 80 | AC_MSG_CHECKING([for abi::__cxa_demangle]) |
81 | AC_COMPILE_IFELSE([ | 81 | AC_COMPILE_IFELSE([ |
82 | #include <typeinfo> | 82 | #include <typeinfo> |
83 | using namespace std; | 83 | using namespace std; |
84 | #include <cxxabi.h> | 84 | #include <cxxabi.h> |
85 | int main(int c,char **v) { | 85 | int main(int c,char **v) { |
86 | int dstat; | 86 | int dstat; |
87 | char *demangled = abi::__cxa_demangle(typeid(dstat).name(),0,0,&dstat); | 87 | char *demangled = abi::__cxa_demangle(typeid(dstat).name(),0,0,&dstat); |
88 | return 0; | 88 | return 0; |
89 | } | 89 | } |
90 | ],[ | 90 | ],[ |
91 | AC_MSG_RESULT([yes]) | 91 | AC_MSG_RESULT([yes]) |
92 | AC_DEFINE([HAVE_DEMANGLE],,[defined if abi::__cxa_demangle is available]) | 92 | AC_DEFINE([HAVE_DEMANGLE],,[defined if abi::__cxa_demangle is available]) |
93 | ],[ | 93 | ],[ |
94 | AC_MSG_RESULT([no]) | 94 | AC_MSG_RESULT([no]) |
95 | ] | 95 | ] |
96 | ) | 96 | ) |
97 | AC_LANG_POP([C++]) | 97 | AC_LANG_POP([C++]) |