author | Michael Krelin <hacker@klever.net> | 2009-09-10 06:00:38 (UTC) |
---|---|---|
committer | Michael Krelin <hacker@klever.net> | 2009-09-13 11:43:55 (UTC) |
commit | 570ab021e0dcf507ecd6b7118151fb90feeab779 (patch) (unidiff) | |
tree | ce2f904618849e5aba61a79999768442a754e953 /configure.ac | |
parent | 5e8d46cb591582918f4d3d4bbdbd29fee207498a (diff) | |
download | libopkele-570ab021e0dcf507ecd6b7118151fb90feeab779.zip libopkele-570ab021e0dcf507ecd6b7118151fb90feeab779.tar.gz libopkele-570ab021e0dcf507ecd6b7118151fb90feeab779.tar.bz2 |
removed legacy compatibility code and pcre dependency
Signed-off-by: Michael Krelin <hacker@klever.net>
-rw-r--r-- | configure.ac | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/configure.ac b/configure.ac index 5fb6bec..7fa2f85 100644 --- a/configure.ac +++ b/configure.ac | |||
@@ -121,106 +121,96 @@ if test "${WANT_KONFORKA}" = "yes" ; then | |||
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 | ||
170 | AC_SUBST([PCRE_CFLAGS]) | ||
171 | AC_SUBST([PCRE_LIBS]) | ||
172 | : | ||
173 | else | ||
174 | PKG_CHECK_MODULES([PCRE],[libpcre],,[ | ||
175 | AC_MSG_ERROR([no libpcre found, go get it at http://www.pcre.org/]) | ||
176 | ]) | ||
177 | fi | ||
178 | |||
179 | PKG_CHECK_MODULES([SQLITE3],[sqlite3],[have_sqlite3=true],[have_sqlite3=false]) | 169 | PKG_CHECK_MODULES([SQLITE3],[sqlite3],[have_sqlite3=true],[have_sqlite3=false]) |
180 | AM_CONDITIONAL([HAVE_SQLITE3],[$have_sqlite3]) | 170 | AM_CONDITIONAL([HAVE_SQLITE3],[$have_sqlite3]) |
181 | PKG_CHECK_MODULES([KINGATE],[kingate-plaincgi],[have_kingate=true],[have_kingate=false]) | 171 | PKG_CHECK_MODULES([KINGATE],[kingate-plaincgi],[have_kingate=true],[have_kingate=false]) |
182 | AM_CONDITIONAL([HAVE_KINGATE],[$have_kingate]) | 172 | AM_CONDITIONAL([HAVE_KINGATE],[$have_kingate]) |
183 | PKG_CHECK_MODULES([UUID],[uuid],[have_uuid=true],[have_uuid=false]) | 173 | PKG_CHECK_MODULES([UUID],[uuid],[have_uuid=true],[have_uuid=false]) |
184 | AM_CONDITIONAL([HAVE_UUID],[$have_uuid]) | 174 | AM_CONDITIONAL([HAVE_UUID],[$have_uuid]) |
185 | if $have_uuid ; then | 175 | if $have_uuid ; then |
186 | AC_DEFINE([HAVE_LIBUUID],,[defined in presence of libuuid]) | 176 | AC_DEFINE([HAVE_LIBUUID],,[defined in presence of libuuid]) |
187 | AC_SUBST([UUID_UUID],[uuid]) | 177 | AC_SUBST([UUID_UUID],[uuid]) |
188 | fi | 178 | fi |
189 | 179 | ||
190 | curl_ssl_verify_host="true" | 180 | curl_ssl_verify_host="true" |
191 | AC_ARG_ENABLE([ssl-verify-host], | 181 | AC_ARG_ENABLE([ssl-verify-host], |
192 | AC_HELP_STRING([--disable-ssl-verify-host],[disable cURL cert/host relationships verification]), | 182 | AC_HELP_STRING([--disable-ssl-verify-host],[disable cURL cert/host relationships verification]), |
193 | [ test "${enableval}" = "no" && curl_ssl_verify_host="false" ] | 183 | [ test "${enableval}" = "no" && curl_ssl_verify_host="false" ] |
194 | ) | 184 | ) |
195 | ${curl_ssl_verify_host} || AC_DEFINE([DISABLE_CURL_SSL_VERIFYHOST],,[defined if cURL is not to verify cert/host]) | 185 | ${curl_ssl_verify_host} || AC_DEFINE([DISABLE_CURL_SSL_VERIFYHOST],,[defined if cURL is not to verify cert/host]) |
196 | 186 | ||
197 | curl_ssl_verify_peer="true" | 187 | curl_ssl_verify_peer="true" |
198 | AC_ARG_ENABLE([ssl-verify-peer], | 188 | AC_ARG_ENABLE([ssl-verify-peer], |
199 | AC_HELP_STRING([--disable-ssl-verify-peer],[disable cURL cert validity verification]), | 189 | AC_HELP_STRING([--disable-ssl-verify-peer],[disable cURL cert validity verification]), |
200 | [ test "${enableval}" = "no" && curl_ssl_verify_peer="false" ] | 190 | [ test "${enableval}" = "no" && curl_ssl_verify_peer="false" ] |
201 | ) | 191 | ) |
202 | ${curl_ssl_verify_peer} || AC_DEFINE([DISABLE_CURL_SSL_VERIFYPEER],,[defined if cURL is not to verify cert validity]) | 192 | ${curl_ssl_verify_peer} || AC_DEFINE([DISABLE_CURL_SSL_VERIFYPEER],,[defined if cURL is not to verify cert validity]) |
203 | 193 | ||
204 | postels_law=true | 194 | postels_law=true |
205 | AC_ARG_ENABLE([postels-law], | 195 | 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)]), | 196 | 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 ] | 197 | [ test "${enableval}" = "no" && postels_law=false ] |
208 | ) | 198 | ) |
209 | $postels_law && AC_DEFINE([POSTELS_LAW],,[defined if we want to adhere to Postel's Law]) | 199 | $postels_law && AC_DEFINE([POSTELS_LAW],,[defined if we want to adhere to Postel's Law]) |
210 | 200 | ||
211 | AC_DEFINE_UNQUOTED([OPKELE_SRC_DIR],["$PWD"],[source directory]) | 201 | AC_DEFINE_UNQUOTED([OPKELE_SRC_DIR],["$PWD"],[source directory]) |
212 | 202 | ||
213 | nitpick=false | 203 | nitpick=false |
214 | AC_ARG_ENABLE([nitpicking], | 204 | AC_ARG_ENABLE([nitpicking], |
215 | AC_HELP_STRING([--enable-nitpicking],[make compiler somewhat overly fastidious about the code it deals with]), | 205 | AC_HELP_STRING([--enable-nitpicking],[make compiler somewhat overly fastidious about the code it deals with]), |
216 | [ test "$enableval" = "no" || nitpick=true ] | 206 | [ test "$enableval" = "no" || nitpick=true ] |
217 | ) | 207 | ) |
218 | if $nitpick ; then | 208 | if $nitpick ; then |
219 | CPP_NITPICK="-pedantic -Wall -Wextra -Wundef -Wshadow \ | 209 | CPP_NITPICK="-pedantic -Wall -Wextra -Wundef -Wshadow \ |
220 | -Wunsafe-loop-optimizations -Wconversion -Wmissing-format-attribute \ | 210 | -Wunsafe-loop-optimizations -Wconversion -Wmissing-format-attribute \ |
221 | -Wredundant-decls -ansi" | 211 | -Wredundant-decls -ansi" |
222 | # -Wlogical-op -Wmissing-noreturn | 212 | # -Wlogical-op -Wmissing-noreturn |
223 | C_NITPICK="$CPP_NITPICK" | 213 | C_NITPICK="$CPP_NITPICK" |
224 | CXX_NITPICK="$C_NITPICK" | 214 | CXX_NITPICK="$C_NITPICK" |
225 | 215 | ||
226 | CPPFLAGS="$CPPFLAGS $CPP_NITPICK" | 216 | CPPFLAGS="$CPPFLAGS $CPP_NITPICK" |