-rw-r--r-- | configure.ac | 32 |
1 files changed, 32 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac index 1bd1873..c4e9a74 100644 --- a/configure.ac +++ b/configure.ac | |||
@@ -21,16 +21,47 @@ if headrev=$(cd $srcdir && git rev-parse --verify HEAD 2>/dev/null) ; then | |||
21 | ( cd $srcdir && git diff-index $headrev | read dirt ) && PACKAGE_SRC_VERSION="${PACKAGE_SRC_VERSION}-dirty" | 21 | ( cd $srcdir && git diff-index $headrev | read dirt ) && PACKAGE_SRC_VERSION="${PACKAGE_SRC_VERSION}-dirty" |
22 | else | 22 | else |
23 | PACKAGE_SRC_VERSION="$PACKAGE_VERSION" | 23 | PACKAGE_SRC_VERSION="$PACKAGE_VERSION" |
24 | fi | 24 | fi |
25 | AC_MSG_RESULT([$PACKAGE_SRC_VERSION]) | 25 | AC_MSG_RESULT([$PACKAGE_SRC_VERSION]) |
26 | AC_SUBST([PACKAGE_SRC_VERSION]) | 26 | AC_SUBST([PACKAGE_SRC_VERSION]) |
27 | AC_DEFINE_UNQUOTED([PACKAGE_SRC_VERSION],["$PACKAGE_SRC_VERSION"],[more or less precise source tree version]) | 27 | AC_DEFINE_UNQUOTED([PACKAGE_SRC_VERSION],["$PACKAGE_SRC_VERSION"],[more or less precise source tree version]) |
28 | 28 | ||
29 | tr1_mem_std="false" | ||
30 | tr1_mem_boost="false" | ||
31 | AC_CHECK_SHAREDPTR(std::tr1,tr1/memory,[ tr1_mem_std=true ]) | ||
32 | AC_CHECK_SHAREDPTR(boost,boost/shared_ptr.hpp,[ tr1_mem_boost=true ]) | ||
33 | tr1_mem="" | ||
34 | AC_ARG_WITH([tr1-memory], | ||
35 | AC_HELP_STRING([--with-tr1-memory=<boost|std>],[select tr1/memory (shared_ptr<>) implementation to use]), | ||
36 | [ tr1_mem="$withval" ] | ||
37 | ) | ||
38 | AC_MSG_CHECKING([for tr1/memory implementation to use]) | ||
39 | test -z "$tr1_mem" && $tr1_mem_std && tr1_mem=std | ||
40 | test -z "$tr1_mem" && $tr1_mem_boost && tr1_mem=boost | ||
41 | test -z "$tr1_mem" && AC_MSG_RESULT([none found]) || AC_MSG_RESULT([$tr1_mem]) | ||
42 | case "$tr1_mem" in | ||
43 | std) | ||
44 | $tr1_mem_std || AC_MSG_ERROR([std implementation requested, but not found]) | ||
45 | OPKELE_TR1_MEM_NS=std::tr1 | ||
46 | OPKELE_TR1_MEM_HEADER=tr1/memory | ||
47 | ;; | ||
48 | boost) | ||
49 | $tr1_mem_boost || AC_MSG_ERROR([boost implementation requested, but not found]) | ||
50 | OPKELE_TR1_MEM_NS=boost | ||
51 | OPKELE_TR1_MEM_HEADER=boost/shared_ptr.hpp | ||
52 | ;; | ||
53 | *) | ||
54 | AC_MSG_ERROR([no shared_ptr<> implementation found]) | ||
55 | ;; | ||
56 | esac | ||
57 | AC_SUBST([OPKELE_TR1_MEM_NS]) | ||
58 | AC_SUBST([OPKELE_TR1_MEM_HEADER]) | ||
59 | |||
29 | PKG_CHECK_MODULES([OPENSSL],[openssl],,[ | 60 | PKG_CHECK_MODULES([OPENSSL],[openssl],,[ |
30 | AC_MSG_ERROR([no openssl library found. get one from http://www.openssl.org/]) | 61 | AC_MSG_ERROR([no openssl library found. get one from http://www.openssl.org/]) |
31 | ]) | 62 | ]) |
32 | 63 | ||
33 | WANT_KONFORKA="yes" | 64 | WANT_KONFORKA="yes" |
34 | AC_ARG_ENABLE([konforka], | 65 | AC_ARG_ENABLE([konforka], |
35 | AC_HELP_STRING([--disable-konforka],[do not use konforka library (default: use if found)]), | 66 | AC_HELP_STRING([--disable-konforka],[do not use konforka library (default: use if found)]), |
36 | [ | 67 | [ |
@@ -139,12 +170,13 @@ AC_ARG_ENABLE([xri-proxy], | |||
139 | AC_MSG_RESULT([$xri_proxy_url]) | 170 | AC_MSG_RESULT([$xri_proxy_url]) |
140 | AC_DEFINE_UNQUOTED([XRI_PROXY_URL],["$xri_proxy_url"],[XRI proxy resolver URL]) | 171 | AC_DEFINE_UNQUOTED([XRI_PROXY_URL],["$xri_proxy_url"],[XRI proxy resolver URL]) |
141 | 172 | ||
142 | AC_CONFIG_FILES([ | 173 | AC_CONFIG_FILES([ |
143 | Makefile | 174 | Makefile |
144 | libopkele.pc | 175 | libopkele.pc |
145 | Doxyfile | 176 | Doxyfile |
146 | include/Makefile | 177 | include/Makefile |
178 | include/opkele/tr1-mem.h | ||
147 | lib/Makefile | 179 | lib/Makefile |
148 | test/Makefile | 180 | test/Makefile |
149 | ]) | 181 | ]) |
150 | AC_OUTPUT | 182 | AC_OUTPUT |