| author | Michael Krelin <hacker@klever.net> | 2008-01-20 20:57:20 (UTC) |
|---|---|---|
| committer | Michael Krelin <hacker@klever.net> | 2008-01-20 20:57:20 (UTC) |
| commit | e87c920413b8443e83a57b7f1edf72b0cdb8b6c1 (patch) (side-by-side diff) | |
| tree | 4c6eef9b79985c4fdb45faca6644647b582d1a29 | |
| parent | 2f82a7acabcb00c6785151f9aca3d4270f3914b7 (diff) | |
| download | libopkele-e87c920413b8443e83a57b7f1edf72b0cdb8b6c1.zip libopkele-e87c920413b8443e83a57b7f1edf72b0cdb8b6c1.tar.gz libopkele-e87c920413b8443e83a57b7f1edf72b0cdb8b6c1.tar.bz2 | |
merging the private rewrite branch, configure.ac
* bump version. two leading components are getting in sync with OpenID
protocol version now, which means it's going to be 2.0 by the time I finish
2.0 support.
* add checks for some optional gcc features.
* check for optional dependencies needed to build test RP CGI, namely -
sqlite3, kingate, libuuid.
* change XRI resolver proxy to non-beta https.
| -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,2 +1,2 @@ -AC_INIT([libopkele], [0.4], [libopkele-bugs@klever.net]) +AC_INIT([libopkele], [1.1.99.0], [libopkele-bugs@klever.net]) AC_CONFIG_SRCDIR([include/opkele/opkele-config.h]) @@ -63,2 +63,37 @@ AC_SUBST([OPKELE_TR1_MEM_HEADER]) +AC_MSG_CHECKING([for deprecated attribute support]) +AC_COMPILE_IFELSE([ + int __attribute__((deprecated)) deprecated_function(); + ],[ + AC_MSG_RESULT([yes]) + AC_DEFINE([OPKELE_DEPRECATE],[__attribute__((deprecated))],[deprecated function attribute]) + ],[ + AC_MSG_RESULT([no]) + AC_DEFINE([OPKELE_DEPRECATE],,[deprecated function attribute]) + ] +) + +AC_LANG_PUSH([C++]) +AC_MSG_CHECKING([for abi::__cxa_demangle]) +AC_COMPILE_IFELSE([ + #include <typeinfo> + using namespace std; + #include <cxxabi.h> + int main(int c,char **v) { + int dstat; + char *demangled = abi::__cxa_demangle(typeid(dstat).name(),0,0,&dstat); + return 0; + } + ],[ + AC_MSG_RESULT([yes]) + AC_DEFINE([HAVE_DEMANGLE],,[defined if abi::__cxa_demangle is available]) + ],[ + AC_MSG_RESULT([no]) + ] +) +AC_LANG_POP([C++]) + + + + PKG_CHECK_MODULES([OPENSSL],[openssl],,[ @@ -139,2 +174,9 @@ fi +PKG_CHECK_MODULES([SQLITE3],[sqlite3],[have_sqlite3=true],[have_sqlite3=false]) +AM_CONDITIONAL([HAVE_SQLITE3],[$have_sqlite3]) +PKG_CHECK_MODULES([KINGATE],[kingate-plaincgi],[have_kingate=true],[have_kingate=false]) +AM_CONDITIONAL([HAVE_KINGATE],[$have_kingate]) +PKG_CHECK_MODULES([UUID],[uuid],[have_uuid=true],[have_uuid=false]) +AM_CONDITIONAL([HAVE_UUID],[$have_uuid]) + curl_ssl_verify_host="true" @@ -192,6 +234,6 @@ AC_SUBST([CPPFLAGS_DEBUG]) -xri_proxy_url="http://beta.xri.net/" +xri_proxy_url="https://xri.net/" AC_MSG_CHECKING([for XRI resolver proxy]) AC_ARG_ENABLE([xri-proxy], - AC_HELP_STRING([--with-xri-proxy=url],[set xri proxy for use when resolving xri identities, default is http://xr_proxy_url]), + AC_HELP_STRING([--with-xri-proxy=url],[set xri proxy for use when resolving xri identities, default is https://xri.net/]), [ xri_proxy_url="$withval" ] |