author | Michael Krelin <hacker@klever.net> | 2009-04-11 16:34:29 (UTC) |
---|---|---|
committer | Michael Krelin <hacker@klever.net> | 2009-04-11 16:34:29 (UTC) |
commit | f3308ce9dbe8d07a9b1f71d158b0e67c017044ce (patch) (unidiff) | |
tree | a8942692ee8e2bb9804375773707f06b550743ab | |
parent | 10456ef16b0ef9d2288309127c1b6f356ace3f0b (diff) | |
download | libopkele-f3308ce9dbe8d07a9b1f71d158b0e67c017044ce.zip libopkele-f3308ce9dbe8d07a9b1f71d158b0e67c017044ce.tar.gz libopkele-f3308ce9dbe8d07a9b1f71d158b0e67c017044ce.tar.bz2 |
bumped version and updated NEWS
-rw-r--r-- | COPYING | 2 | ||||
-rw-r--r-- | NEWS.xml | 6 | ||||
-rw-r--r-- | configure.ac | 2 |
3 files changed, 8 insertions, 2 deletions
@@ -1,19 +1,19 @@ | |||
1 | Copyright (c) 2005-2008 Klever Group (http://www.klever.net/) | 1 | Copyright (c) 2005-2009 Klever Group (http://www.klever.net/) |
2 | 2 | ||
3 | Permission is hereby granted, free of charge, to any person obtaining a copy of | 3 | Permission is hereby granted, free of charge, to any person obtaining a copy of |
4 | this software and associated documentation files (the "Software"), to deal in | 4 | this software and associated documentation files (the "Software"), to deal in |
5 | the Software without restriction, including without limitation the rights to | 5 | the Software without restriction, including without limitation the rights to |
6 | use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies | 6 | use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies |
7 | of the Software, and to permit persons to whom the Software is furnished to do | 7 | of the Software, and to permit persons to whom the Software is furnished to do |
8 | so, subject to the following conditions: | 8 | so, subject to the following conditions: |
9 | 9 | ||
10 | The above copyright notice and this permission notice shall be included in all | 10 | The above copyright notice and this permission notice shall be included in all |
11 | copies or substantial portions of the Software. | 11 | copies or substantial portions of the Software. |
12 | 12 | ||
13 | THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | 13 | THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR |
14 | IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | 14 | IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, |
15 | FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE | 15 | FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE |
16 | AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER | 16 | AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER |
17 | LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, | 17 | LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, |
18 | OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE | 18 | OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE |
19 | SOFTWARE. | 19 | SOFTWARE. |
@@ -1,65 +1,71 @@ | |||
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.2" date="April 11th, 2009"> | ||
4 | <ni>Handling of unknown encodings during discovery</ni> | ||
5 | <ni>Discovery robustness improvements</ni> | ||
6 | <ni>Workaround for OPs (e.g. livejournal.com) breaking specs</ni> | ||
7 | <ni>Compile-time fixes for newer gcc</ni> | ||
8 | </version> | ||
3 | <version version="2.0.1" date="November 22nd, 2008"> | 9 | <version version="2.0.1" date="November 22nd, 2008"> |
4 | <ni>Compile-time fixes and improvements</ni> | 10 | <ni>Compile-time fixes and improvements</ni> |
5 | <ni>Portability improvements for FreeBSD</ni> | 11 | <ni>Portability improvements for FreeBSD</ni> |
6 | <ni>Really suppress debugging message from htmltidy when --disable-debug is in | 12 | <ni>Really suppress debugging message from htmltidy when --disable-debug is in |
7 | effect</ni> | 13 | effect</ni> |
8 | <ni>minor bugfixes</ni> | 14 | <ni>minor bugfixes</ni> |
9 | <ni>thread-safety improvements</ni> | 15 | <ni>thread-safety improvements</ni> |
10 | </version> | 16 | </version> |
11 | <version version="2.0" date="June 26th, 2008"> | 17 | <version version="2.0" date="June 26th, 2008"> |
12 | <ni>OpenID 2.0 support</ni> | 18 | <ni>OpenID 2.0 support</ni> |
13 | <ni>Major rewrite of the whole thing</ni> | 19 | <ni>Major rewrite of the whole thing</ni> |
14 | <ni>Support for XRDS (YADIS and XRI/inames) discovery</ni> | 20 | <ni>Support for XRDS (YADIS and XRI/inames) discovery</ni> |
15 | <ni>Sheerly improved html-based discovery (only code using new, 2.0-enabled | 21 | <ni>Sheerly improved html-based discovery (only code using new, 2.0-enabled |
16 | classes benefits from it)</ni> | 22 | classes benefits from it)</ni> |
17 | <ni>Deprecation of the old api</ni> | 23 | <ni>Deprecation of the old api</ni> |
18 | <ni>Added sample RP and OP implementations</ni> | 24 | <ni>Added sample RP and OP implementations</ni> |
19 | <ni>Require expat xml stream parser library</ni> | 25 | <ni>Require expat xml stream parser library</ni> |
20 | <ni>Require htmltidy library</ni> | 26 | <ni>Require htmltidy library</ni> |
21 | <ni>Require tr1/memory (shared_ptr) support - either modern gcc or boost | 27 | <ni>Require tr1/memory (shared_ptr) support - either modern gcc or boost |
22 | library</ni> | 28 | library</ni> |
23 | </version> | 29 | </version> |
24 | <version version="0.3.2" date="November 22nd, 2007"> | 30 | <version version="0.3.2" date="November 22nd, 2007"> |
25 | <ni>code cleanup for stricter compiler</ni> | 31 | <ni>code cleanup for stricter compiler</ni> |
26 | </version> | 32 | </version> |
27 | <version version="0.3.1" date="November 20th, 2007"> | 33 | <version version="0.3.1" date="November 20th, 2007"> |
28 | <ni>more robustness improvements in links discovery</ni> | 34 | <ni>more robustness improvements in links discovery</ni> |
29 | <ni>removed dependency on pcre c++ bindings, because there are few of them and | 35 | <ni>removed dependency on pcre c++ bindings, because there are few of them and |
30 | not everyone likes all of them</ni> | 36 | not everyone likes all of them</ni> |
31 | <ni>minor build improvements</ni> | 37 | <ni>minor build improvements</ni> |
32 | </version> | 38 | </version> |
33 | <version version="0.3" date="August 9th, 2007"> | 39 | <version version="0.3" date="August 9th, 2007"> |
34 | <ni>fixed canonicalization procedure to be specs-compliant. Note, that the old | 40 | <ni>fixed canonicalization procedure to be specs-compliant. Note, that the old |
35 | consumer_t::canonicalize is now called consumer_t::normalize and the | 41 | consumer_t::canonicalize is now called consumer_t::normalize and the |
36 | canonicalize memeber is now virtual to allow caching layer, not static</ni> | 42 | canonicalize memeber is now virtual to allow caching layer, not static</ni> |
37 | <ni>robustness improvement in handling associations expiry</ni> | 43 | <ni>robustness improvement in handling associations expiry</ni> |
38 | <ni>minor documentation updates</ni> | 44 | <ni>minor documentation updates</ni> |
39 | </version> | 45 | </version> |
40 | <version version="0.2.1" date="June 24th, 2007"> | 46 | <version version="0.2.1" date="June 24th, 2007"> |
41 | <ni>open id server invalid signature bugfix</ni> | 47 | <ni>open id server invalid signature bugfix</ni> |
42 | </version> | 48 | </version> |
43 | <version version="0.2" date="June 19th, 2007"> | 49 | <version version="0.2" date="June 19th, 2007"> |
44 | <ni>A few robustness improvements and optimizations</ni> | 50 | <ni>A few robustness improvements and optimizations</ni> |
45 | <ni>More liberal key/values messages parsing</ni> | 51 | <ni>More liberal key/values messages parsing</ni> |
46 | <ni>Changed unusable --with-pcre++ configure option to --with-pcrepp</ni> | 52 | <ni>Changed unusable --with-pcre++ configure option to --with-pcrepp</ni> |
47 | </version> | 53 | </version> |
48 | <version version="0.1.1" date="January 16th, 2007"> | 54 | <version version="0.1.1" date="January 16th, 2007"> |
49 | <ni>Fixed a bug in curl errors handling</ni> | 55 | <ni>Fixed a bug in curl errors handling</ni> |
50 | <ni>added --disable-ssl-verify-host and --disable-ssl-verify-peer options to | 56 | <ni>added --disable-ssl-verify-host and --disable-ssl-verify-peer options to |
51 | configure to alter default implementation of consumer's retrieve_links | 57 | configure to alter default implementation of consumer's retrieve_links |
52 | behaviour</ni> | 58 | behaviour</ni> |
53 | <ni>Build fix that eliminates the need to pass --disable-konforka in the | 59 | <ni>Build fix that eliminates the need to pass --disable-konforka in the |
54 | absence of it.</ni> | 60 | absence of it.</ni> |
55 | </version> | 61 | </version> |
56 | <version version="0.1" date="January 12th, 2007"> | 62 | <version version="0.1" date="January 12th, 2007"> |
57 | <ni>OpenID simple registration extension implementation</ni> | 63 | <ni>OpenID simple registration extension implementation</ni> |
58 | <ni>OpenID extensions framework</ni> | 64 | <ni>OpenID extensions framework</ni> |
59 | <ni>Canonicalization bugfix</ni> | 65 | <ni>Canonicalization bugfix</ni> |
60 | <ni>Slightly improved interoperability with buggy implementations</ni> | 66 | <ni>Slightly improved interoperability with buggy implementations</ni> |
61 | </version> | 67 | </version> |
62 | <version version="0.0" date="July 25th, 2005"> | 68 | <version version="0.0" date="July 25th, 2005"> |
63 | <ni>Initial release</ni> | 69 | <ni>Initial release</ni> |
64 | </version> | 70 | </version> |
65 | </news> | 71 | </news> |
diff --git a/configure.ac b/configure.ac index a7b56ff..a6de8c3 100644 --- a/configure.ac +++ b/configure.ac | |||
@@ -1,193 +1,193 @@ | |||
1 | AC_INIT([libopkele], [2.0.1], [libopkele-bugs@klever.net]) | 1 | AC_INIT([libopkele], [2.0.2], [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 | ||
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 | AC_CHECK_FUNCS([timegm]) | 13 | AC_CHECK_FUNCS([timegm]) |
14 | 14 | ||
15 | AC_PATH_PROG([XSLTPROC],[xsltproc],[true]) | 15 | AC_PATH_PROG([XSLTPROC],[xsltproc],[true]) |
16 | 16 | ||
17 | AC_MSG_CHECKING([for source tree version]) | 17 | AC_MSG_CHECKING([for source tree version]) |
18 | if headrev=$(cd $srcdir && git rev-parse --verify HEAD 2>/dev/null) ; then | 18 | if headrev=$(cd $srcdir && git rev-parse --verify HEAD 2>/dev/null) ; then |
19 | PACKAGE_SRC_VERSION="$(cd $srcdir && git describe --tags $headrev)" | 19 | PACKAGE_SRC_VERSION="$(cd $srcdir && git describe --tags $headrev)" |
20 | test "$PACKAGE_SRC_VERSION" = "$PACKAGE_VERSION" \ | 20 | test "$PACKAGE_SRC_VERSION" = "$PACKAGE_VERSION" \ |
21 | -o "${PACKAGE_SRC_VERSION#${PACKAGE_VERSION}-}" != "$PACKAGE_SRC_VERSION" || PACKAGE_SRC_VERSION="${PACKAGE_VERSION}:${PACKAGE_SRC_VERSION}" | 21 | -o "${PACKAGE_SRC_VERSION#${PACKAGE_VERSION}-}" != "$PACKAGE_SRC_VERSION" || PACKAGE_SRC_VERSION="${PACKAGE_VERSION}:${PACKAGE_SRC_VERSION}" |
22 | ( cd $srcdir && git diff-index $headrev | read dirt ) && PACKAGE_SRC_VERSION="${PACKAGE_SRC_VERSION}-dirty" | 22 | ( cd $srcdir && git diff-index $headrev | read dirt ) && PACKAGE_SRC_VERSION="${PACKAGE_SRC_VERSION}-dirty" |
23 | else | 23 | else |
24 | PACKAGE_SRC_VERSION="$PACKAGE_VERSION" | 24 | PACKAGE_SRC_VERSION="$PACKAGE_VERSION" |
25 | fi | 25 | fi |
26 | AC_MSG_RESULT([$PACKAGE_SRC_VERSION]) | 26 | AC_MSG_RESULT([$PACKAGE_SRC_VERSION]) |
27 | AC_SUBST([PACKAGE_SRC_VERSION]) | 27 | AC_SUBST([PACKAGE_SRC_VERSION]) |
28 | AC_DEFINE_UNQUOTED([PACKAGE_SRC_VERSION],["$PACKAGE_SRC_VERSION"],[more or less precise source tree version]) | 28 | AC_DEFINE_UNQUOTED([PACKAGE_SRC_VERSION],["$PACKAGE_SRC_VERSION"],[more or less precise source tree version]) |
29 | 29 | ||
30 | tr1_mem_std="false" | 30 | tr1_mem_std="false" |
31 | tr1_mem_boost="false" | 31 | tr1_mem_boost="false" |
32 | AC_CHECK_SHAREDPTR(std::tr1,tr1/memory,[ tr1_mem_std=true ]) | 32 | AC_CHECK_SHAREDPTR(std::tr1,tr1/memory,[ tr1_mem_std=true ]) |
33 | AC_CHECK_SHAREDPTR(boost,boost/shared_ptr.hpp,[ tr1_mem_boost=true ]) | 33 | AC_CHECK_SHAREDPTR(boost,boost/shared_ptr.hpp,[ tr1_mem_boost=true ]) |
34 | tr1_mem="" | 34 | tr1_mem="" |
35 | AC_ARG_WITH([tr1-memory], | 35 | AC_ARG_WITH([tr1-memory], |
36 | AC_HELP_STRING([--with-tr1-memory=<boost|std>],[select tr1/memory (shared_ptr<>) implementation to use]), | 36 | AC_HELP_STRING([--with-tr1-memory=<boost|std>],[select tr1/memory (shared_ptr<>) implementation to use]), |
37 | [ tr1_mem="$withval" ] | 37 | [ tr1_mem="$withval" ] |
38 | ) | 38 | ) |
39 | AC_MSG_CHECKING([for tr1/memory implementation to use]) | 39 | AC_MSG_CHECKING([for tr1/memory implementation to use]) |
40 | test -z "$tr1_mem" && $tr1_mem_std && tr1_mem=std | 40 | test -z "$tr1_mem" && $tr1_mem_std && tr1_mem=std |
41 | test -z "$tr1_mem" && $tr1_mem_boost && tr1_mem=boost | 41 | test -z "$tr1_mem" && $tr1_mem_boost && tr1_mem=boost |
42 | if test -z "$tr1_mem" ; then | 42 | if test -z "$tr1_mem" ; then |
43 | AC_MSG_RESULT([none found]) | 43 | AC_MSG_RESULT([none found]) |
44 | else | 44 | else |
45 | AC_MSG_RESULT([$tr1_mem]) | 45 | AC_MSG_RESULT([$tr1_mem]) |
46 | fi | 46 | fi |
47 | case "$tr1_mem" in | 47 | case "$tr1_mem" in |
48 | std) | 48 | std) |
49 | $tr1_mem_std || AC_MSG_ERROR([std implementation requested, but not found]) | 49 | $tr1_mem_std || AC_MSG_ERROR([std implementation requested, but not found]) |
50 | OPKELE_TR1_MEM_NS=std::tr1 | 50 | OPKELE_TR1_MEM_NS=std::tr1 |
51 | OPKELE_TR1_MEM_HEADER=tr1/memory | 51 | OPKELE_TR1_MEM_HEADER=tr1/memory |
52 | ;; | 52 | ;; |
53 | boost) | 53 | boost) |
54 | $tr1_mem_boost || AC_MSG_ERROR([boost implementation requested, but not found]) | 54 | $tr1_mem_boost || AC_MSG_ERROR([boost implementation requested, but not found]) |
55 | OPKELE_TR1_MEM_NS=boost | 55 | OPKELE_TR1_MEM_NS=boost |
56 | OPKELE_TR1_MEM_HEADER=boost/shared_ptr.hpp | 56 | OPKELE_TR1_MEM_HEADER=boost/shared_ptr.hpp |
57 | ;; | 57 | ;; |
58 | *) | 58 | *) |
59 | AC_MSG_ERROR([no shared_ptr<> implementation found]) | 59 | AC_MSG_ERROR([no shared_ptr<> implementation found]) |
60 | ;; | 60 | ;; |
61 | esac | 61 | esac |
62 | AC_SUBST([OPKELE_TR1_MEM_NS]) | 62 | AC_SUBST([OPKELE_TR1_MEM_NS]) |
63 | AC_SUBST([OPKELE_TR1_MEM_HEADER]) | 63 | AC_SUBST([OPKELE_TR1_MEM_HEADER]) |
64 | 64 | ||
65 | AC_MSG_CHECKING([for deprecated attribute support]) | 65 | AC_MSG_CHECKING([for deprecated attribute support]) |
66 | AC_COMPILE_IFELSE([ | 66 | AC_COMPILE_IFELSE([ |
67 | int __attribute__((deprecated)) deprecated_function(); | 67 | int __attribute__((deprecated)) deprecated_function(); |
68 | ],[ | 68 | ],[ |
69 | AC_MSG_RESULT([yes]) | 69 | AC_MSG_RESULT([yes]) |
70 | AC_DEFINE([OPKELE_DEPRECATE],[__attribute__((deprecated))],[deprecated function attribute]) | 70 | AC_DEFINE([OPKELE_DEPRECATE],[__attribute__((deprecated))],[deprecated function attribute]) |
71 | ],[ | 71 | ],[ |
72 | AC_MSG_RESULT([no]) | 72 | AC_MSG_RESULT([no]) |
73 | AC_DEFINE([OPKELE_DEPRECATE],,[deprecated function attribute]) | 73 | AC_DEFINE([OPKELE_DEPRECATE],,[deprecated function attribute]) |
74 | ] | 74 | ] |
75 | ) | 75 | ) |
76 | 76 | ||
77 | AC_LANG_PUSH([C++]) | 77 | AC_LANG_PUSH([C++]) |
78 | AC_MSG_CHECKING([for abi::__cxa_demangle]) | 78 | AC_MSG_CHECKING([for abi::__cxa_demangle]) |
79 | AC_COMPILE_IFELSE([ | 79 | AC_COMPILE_IFELSE([ |
80 | #include <typeinfo> | 80 | #include <typeinfo> |
81 | using namespace std; | 81 | using namespace std; |
82 | #include <cxxabi.h> | 82 | #include <cxxabi.h> |
83 | int main(int c,char **v) { | 83 | int main(int c,char **v) { |
84 | int dstat; | 84 | int dstat; |
85 | char *demangled = abi::__cxa_demangle(typeid(dstat).name(),0,0,&dstat); | 85 | char *demangled = abi::__cxa_demangle(typeid(dstat).name(),0,0,&dstat); |
86 | return 0; | 86 | return 0; |
87 | } | 87 | } |
88 | ],[ | 88 | ],[ |
89 | AC_MSG_RESULT([yes]) | 89 | AC_MSG_RESULT([yes]) |
90 | AC_DEFINE([HAVE_DEMANGLE],,[defined if abi::__cxa_demangle is available]) | 90 | AC_DEFINE([HAVE_DEMANGLE],,[defined if abi::__cxa_demangle is available]) |
91 | ],[ | 91 | ],[ |
92 | AC_MSG_RESULT([no]) | 92 | AC_MSG_RESULT([no]) |
93 | ] | 93 | ] |
94 | ) | 94 | ) |
95 | AC_LANG_POP([C++]) | 95 | AC_LANG_POP([C++]) |
96 | 96 | ||
97 | 97 | ||
98 | 98 | ||
99 | 99 | ||
100 | PKG_CHECK_MODULES([OPENSSL],[openssl],,[ | 100 | PKG_CHECK_MODULES([OPENSSL],[openssl],,[ |
101 | AC_MSG_ERROR([no openssl library found. get one from http://www.openssl.org/]) | 101 | AC_MSG_ERROR([no openssl library found. get one from http://www.openssl.org/]) |
102 | ]) | 102 | ]) |
103 | 103 | ||
104 | WANT_KONFORKA="yes" | 104 | WANT_KONFORKA="yes" |
105 | AC_ARG_ENABLE([konforka], | 105 | AC_ARG_ENABLE([konforka], |
106 | AC_HELP_STRING([--disable-konforka],[do not use konforka library (default: use if found)]), | 106 | AC_HELP_STRING([--disable-konforka],[do not use konforka library (default: use if found)]), |
107 | [ | 107 | [ |
108 | test "${enableval}" = "no" && WANT_KONFORKA="no" | 108 | test "${enableval}" = "no" && WANT_KONFORKA="no" |
109 | ] | 109 | ] |
110 | ) | 110 | ) |
111 | if test "${WANT_KONFORKA}" = "yes" ; then | 111 | if test "${WANT_KONFORKA}" = "yes" ; then |
112 | PKG_CHECK_MODULES([KONFORKA],[konforka],[ | 112 | PKG_CHECK_MODULES([KONFORKA],[konforka],[ |
113 | AC_SUBST([KONFORKA_CFLAGS]) | 113 | AC_SUBST([KONFORKA_CFLAGS]) |
114 | AC_SUBST([KONFORKA_LIBS]) | 114 | AC_SUBST([KONFORKA_LIBS]) |
115 | AC_DEFINE([HAVE_KONFORKA],,[defined in presence of konforka library]) | 115 | AC_DEFINE([HAVE_KONFORKA],,[defined in presence of konforka library]) |
116 | AC_DEFINE([OPKELE_HAVE_KONFORKA],,[defined in presence of konforka library]) | 116 | AC_DEFINE([OPKELE_HAVE_KONFORKA],,[defined in presence of konforka library]) |
117 | AC_SUBST([KONFORKA_KONFORKA],[konforka]) | 117 | AC_SUBST([KONFORKA_KONFORKA],[konforka]) |
118 | ],[true]) | 118 | ],[true]) |
119 | fi | 119 | fi |
120 | 120 | ||
121 | WANT_DOXYGEN="yes" | 121 | WANT_DOXYGEN="yes" |
122 | AC_ARG_ENABLE([doxygen], | 122 | AC_ARG_ENABLE([doxygen], |
123 | AC_HELP_STRING([--disable-doxygen],[do not generate documentation]), | 123 | AC_HELP_STRING([--disable-doxygen],[do not generate documentation]), |
124 | [ | 124 | [ |
125 | test "${enableval}" = "no" && WANT_DOXYGEN="no" | 125 | test "${enableval}" = "no" && WANT_DOXYGEN="no" |
126 | ] | 126 | ] |
127 | ) | 127 | ) |
128 | if test "${WANT_DOXYGEN}" = "yes" ; then | 128 | if test "${WANT_DOXYGEN}" = "yes" ; then |
129 | AC_WITH_DOXYGEN | 129 | AC_WITH_DOXYGEN |
130 | AC_WITH_DOT | 130 | AC_WITH_DOT |
131 | else | 131 | else |
132 | AM_CONDITIONAL([HAVE_DOXYGEN],[false]) | 132 | AM_CONDITIONAL([HAVE_DOXYGEN],[false]) |
133 | AM_CONDITIONAL([HAVE_DOT],[false]) | 133 | AM_CONDITIONAL([HAVE_DOT],[false]) |
134 | fi | 134 | fi |
135 | 135 | ||
136 | LIBCURL_CHECK_CONFIG(,,,[ | 136 | LIBCURL_CHECK_CONFIG(,,,[ |
137 | AC_MSG_ERROR([no required libcurl library. get one from http://curl.haxx.se/]) | 137 | AC_MSG_ERROR([no required libcurl library. get one from http://curl.haxx.se/]) |
138 | ]) | 138 | ]) |
139 | 139 | ||
140 | AC_CHECK_HEADER([expat.h],[ | 140 | AC_CHECK_HEADER([expat.h],[ |
141 | AC_CHECK_LIB([expat],[XML_ParserCreate],[ | 141 | AC_CHECK_LIB([expat],[XML_ParserCreate],[ |
142 | EXPAT_LIBS=-lexpat | 142 | EXPAT_LIBS=-lexpat |
143 | EXPAT_CFLAGS= | 143 | EXPAT_CFLAGS= |
144 | AC_SUBST([EXPAT_LIBS]) | 144 | AC_SUBST([EXPAT_LIBS]) |
145 | AC_SUBST([EXPAT_CFLAGS]) | 145 | AC_SUBST([EXPAT_CFLAGS]) |
146 | ],[ | 146 | ],[ |
147 | AC_MSG_ERROR([no required expat library. get one from http://expat.sourceforge.net/]) | 147 | AC_MSG_ERROR([no required expat library. get one from http://expat.sourceforge.net/]) |
148 | ]) | 148 | ]) |
149 | ],[ | 149 | ],[ |
150 | AC_MSG_ERROR([no required expat library. get one from http://expat.sourceforge.net/]) | 150 | AC_MSG_ERROR([no required expat library. get one from http://expat.sourceforge.net/]) |
151 | ]) | 151 | ]) |
152 | 152 | ||
153 | AC_CHECK_HEADERS([tidy.h tidy/tidy.h],[ | 153 | AC_CHECK_HEADERS([tidy.h tidy/tidy.h],[ |
154 | AC_CHECK_LIB([tidy],[tidyParseBuffer],[ | 154 | AC_CHECK_LIB([tidy],[tidyParseBuffer],[ |
155 | TIDY_LIBS=-ltidy | 155 | TIDY_LIBS=-ltidy |
156 | TIDY_CFLAGS= | 156 | TIDY_CFLAGS= |
157 | AC_SUBST([TIDY_LIBS]) | 157 | AC_SUBST([TIDY_LIBS]) |
158 | AC_SUBST([TIDY_CFLAGS]) | 158 | AC_SUBST([TIDY_CFLAGS]) |
159 | ],[ | 159 | ],[ |
160 | AC_MSG_ERROR([no required htmltidy library found. get one from http://tidy.sourceforge.net/]) | 160 | AC_MSG_ERROR([no required htmltidy library found. get one from http://tidy.sourceforge.net/]) |
161 | ]) | 161 | ]) |
162 | ],[ | 162 | ],[ |
163 | test "$ac_header" = "tidy/tidy.h" \ | 163 | test "$ac_header" = "tidy/tidy.h" \ |
164 | && AC_MSG_ERROR([no required htmltidy library found. get one from http://tidy.sourceforge.net/]) | 164 | && AC_MSG_ERROR([no required htmltidy library found. get one from http://tidy.sourceforge.net/]) |
165 | ]) | 165 | ]) |
166 | 166 | ||
167 | if test -n "$PCRE_LIBS" -a -n "$PCRE_CFLAGS" ; then | 167 | if test -n "$PCRE_LIBS" -a -n "$PCRE_CFLAGS" ; then |
168 | AC_SUBST([PCRE_CFLAGS]) | 168 | AC_SUBST([PCRE_CFLAGS]) |
169 | AC_SUBST([PCRE_LIBS]) | 169 | AC_SUBST([PCRE_LIBS]) |
170 | : | 170 | : |
171 | else | 171 | else |
172 | PKG_CHECK_MODULES([PCRE],[libpcre],,[ | 172 | PKG_CHECK_MODULES([PCRE],[libpcre],,[ |
173 | AC_MSG_ERROR([no libpcre found, go get it at http://www.pcre.org/]) | 173 | AC_MSG_ERROR([no libpcre found, go get it at http://www.pcre.org/]) |
174 | ]) | 174 | ]) |
175 | fi | 175 | fi |
176 | 176 | ||
177 | PKG_CHECK_MODULES([SQLITE3],[sqlite3],[have_sqlite3=true],[have_sqlite3=false]) | 177 | PKG_CHECK_MODULES([SQLITE3],[sqlite3],[have_sqlite3=true],[have_sqlite3=false]) |
178 | AM_CONDITIONAL([HAVE_SQLITE3],[$have_sqlite3]) | 178 | AM_CONDITIONAL([HAVE_SQLITE3],[$have_sqlite3]) |
179 | PKG_CHECK_MODULES([KINGATE],[kingate-plaincgi],[have_kingate=true],[have_kingate=false]) | 179 | PKG_CHECK_MODULES([KINGATE],[kingate-plaincgi],[have_kingate=true],[have_kingate=false]) |
180 | AM_CONDITIONAL([HAVE_KINGATE],[$have_kingate]) | 180 | AM_CONDITIONAL([HAVE_KINGATE],[$have_kingate]) |
181 | PKG_CHECK_MODULES([UUID],[uuid],[have_uuid=true],[have_uuid=false]) | 181 | PKG_CHECK_MODULES([UUID],[uuid],[have_uuid=true],[have_uuid=false]) |
182 | AM_CONDITIONAL([HAVE_UUID],[$have_uuid]) | 182 | AM_CONDITIONAL([HAVE_UUID],[$have_uuid]) |
183 | if $have_uuid ; then | 183 | if $have_uuid ; then |
184 | AC_DEFINE([HAVE_LIBUUID],,[defined in presence of libuuid]) | 184 | AC_DEFINE([HAVE_LIBUUID],,[defined in presence of libuuid]) |
185 | AC_SUBST([UUID_UUID],[uuid]) | 185 | AC_SUBST([UUID_UUID],[uuid]) |
186 | fi | 186 | fi |
187 | 187 | ||
188 | curl_ssl_verify_host="true" | 188 | curl_ssl_verify_host="true" |
189 | AC_ARG_ENABLE([ssl-verify-host], | 189 | AC_ARG_ENABLE([ssl-verify-host], |
190 | AC_HELP_STRING([--disable-ssl-verify-host],[disable cURL cert/host relationships verification]), | 190 | AC_HELP_STRING([--disable-ssl-verify-host],[disable cURL cert/host relationships verification]), |
191 | [ test "${enableval}" = "no" && curl_ssl_verify_host="false" ] | 191 | [ test "${enableval}" = "no" && curl_ssl_verify_host="false" ] |
192 | ) | 192 | ) |
193 | ${curl_ssl_verify_host} || AC_DEFINE([DISABLE_CURL_SSL_VERIFYHOST],,[defined if cURL is not to verify cert/host]) | 193 | ${curl_ssl_verify_host} || AC_DEFINE([DISABLE_CURL_SSL_VERIFYHOST],,[defined if cURL is not to verify cert/host]) |