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 | |
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-- | NEWS.xml | 5 | ||||
-rw-r--r-- | configure.ac | 2 |
2 files changed, 6 insertions, 1 deletions
@@ -1,71 +1,76 @@ | |||
1 | <?xml version="1.0" encoding="us-ascii"?> | 1 | <?xml version="1.0" encoding="us-ascii"?> |
2 | <news> | 2 | <news> |
3 | <version version="2.0.3" date="September 1st, 2009"> | ||
4 | <ni>Fixed an URI normalization bug misnormalizing URIs with a single-character | ||
5 | trailing component</ni> | ||
6 | <ni>build improvements</ni> | ||
7 | </version> | ||
3 | <version version="2.0.2" date="April 11th, 2009"> | 8 | <version version="2.0.2" date="April 11th, 2009"> |
4 | <ni>Handling of unknown encodings during discovery</ni> | 9 | <ni>Handling of unknown encodings during discovery</ni> |
5 | <ni>Discovery robustness improvements</ni> | 10 | <ni>Discovery robustness improvements</ni> |
6 | <ni>Workaround for OPs (e.g. livejournal.com) breaking specs</ni> | 11 | <ni>Workaround for OPs (e.g. livejournal.com) breaking specs</ni> |
7 | <ni>Build fixes and improvements</ni> | 12 | <ni>Build fixes and improvements</ni> |
8 | </version> | 13 | </version> |
9 | <version version="2.0.1" date="November 22nd, 2008"> | 14 | <version version="2.0.1" date="November 22nd, 2008"> |
10 | <ni>Compile-time fixes and improvements</ni> | 15 | <ni>Compile-time fixes and improvements</ni> |
11 | <ni>Portability improvements for FreeBSD</ni> | 16 | <ni>Portability improvements for FreeBSD</ni> |
12 | <ni>Really suppress debugging message from htmltidy when --disable-debug is in | 17 | <ni>Really suppress debugging message from htmltidy when --disable-debug is in |
13 | effect</ni> | 18 | effect</ni> |
14 | <ni>minor bugfixes</ni> | 19 | <ni>minor bugfixes</ni> |
15 | <ni>thread-safety improvements</ni> | 20 | <ni>thread-safety improvements</ni> |
16 | </version> | 21 | </version> |
17 | <version version="2.0" date="June 26th, 2008"> | 22 | <version version="2.0" date="June 26th, 2008"> |
18 | <ni>OpenID 2.0 support</ni> | 23 | <ni>OpenID 2.0 support</ni> |
19 | <ni>Major rewrite of the whole thing</ni> | 24 | <ni>Major rewrite of the whole thing</ni> |
20 | <ni>Support for XRDS (YADIS and XRI/inames) discovery</ni> | 25 | <ni>Support for XRDS (YADIS and XRI/inames) discovery</ni> |
21 | <ni>Sheerly improved html-based discovery (only code using new, 2.0-enabled | 26 | <ni>Sheerly improved html-based discovery (only code using new, 2.0-enabled |
22 | classes benefits from it)</ni> | 27 | classes benefits from it)</ni> |
23 | <ni>Deprecation of the old api</ni> | 28 | <ni>Deprecation of the old api</ni> |
24 | <ni>Added sample RP and OP implementations</ni> | 29 | <ni>Added sample RP and OP implementations</ni> |
25 | <ni>Require expat xml stream parser library</ni> | 30 | <ni>Require expat xml stream parser library</ni> |
26 | <ni>Require htmltidy library</ni> | 31 | <ni>Require htmltidy library</ni> |
27 | <ni>Require tr1/memory (shared_ptr) support - either modern gcc or boost | 32 | <ni>Require tr1/memory (shared_ptr) support - either modern gcc or boost |
28 | library</ni> | 33 | library</ni> |
29 | </version> | 34 | </version> |
30 | <version version="0.3.2" date="November 22nd, 2007"> | 35 | <version version="0.3.2" date="November 22nd, 2007"> |
31 | <ni>code cleanup for stricter compiler</ni> | 36 | <ni>code cleanup for stricter compiler</ni> |
32 | </version> | 37 | </version> |
33 | <version version="0.3.1" date="November 20th, 2007"> | 38 | <version version="0.3.1" date="November 20th, 2007"> |
34 | <ni>more robustness improvements in links discovery</ni> | 39 | <ni>more robustness improvements in links discovery</ni> |
35 | <ni>removed dependency on pcre c++ bindings, because there are few of them and | 40 | <ni>removed dependency on pcre c++ bindings, because there are few of them and |
36 | not everyone likes all of them</ni> | 41 | not everyone likes all of them</ni> |
37 | <ni>minor build improvements</ni> | 42 | <ni>minor build improvements</ni> |
38 | </version> | 43 | </version> |
39 | <version version="0.3" date="August 9th, 2007"> | 44 | <version version="0.3" date="August 9th, 2007"> |
40 | <ni>fixed canonicalization procedure to be specs-compliant. Note, that the old | 45 | <ni>fixed canonicalization procedure to be specs-compliant. Note, that the old |
41 | consumer_t::canonicalize is now called consumer_t::normalize and the | 46 | consumer_t::canonicalize is now called consumer_t::normalize and the |
42 | canonicalize memeber is now virtual to allow caching layer, not static</ni> | 47 | canonicalize memeber is now virtual to allow caching layer, not static</ni> |
43 | <ni>robustness improvement in handling associations expiry</ni> | 48 | <ni>robustness improvement in handling associations expiry</ni> |
44 | <ni>minor documentation updates</ni> | 49 | <ni>minor documentation updates</ni> |
45 | </version> | 50 | </version> |
46 | <version version="0.2.1" date="June 24th, 2007"> | 51 | <version version="0.2.1" date="June 24th, 2007"> |
47 | <ni>open id server invalid signature bugfix</ni> | 52 | <ni>open id server invalid signature bugfix</ni> |
48 | </version> | 53 | </version> |
49 | <version version="0.2" date="June 19th, 2007"> | 54 | <version version="0.2" date="June 19th, 2007"> |
50 | <ni>A few robustness improvements and optimizations</ni> | 55 | <ni>A few robustness improvements and optimizations</ni> |
51 | <ni>More liberal key/values messages parsing</ni> | 56 | <ni>More liberal key/values messages parsing</ni> |
52 | <ni>Changed unusable --with-pcre++ configure option to --with-pcrepp</ni> | 57 | <ni>Changed unusable --with-pcre++ configure option to --with-pcrepp</ni> |
53 | </version> | 58 | </version> |
54 | <version version="0.1.1" date="January 16th, 2007"> | 59 | <version version="0.1.1" date="January 16th, 2007"> |
55 | <ni>Fixed a bug in curl errors handling</ni> | 60 | <ni>Fixed a bug in curl errors handling</ni> |
56 | <ni>added --disable-ssl-verify-host and --disable-ssl-verify-peer options to | 61 | <ni>added --disable-ssl-verify-host and --disable-ssl-verify-peer options to |
57 | configure to alter default implementation of consumer's retrieve_links | 62 | configure to alter default implementation of consumer's retrieve_links |
58 | behaviour</ni> | 63 | behaviour</ni> |
59 | <ni>Build fix that eliminates the need to pass --disable-konforka in the | 64 | <ni>Build fix that eliminates the need to pass --disable-konforka in the |
60 | absence of it.</ni> | 65 | absence of it.</ni> |
61 | </version> | 66 | </version> |
62 | <version version="0.1" date="January 12th, 2007"> | 67 | <version version="0.1" date="January 12th, 2007"> |
63 | <ni>OpenID simple registration extension implementation</ni> | 68 | <ni>OpenID simple registration extension implementation</ni> |
64 | <ni>OpenID extensions framework</ni> | 69 | <ni>OpenID extensions framework</ni> |
65 | <ni>Canonicalization bugfix</ni> | 70 | <ni>Canonicalization bugfix</ni> |
66 | <ni>Slightly improved interoperability with buggy implementations</ni> | 71 | <ni>Slightly improved interoperability with buggy implementations</ni> |
67 | </version> | 72 | </version> |
68 | <version version="0.0" date="July 25th, 2005"> | 73 | <version version="0.0" date="July 25th, 2005"> |
69 | <ni>Initial release</ni> | 74 | <ni>Initial release</ni> |
70 | </version> | 75 | </version> |
71 | </news> | 76 | </news> |
diff --git a/configure.ac b/configure.ac index 9fc5c9d..5fb6bec 100644 --- a/configure.ac +++ b/configure.ac | |||
@@ -1,261 +1,261 @@ | |||
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++]) |
98 | 98 | ||
99 | 99 | ||
100 | 100 | ||
101 | 101 | ||
102 | PKG_CHECK_MODULES([OPENSSL],[openssl],,[ | 102 | PKG_CHECK_MODULES([OPENSSL],[openssl],,[ |
103 | AC_MSG_ERROR([no openssl library found. get one from http://www.openssl.org/]) | 103 | AC_MSG_ERROR([no openssl library found. get one from http://www.openssl.org/]) |
104 | ]) | 104 | ]) |
105 | 105 | ||
106 | WANT_KONFORKA="yes" | 106 | WANT_KONFORKA="yes" |
107 | AC_ARG_ENABLE([konforka], | 107 | AC_ARG_ENABLE([konforka], |
108 | AC_HELP_STRING([--disable-konforka],[do not use konforka library (default: use if found)]), | 108 | AC_HELP_STRING([--disable-konforka],[do not use konforka library (default: use if found)]), |
109 | [ | 109 | [ |
110 | test "${enableval}" = "no" && WANT_KONFORKA="no" | 110 | test "${enableval}" = "no" && WANT_KONFORKA="no" |
111 | ] | 111 | ] |
112 | ) | 112 | ) |
113 | if test "${WANT_KONFORKA}" = "yes" ; then | 113 | if test "${WANT_KONFORKA}" = "yes" ; then |
114 | PKG_CHECK_MODULES([KONFORKA],[konforka],[ | 114 | PKG_CHECK_MODULES([KONFORKA],[konforka],[ |
115 | AC_SUBST([KONFORKA_CFLAGS]) | 115 | AC_SUBST([KONFORKA_CFLAGS]) |
116 | AC_SUBST([KONFORKA_LIBS]) | 116 | AC_SUBST([KONFORKA_LIBS]) |
117 | AC_DEFINE([HAVE_KONFORKA],,[defined in presence of konforka library]) | 117 | AC_DEFINE([HAVE_KONFORKA],,[defined in presence of konforka library]) |
118 | AC_DEFINE([OPKELE_HAVE_KONFORKA],,[defined in presence of konforka library]) | 118 | AC_DEFINE([OPKELE_HAVE_KONFORKA],,[defined in presence of konforka library]) |
119 | AC_SUBST([KONFORKA_KONFORKA],[konforka]) | 119 | AC_SUBST([KONFORKA_KONFORKA],[konforka]) |
120 | ],[true]) | 120 | ],[true]) |
121 | fi | 121 | fi |
122 | 122 | ||
123 | WANT_DOXYGEN="yes" | 123 | WANT_DOXYGEN="yes" |
124 | AC_ARG_ENABLE([doxygen], | 124 | AC_ARG_ENABLE([doxygen], |
125 | AC_HELP_STRING([--disable-doxygen],[do not generate documentation]), | 125 | AC_HELP_STRING([--disable-doxygen],[do not generate documentation]), |
126 | [ | 126 | [ |
127 | test "${enableval}" = "no" && WANT_DOXYGEN="no" | 127 | test "${enableval}" = "no" && WANT_DOXYGEN="no" |
128 | ] | 128 | ] |
129 | ) | 129 | ) |
130 | if test "${WANT_DOXYGEN}" = "yes" ; then | 130 | if test "${WANT_DOXYGEN}" = "yes" ; then |
131 | AC_WITH_DOXYGEN | 131 | AC_WITH_DOXYGEN |
132 | AC_WITH_DOT | 132 | AC_WITH_DOT |
133 | else | 133 | else |
134 | AM_CONDITIONAL([HAVE_DOXYGEN],[false]) | 134 | AM_CONDITIONAL([HAVE_DOXYGEN],[false]) |
135 | AM_CONDITIONAL([HAVE_DOT],[false]) | 135 | AM_CONDITIONAL([HAVE_DOT],[false]) |
136 | fi | 136 | fi |
137 | 137 | ||
138 | LIBCURL_CHECK_CONFIG(,,,[ | 138 | LIBCURL_CHECK_CONFIG(,,,[ |
139 | AC_MSG_ERROR([no required libcurl library. get one from http://curl.haxx.se/]) | 139 | AC_MSG_ERROR([no required libcurl library. get one from http://curl.haxx.se/]) |
140 | ]) | 140 | ]) |
141 | 141 | ||
142 | AC_CHECK_HEADER([expat.h],[ | 142 | AC_CHECK_HEADER([expat.h],[ |
143 | AC_CHECK_LIB([expat],[XML_ParserCreate],[ | 143 | AC_CHECK_LIB([expat],[XML_ParserCreate],[ |
144 | EXPAT_LIBS=-lexpat | 144 | EXPAT_LIBS=-lexpat |
145 | EXPAT_CFLAGS= | 145 | EXPAT_CFLAGS= |
146 | AC_SUBST([EXPAT_LIBS]) | 146 | AC_SUBST([EXPAT_LIBS]) |
147 | AC_SUBST([EXPAT_CFLAGS]) | 147 | AC_SUBST([EXPAT_CFLAGS]) |
148 | ],[ | 148 | ],[ |
149 | AC_MSG_ERROR([no required expat library. get one from http://expat.sourceforge.net/]) | 149 | AC_MSG_ERROR([no required expat library. get one from http://expat.sourceforge.net/]) |
150 | ]) | 150 | ]) |
151 | ],[ | 151 | ],[ |
152 | AC_MSG_ERROR([no required expat library. get one from http://expat.sourceforge.net/]) | 152 | AC_MSG_ERROR([no required expat library. get one from http://expat.sourceforge.net/]) |
153 | ]) | 153 | ]) |
154 | 154 | ||
155 | AC_CHECK_HEADERS([tidy.h tidy/tidy.h],[ | 155 | AC_CHECK_HEADERS([tidy.h tidy/tidy.h],[ |
156 | test -z "$TIDY_LIBS" && AC_CHECK_LIB([tidy],[tidyParseBuffer],[ | 156 | test -z "$TIDY_LIBS" && AC_CHECK_LIB([tidy],[tidyParseBuffer],[ |
157 | TIDY_LIBS=-ltidy | 157 | TIDY_LIBS=-ltidy |
158 | TIDY_CFLAGS= | 158 | TIDY_CFLAGS= |
159 | AC_SUBST([TIDY_LIBS]) | 159 | AC_SUBST([TIDY_LIBS]) |
160 | AC_SUBST([TIDY_CFLAGS]) | 160 | AC_SUBST([TIDY_CFLAGS]) |
161 | ],[ | 161 | ],[ |
162 | AC_MSG_ERROR([no required htmltidy library found. get one from http://tidy.sourceforge.net/]) | 162 | AC_MSG_ERROR([no required htmltidy library found. get one from http://tidy.sourceforge.net/]) |
163 | ]) | 163 | ]) |
164 | ],[ | 164 | ],[ |
165 | test -z "$TIDY_LIBS" -a "$ac_header" = "tidy/tidy.h" \ | 165 | test -z "$TIDY_LIBS" -a "$ac_header" = "tidy/tidy.h" \ |
166 | && AC_MSG_ERROR([no required htmltidy library found. get one from http://tidy.sourceforge.net/]) | 166 | && AC_MSG_ERROR([no required htmltidy library found. get one from http://tidy.sourceforge.net/]) |
167 | ]) | 167 | ]) |
168 | 168 | ||
169 | if test -n "$PCRE_LIBS" -a -n "$PCRE_CFLAGS" ; then | 169 | if test -n "$PCRE_LIBS" -a -n "$PCRE_CFLAGS" ; then |
170 | AC_SUBST([PCRE_CFLAGS]) | 170 | AC_SUBST([PCRE_CFLAGS]) |
171 | AC_SUBST([PCRE_LIBS]) | 171 | AC_SUBST([PCRE_LIBS]) |
172 | : | 172 | : |
173 | else | 173 | else |
174 | PKG_CHECK_MODULES([PCRE],[libpcre],,[ | 174 | PKG_CHECK_MODULES([PCRE],[libpcre],,[ |
175 | AC_MSG_ERROR([no libpcre found, go get it at http://www.pcre.org/]) | 175 | AC_MSG_ERROR([no libpcre found, go get it at http://www.pcre.org/]) |
176 | ]) | 176 | ]) |
177 | fi | 177 | fi |
178 | 178 | ||
179 | PKG_CHECK_MODULES([SQLITE3],[sqlite3],[have_sqlite3=true],[have_sqlite3=false]) | 179 | PKG_CHECK_MODULES([SQLITE3],[sqlite3],[have_sqlite3=true],[have_sqlite3=false]) |
180 | AM_CONDITIONAL([HAVE_SQLITE3],[$have_sqlite3]) | 180 | AM_CONDITIONAL([HAVE_SQLITE3],[$have_sqlite3]) |
181 | PKG_CHECK_MODULES([KINGATE],[kingate-plaincgi],[have_kingate=true],[have_kingate=false]) | 181 | PKG_CHECK_MODULES([KINGATE],[kingate-plaincgi],[have_kingate=true],[have_kingate=false]) |
182 | AM_CONDITIONAL([HAVE_KINGATE],[$have_kingate]) | 182 | AM_CONDITIONAL([HAVE_KINGATE],[$have_kingate]) |
183 | PKG_CHECK_MODULES([UUID],[uuid],[have_uuid=true],[have_uuid=false]) | 183 | PKG_CHECK_MODULES([UUID],[uuid],[have_uuid=true],[have_uuid=false]) |
184 | AM_CONDITIONAL([HAVE_UUID],[$have_uuid]) | 184 | AM_CONDITIONAL([HAVE_UUID],[$have_uuid]) |
185 | if $have_uuid ; then | 185 | if $have_uuid ; then |
186 | AC_DEFINE([HAVE_LIBUUID],,[defined in presence of libuuid]) | 186 | AC_DEFINE([HAVE_LIBUUID],,[defined in presence of libuuid]) |
187 | AC_SUBST([UUID_UUID],[uuid]) | 187 | AC_SUBST([UUID_UUID],[uuid]) |
188 | fi | 188 | fi |
189 | 189 | ||
190 | curl_ssl_verify_host="true" | 190 | curl_ssl_verify_host="true" |
191 | AC_ARG_ENABLE([ssl-verify-host], | 191 | AC_ARG_ENABLE([ssl-verify-host], |
192 | AC_HELP_STRING([--disable-ssl-verify-host],[disable cURL cert/host relationships verification]), | 192 | AC_HELP_STRING([--disable-ssl-verify-host],[disable cURL cert/host relationships verification]), |
193 | [ test "${enableval}" = "no" && curl_ssl_verify_host="false" ] | 193 | [ test "${enableval}" = "no" && curl_ssl_verify_host="false" ] |
194 | ) | 194 | ) |
195 | ${curl_ssl_verify_host} || AC_DEFINE([DISABLE_CURL_SSL_VERIFYHOST],,[defined if cURL is not to verify cert/host]) | 195 | ${curl_ssl_verify_host} || AC_DEFINE([DISABLE_CURL_SSL_VERIFYHOST],,[defined if cURL is not to verify cert/host]) |
196 | 196 | ||
197 | curl_ssl_verify_peer="true" | 197 | curl_ssl_verify_peer="true" |
198 | AC_ARG_ENABLE([ssl-verify-peer], | 198 | AC_ARG_ENABLE([ssl-verify-peer], |
199 | AC_HELP_STRING([--disable-ssl-verify-peer],[disable cURL cert validity verification]), | 199 | AC_HELP_STRING([--disable-ssl-verify-peer],[disable cURL cert validity verification]), |
200 | [ test "${enableval}" = "no" && curl_ssl_verify_peer="false" ] | 200 | [ test "${enableval}" = "no" && curl_ssl_verify_peer="false" ] |
201 | ) | 201 | ) |
202 | ${curl_ssl_verify_peer} || AC_DEFINE([DISABLE_CURL_SSL_VERIFYPEER],,[defined if cURL is not to verify cert validity]) | 202 | ${curl_ssl_verify_peer} || AC_DEFINE([DISABLE_CURL_SSL_VERIFYPEER],,[defined if cURL is not to verify cert validity]) |
203 | 203 | ||
204 | postels_law=true | 204 | postels_law=true |
205 | AC_ARG_ENABLE([postels-law], | 205 | AC_ARG_ENABLE([postels-law], |
206 | AC_HELP_STRING([--disable-postels-law],[Be strict, do not adhere to Postel's Law ("be conservative in what you do, be liberal in what you accept from others", RFC 793)]), | 206 | AC_HELP_STRING([--disable-postels-law],[Be strict, do not adhere to Postel's Law ("be conservative in what you do, be liberal in what you accept from others", RFC 793)]), |
207 | [ test "${enableval}" = "no" && postels_law=false ] | 207 | [ test "${enableval}" = "no" && postels_law=false ] |
208 | ) | 208 | ) |
209 | $postels_law && AC_DEFINE([POSTELS_LAW],,[defined if we want to adhere to Postel's Law]) | 209 | $postels_law && AC_DEFINE([POSTELS_LAW],,[defined if we want to adhere to Postel's Law]) |
210 | 210 | ||
211 | AC_DEFINE_UNQUOTED([OPKELE_SRC_DIR],["$PWD"],[source directory]) | 211 | AC_DEFINE_UNQUOTED([OPKELE_SRC_DIR],["$PWD"],[source directory]) |
212 | 212 | ||
213 | nitpick=false | 213 | nitpick=false |
214 | AC_ARG_ENABLE([nitpicking], | 214 | AC_ARG_ENABLE([nitpicking], |
215 | AC_HELP_STRING([--enable-nitpicking],[make compiler somewhat overly fastidious about the code it deals with]), | 215 | AC_HELP_STRING([--enable-nitpicking],[make compiler somewhat overly fastidious about the code it deals with]), |
216 | [ test "$enableval" = "no" || nitpick=true ] | 216 | [ test "$enableval" = "no" || nitpick=true ] |
217 | ) | 217 | ) |
218 | if $nitpick ; then | 218 | if $nitpick ; then |
219 | CPP_NITPICK="-pedantic -Wall -Wextra -Wundef -Wshadow \ | 219 | CPP_NITPICK="-pedantic -Wall -Wextra -Wundef -Wshadow \ |
220 | -Wunsafe-loop-optimizations -Wconversion -Wmissing-format-attribute \ | 220 | -Wunsafe-loop-optimizations -Wconversion -Wmissing-format-attribute \ |
221 | -Wredundant-decls -ansi" | 221 | -Wredundant-decls -ansi" |
222 | # -Wlogical-op -Wmissing-noreturn | 222 | # -Wlogical-op -Wmissing-noreturn |
223 | C_NITPICK="$CPP_NITPICK" | 223 | C_NITPICK="$CPP_NITPICK" |
224 | CXX_NITPICK="$C_NITPICK" | 224 | CXX_NITPICK="$C_NITPICK" |
225 | 225 | ||
226 | CPPFLAGS="$CPPFLAGS $CPP_NITPICK" | 226 | CPPFLAGS="$CPPFLAGS $CPP_NITPICK" |
227 | CFLAGS="$CFLAGS $C_NITPICK" | 227 | CFLAGS="$CFLAGS $C_NITPICK" |
228 | CXXFLAGS="$CXXFLAGS $CXX_NITPICK" | 228 | CXXFLAGS="$CXXFLAGS $CXX_NITPICK" |
229 | fi | 229 | fi |
230 | 230 | ||
231 | ndebug=true | 231 | ndebug=true |
232 | AC_ARG_ENABLE([debug], | 232 | AC_ARG_ENABLE([debug], |
233 | AC_HELP_STRING([--enable-debug],[enable debugging code]), | 233 | AC_HELP_STRING([--enable-debug],[enable debugging code]), |
234 | [ test "$enableval" = "no" || ndebug=false ] | 234 | [ test "$enableval" = "no" || ndebug=false ] |
235 | ) | 235 | ) |
236 | if $ndebug ; then | 236 | if $ndebug ; then |
237 | CPPFLAGS_DEBUG="-DNDEBUG" | 237 | CPPFLAGS_DEBUG="-DNDEBUG" |
238 | else | 238 | else |
239 | CPPFLAGS_DEBUG="" | 239 | CPPFLAGS_DEBUG="" |
240 | fi | 240 | fi |
241 | AC_SUBST([CPPFLAGS_DEBUG]) | 241 | AC_SUBST([CPPFLAGS_DEBUG]) |
242 | 242 | ||
243 | xri_proxy_url="https://xri.net/" | 243 | xri_proxy_url="https://xri.net/" |
244 | AC_MSG_CHECKING([for XRI resolver proxy]) | 244 | AC_MSG_CHECKING([for XRI resolver proxy]) |
245 | AC_ARG_ENABLE([xri-proxy], | 245 | AC_ARG_ENABLE([xri-proxy], |
246 | AC_HELP_STRING([--with-xri-proxy=url],[set xri proxy for use when resolving xri identities, default is https://xri.net/]), | 246 | AC_HELP_STRING([--with-xri-proxy=url],[set xri proxy for use when resolving xri identities, default is https://xri.net/]), |
247 | [ xri_proxy_url="$withval" ] | 247 | [ xri_proxy_url="$withval" ] |
248 | ) | 248 | ) |
249 | AC_MSG_RESULT([$xri_proxy_url]) | 249 | AC_MSG_RESULT([$xri_proxy_url]) |
250 | AC_DEFINE_UNQUOTED([XRI_PROXY_URL],["$xri_proxy_url"],[XRI proxy resolver URL]) | 250 | AC_DEFINE_UNQUOTED([XRI_PROXY_URL],["$xri_proxy_url"],[XRI proxy resolver URL]) |
251 | 251 | ||
252 | AC_CONFIG_FILES([ | 252 | AC_CONFIG_FILES([ |
253 | Makefile | 253 | Makefile |
254 | libopkele.pc | 254 | libopkele.pc |
255 | Doxyfile | 255 | Doxyfile |
256 | include/Makefile | 256 | include/Makefile |
257 | include/opkele/tr1-mem.h | 257 | include/opkele/tr1-mem.h |
258 | lib/Makefile | 258 | lib/Makefile |
259 | test/Makefile | 259 | test/Makefile |
260 | ]) | 260 | ]) |
261 | AC_OUTPUT | 261 | AC_OUTPUT |