author | Michael Krelin <hacker@klever.net> | 2007-12-27 00:08:36 (UTC) |
---|---|---|
committer | Michael Krelin <hacker@klever.net> | 2008-01-04 18:17:46 (UTC) |
commit | ed6883769a03b36402c2c78b1dcee0c7efeb70bc (patch) (unidiff) | |
tree | ec96f9c7feeb02d2822ec9872b937b54ab82fb8a /configure.ac | |
parent | e63de16a9885641b5070ec834225cb562bc2042f (diff) | |
download | libopkele-ed6883769a03b36402c2c78b1dcee0c7efeb70bc.zip libopkele-ed6883769a03b36402c2c78b1dcee0c7efeb70bc.tar.gz libopkele-ed6883769a03b36402c2c78b1dcee0c7efeb70bc.tar.bz2 |
changed auto_ptr to shared_ptr
Signed-off-by: Michael Krelin <hacker@klever.net>
-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 | |||
@@ -5,48 +5,79 @@ 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]) | 16 | AC_MSG_CHECKING([for source tree version]) |
17 | if headrev=$(cd $srcdir && git rev-parse --verify HEAD 2>/dev/null) ; then | 17 | if headrev=$(cd $srcdir && git rev-parse --verify HEAD 2>/dev/null) ; then |
18 | PACKAGE_SRC_VERSION="$(cd $srcdir && git describe --tags $headrev)" | 18 | PACKAGE_SRC_VERSION="$(cd $srcdir && git describe --tags $headrev)" |
19 | test "$PACKAGE_SRC_VERSION" = "$PACKAGE_VERSION" \ | 19 | test "$PACKAGE_SRC_VERSION" = "$PACKAGE_VERSION" \ |
20 | -o "${PACKAGE_SRC_VERSION#${PACKAGE_VERSION}-}" != "$PACKAGE_SRC_VERSION" || PACKAGE_SRC_VERSION="${PACKAGE_VERSION}:${PACKAGE_SRC_VERSION}" | 20 | -o "${PACKAGE_SRC_VERSION#${PACKAGE_VERSION}-}" != "$PACKAGE_SRC_VERSION" || PACKAGE_SRC_VERSION="${PACKAGE_VERSION}:${PACKAGE_SRC_VERSION}" |
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 | [ |
37 | test "${enableval}" = "no" && WANT_KONFORKA="no" | 68 | test "${enableval}" = "no" && WANT_KONFORKA="no" |
38 | ] | 69 | ] |
39 | ) | 70 | ) |
40 | if test "${WANT_KONFORKA}" = "yes" ; then | 71 | if test "${WANT_KONFORKA}" = "yes" ; then |
41 | PKG_CHECK_MODULES([KONFORKA],[konforka],[ | 72 | PKG_CHECK_MODULES([KONFORKA],[konforka],[ |
42 | AC_SUBST([KONFORKA_CFLAGS]) | 73 | AC_SUBST([KONFORKA_CFLAGS]) |
43 | AC_SUBST([KONFORKA_LIBS]) | 74 | AC_SUBST([KONFORKA_LIBS]) |
44 | AC_DEFINE([HAVE_KONFORKA],,[defined in presence of konforka library]) | 75 | AC_DEFINE([HAVE_KONFORKA],,[defined in presence of konforka library]) |
45 | AC_DEFINE([OPKELE_HAVE_KONFORKA],,[defined in presence of konforka library]) | 76 | AC_DEFINE([OPKELE_HAVE_KONFORKA],,[defined in presence of konforka library]) |
46 | AC_SUBST([KONFORKA_KONFORKA],[konforka]) | 77 | AC_SUBST([KONFORKA_KONFORKA],[konforka]) |
47 | ],[true]) | 78 | ],[true]) |
48 | fi | 79 | fi |
49 | 80 | ||
50 | WANT_DOXYGEN="yes" | 81 | WANT_DOXYGEN="yes" |
51 | AC_ARG_ENABLE([doxygen], | 82 | AC_ARG_ENABLE([doxygen], |
52 | AC_HELP_STRING([--disable-doxygen],[do not generate documentation]), | 83 | AC_HELP_STRING([--disable-doxygen],[do not generate documentation]), |
@@ -123,28 +154,29 @@ if $nitpick ; then | |||
123 | -Wredundant-decls -ansi" | 154 | -Wredundant-decls -ansi" |
124 | # -Wlogical-op -Wmissing-noreturn | 155 | # -Wlogical-op -Wmissing-noreturn |
125 | C_NITPICK="$CPP_NITPICK" | 156 | C_NITPICK="$CPP_NITPICK" |
126 | CXX_NITPICK="$C_NITPICK" | 157 | CXX_NITPICK="$C_NITPICK" |
127 | 158 | ||
128 | CPPFLAGS="$CPPFLAGS $CPP_NITPICK" | 159 | CPPFLAGS="$CPPFLAGS $CPP_NITPICK" |
129 | CFLAGS="$CFLAGS $C_NITPICK" | 160 | CFLAGS="$CFLAGS $C_NITPICK" |
130 | CXXFLAGS="$CXXFLAGS $CXX_NITPICK" | 161 | CXXFLAGS="$CXXFLAGS $CXX_NITPICK" |
131 | fi | 162 | fi |
132 | 163 | ||
133 | xri_proxy_url="http://beta.xri.net/" | 164 | xri_proxy_url="http://beta.xri.net/" |
134 | AC_MSG_CHECKING([for XRI resolver proxy]) | 165 | AC_MSG_CHECKING([for XRI resolver proxy]) |
135 | AC_ARG_ENABLE([xri-proxy], | 166 | AC_ARG_ENABLE([xri-proxy], |
136 | AC_HELP_STRING([--with-xri-proxy=url],[set xri proxy for use when resolving xri identities, default is http://xr_proxy_url]), | 167 | AC_HELP_STRING([--with-xri-proxy=url],[set xri proxy for use when resolving xri identities, default is http://xr_proxy_url]), |
137 | [ xri_proxy_url="$withval" ] | 168 | [ xri_proxy_url="$withval" ] |
138 | ) | 169 | ) |
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 |