-rw-r--r-- | configure.ac | 48 |
1 files changed, 45 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac index c28141c..a49177f 100644 --- a/configure.ac +++ b/configure.ac | |||
@@ -1,5 +1,5 @@ | |||
1 | AC_INIT([libopkele], [0.4], [libopkele-bugs@klever.net]) | 1 | AC_INIT([libopkele], [1.1.99.0], [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 | AM_INIT_AUTOMAKE([dist-bzip2]) | 4 | AM_INIT_AUTOMAKE([dist-bzip2]) |
5 | 5 | ||
@@ -60,8 +60,43 @@ case "$tr1_mem" in | |||
60 | esac | 60 | esac |
61 | AC_SUBST([OPKELE_TR1_MEM_NS]) | 61 | AC_SUBST([OPKELE_TR1_MEM_NS]) |
62 | AC_SUBST([OPKELE_TR1_MEM_HEADER]) | 62 | AC_SUBST([OPKELE_TR1_MEM_HEADER]) |
63 | 63 | ||
64 | AC_MSG_CHECKING([for deprecated attribute support]) | ||
65 | AC_COMPILE_IFELSE([ | ||
66 | int __attribute__((deprecated)) deprecated_function(); | ||
67 | ],[ | ||
68 | AC_MSG_RESULT([yes]) | ||
69 | AC_DEFINE([OPKELE_DEPRECATE],[__attribute__((deprecated))],[deprecated function attribute]) | ||
70 | ],[ | ||
71 | AC_MSG_RESULT([no]) | ||
72 | AC_DEFINE([OPKELE_DEPRECATE],,[deprecated function attribute]) | ||
73 | ] | ||
74 | ) | ||
75 | |||
76 | AC_LANG_PUSH([C++]) | ||
77 | AC_MSG_CHECKING([for abi::__cxa_demangle]) | ||
78 | AC_COMPILE_IFELSE([ | ||
79 | #include <typeinfo> | ||
80 | using namespace std; | ||
81 | #include <cxxabi.h> | ||
82 | int main(int c,char **v) { | ||
83 | int dstat; | ||
84 | char *demangled = abi::__cxa_demangle(typeid(dstat).name(),0,0,&dstat); | ||
85 | return 0; | ||
86 | } | ||
87 | ],[ | ||
88 | AC_MSG_RESULT([yes]) | ||
89 | AC_DEFINE([HAVE_DEMANGLE],,[defined if abi::__cxa_demangle is available]) | ||
90 | ],[ | ||
91 | AC_MSG_RESULT([no]) | ||
92 | ] | ||
93 | ) | ||
94 | AC_LANG_POP([C++]) | ||
95 | |||
96 | |||
97 | |||
98 | |||
64 | PKG_CHECK_MODULES([OPENSSL],[openssl],,[ | 99 | PKG_CHECK_MODULES([OPENSSL],[openssl],,[ |
65 | AC_MSG_ERROR([no openssl library found. get one from http://www.openssl.org/]) | 100 | AC_MSG_ERROR([no openssl library found. get one from http://www.openssl.org/]) |
66 | ]) | 101 | ]) |
67 | 102 | ||
@@ -136,8 +171,15 @@ else | |||
136 | AC_MSG_ERROR([no libpcre found, go get it at http://www.pcre.org/]) | 171 | AC_MSG_ERROR([no libpcre found, go get it at http://www.pcre.org/]) |
137 | ]) | 172 | ]) |
138 | fi | 173 | fi |
139 | 174 | ||
175 | PKG_CHECK_MODULES([SQLITE3],[sqlite3],[have_sqlite3=true],[have_sqlite3=false]) | ||
176 | AM_CONDITIONAL([HAVE_SQLITE3],[$have_sqlite3]) | ||
177 | PKG_CHECK_MODULES([KINGATE],[kingate-plaincgi],[have_kingate=true],[have_kingate=false]) | ||
178 | AM_CONDITIONAL([HAVE_KINGATE],[$have_kingate]) | ||
179 | PKG_CHECK_MODULES([UUID],[uuid],[have_uuid=true],[have_uuid=false]) | ||
180 | AM_CONDITIONAL([HAVE_UUID],[$have_uuid]) | ||
181 | |||
140 | curl_ssl_verify_host="true" | 182 | curl_ssl_verify_host="true" |
141 | AC_ARG_ENABLE([ssl-verify-host], | 183 | AC_ARG_ENABLE([ssl-verify-host], |
142 | AC_HELP_STRING([--disable-ssl-verify-host],[disable cURL cert/host relationships verification]), | 184 | AC_HELP_STRING([--disable-ssl-verify-host],[disable cURL cert/host relationships verification]), |
143 | [ test "${enableval}" = "no" && curl_ssl_verify_host="false" ] | 185 | [ test "${enableval}" = "no" && curl_ssl_verify_host="false" ] |
@@ -189,12 +231,12 @@ else | |||
189 | CPPFLAGS_DEBUG="" | 231 | CPPFLAGS_DEBUG="" |
190 | fi | 232 | fi |
191 | AC_SUBST([CPPFLAGS_DEBUG]) | 233 | AC_SUBST([CPPFLAGS_DEBUG]) |
192 | 234 | ||
193 | xri_proxy_url="http://beta.xri.net/" | 235 | xri_proxy_url="https://xri.net/" |
194 | AC_MSG_CHECKING([for XRI resolver proxy]) | 236 | AC_MSG_CHECKING([for XRI resolver proxy]) |
195 | AC_ARG_ENABLE([xri-proxy], | 237 | AC_ARG_ENABLE([xri-proxy], |
196 | AC_HELP_STRING([--with-xri-proxy=url],[set xri proxy for use when resolving xri identities, default is http://xr_proxy_url]), | 238 | AC_HELP_STRING([--with-xri-proxy=url],[set xri proxy for use when resolving xri identities, default is https://xri.net/]), |
197 | [ xri_proxy_url="$withval" ] | 239 | [ xri_proxy_url="$withval" ] |
198 | ) | 240 | ) |
199 | AC_MSG_RESULT([$xri_proxy_url]) | 241 | AC_MSG_RESULT([$xri_proxy_url]) |
200 | AC_DEFINE_UNQUOTED([XRI_PROXY_URL],["$xri_proxy_url"],[XRI proxy resolver URL]) | 242 | AC_DEFINE_UNQUOTED([XRI_PROXY_URL],["$xri_proxy_url"],[XRI proxy resolver URL]) |