author | Michael Krelin <hacker@klever.net> | 2008-03-04 21:27:58 (UTC) |
---|---|---|
committer | Michael Krelin <hacker@klever.net> | 2008-03-04 21:27:58 (UTC) |
commit | a7429a01d86dfde646332b25902f99ccf7f81934 (patch) (unidiff) | |
tree | 14098bfa8ab1ff964960534b440677aae90c30d2 | |
parent | ecb6a585d1fc3705836dc896fe348b970101e8d3 (diff) | |
download | libopkele-a7429a01d86dfde646332b25902f99ccf7f81934.zip libopkele-a7429a01d86dfde646332b25902f99ccf7f81934.tar.gz libopkele-a7429a01d86dfde646332b25902f99ccf7f81934.tar.bz2 |
propagate results of libuuid detection
* add AC_DEFINE to configure.ac
* add dependency to libopkele.pc.in
Signed-off-by: Michael Krelin <hacker@klever.net>
-rw-r--r-- | configure.ac | 4 | ||||
-rw-r--r-- | libopkele.pc.in | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index a49177f..0aa1272 100644 --- a/configure.ac +++ b/configure.ac | |||
@@ -133,96 +133,100 @@ else | |||
133 | fi | 133 | fi |
134 | 134 | ||
135 | LIBCURL_CHECK_CONFIG(,,,[ | 135 | LIBCURL_CHECK_CONFIG(,,,[ |
136 | AC_MSG_ERROR([no required libcurl library. get one from http://curl.haxx.se/]) | 136 | AC_MSG_ERROR([no required libcurl library. get one from http://curl.haxx.se/]) |
137 | ]) | 137 | ]) |
138 | 138 | ||
139 | AC_CHECK_HEADER([expat.h],[ | 139 | AC_CHECK_HEADER([expat.h],[ |
140 | AC_CHECK_LIB([expat],[XML_ParserCreate],[ | 140 | AC_CHECK_LIB([expat],[XML_ParserCreate],[ |
141 | EXPAT_LIBS=-lexpat | 141 | EXPAT_LIBS=-lexpat |
142 | EXPAT_CFLAGS= | 142 | EXPAT_CFLAGS= |
143 | AC_SUBST([EXPAT_LIBS]) | 143 | AC_SUBST([EXPAT_LIBS]) |
144 | AC_SUBST([EXPAT_CFLAGS]) | 144 | AC_SUBST([EXPAT_CFLAGS]) |
145 | ],[ | 145 | ],[ |
146 | AC_MSG_ERROR([no required expat library. get one from http://expat.sourceforge.net/]) | 146 | AC_MSG_ERROR([no required expat library. get one from http://expat.sourceforge.net/]) |
147 | ]) | 147 | ]) |
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_CHECK_HEADER([tidy.h],[ | 152 | AC_CHECK_HEADER([tidy.h],[ |
153 | AC_CHECK_LIB([tidy],[tidyParseBuffer],[ | 153 | AC_CHECK_LIB([tidy],[tidyParseBuffer],[ |
154 | TIDY_LIBS=-ltidy | 154 | TIDY_LIBS=-ltidy |
155 | TIDY_CFLAGS= | 155 | TIDY_CFLAGS= |
156 | AC_SUBST([TIDY_LIBS]) | 156 | AC_SUBST([TIDY_LIBS]) |
157 | AC_SUBST([TIDY_CFLAGS]) | 157 | AC_SUBST([TIDY_CFLAGS]) |
158 | ],[ | 158 | ],[ |
159 | AC_MSG_ERROR([no required htmltidy library found. get one from http://tidy.sourceforge.net/]) | 159 | AC_MSG_ERROR([no required htmltidy library found. get one from http://tidy.sourceforge.net/]) |
160 | ]) | 160 | ]) |
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 | if test -n "$PCRE_LIBS" -a -n "$PCRE_CFLAGS" ; then | 165 | if test -n "$PCRE_LIBS" -a -n "$PCRE_CFLAGS" ; then |
166 | AC_SUBST([PCRE_CFLAGS]) | 166 | AC_SUBST([PCRE_CFLAGS]) |
167 | AC_SUBST([PCRE_LIBS]) | 167 | AC_SUBST([PCRE_LIBS]) |
168 | : | 168 | : |
169 | else | 169 | else |
170 | PKG_CHECK_MODULES([PCRE],[libpcre],,[ | 170 | PKG_CHECK_MODULES([PCRE],[libpcre],,[ |
171 | 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/]) |
172 | ]) | 172 | ]) |
173 | fi | 173 | fi |
174 | 174 | ||
175 | PKG_CHECK_MODULES([SQLITE3],[sqlite3],[have_sqlite3=true],[have_sqlite3=false]) | 175 | PKG_CHECK_MODULES([SQLITE3],[sqlite3],[have_sqlite3=true],[have_sqlite3=false]) |
176 | AM_CONDITIONAL([HAVE_SQLITE3],[$have_sqlite3]) | 176 | AM_CONDITIONAL([HAVE_SQLITE3],[$have_sqlite3]) |
177 | PKG_CHECK_MODULES([KINGATE],[kingate-plaincgi],[have_kingate=true],[have_kingate=false]) | 177 | PKG_CHECK_MODULES([KINGATE],[kingate-plaincgi],[have_kingate=true],[have_kingate=false]) |
178 | AM_CONDITIONAL([HAVE_KINGATE],[$have_kingate]) | 178 | AM_CONDITIONAL([HAVE_KINGATE],[$have_kingate]) |
179 | PKG_CHECK_MODULES([UUID],[uuid],[have_uuid=true],[have_uuid=false]) | 179 | PKG_CHECK_MODULES([UUID],[uuid],[have_uuid=true],[have_uuid=false]) |
180 | AM_CONDITIONAL([HAVE_UUID],[$have_uuid]) | 180 | AM_CONDITIONAL([HAVE_UUID],[$have_uuid]) |
181 | if $have_uuid ; then | ||
182 | AC_DEFINE([HAVE_LIBUUID],,[defined in presence of libuuid]) | ||
183 | AC_SUBST([UUID_UUID],[uuid]) | ||
184 | fi | ||
181 | 185 | ||
182 | curl_ssl_verify_host="true" | 186 | curl_ssl_verify_host="true" |
183 | AC_ARG_ENABLE([ssl-verify-host], | 187 | AC_ARG_ENABLE([ssl-verify-host], |
184 | AC_HELP_STRING([--disable-ssl-verify-host],[disable cURL cert/host relationships verification]), | 188 | AC_HELP_STRING([--disable-ssl-verify-host],[disable cURL cert/host relationships verification]), |
185 | [ test "${enableval}" = "no" && curl_ssl_verify_host="false" ] | 189 | [ test "${enableval}" = "no" && curl_ssl_verify_host="false" ] |
186 | ) | 190 | ) |
187 | ${curl_ssl_verify_host} || AC_DEFINE([DISABLE_CURL_SSL_VERIFYHOST],,[defined if cURL is not to verify cert/host]) | 191 | ${curl_ssl_verify_host} || AC_DEFINE([DISABLE_CURL_SSL_VERIFYHOST],,[defined if cURL is not to verify cert/host]) |
188 | 192 | ||
189 | curl_ssl_verify_peer="true" | 193 | curl_ssl_verify_peer="true" |
190 | AC_ARG_ENABLE([ssl-verify-peer], | 194 | AC_ARG_ENABLE([ssl-verify-peer], |
191 | AC_HELP_STRING([--disable-ssl-verify-peer],[disable cURL cert validity verification]), | 195 | AC_HELP_STRING([--disable-ssl-verify-peer],[disable cURL cert validity verification]), |
192 | [ test "${enableval}" = "no" && curl_ssl_verify_peer="false" ] | 196 | [ test "${enableval}" = "no" && curl_ssl_verify_peer="false" ] |
193 | ) | 197 | ) |
194 | ${curl_ssl_verify_peer} || AC_DEFINE([DISABLE_CURL_SSL_VERIFYPEER],,[defined if cURL is not to verify cert validity]) | 198 | ${curl_ssl_verify_peer} || AC_DEFINE([DISABLE_CURL_SSL_VERIFYPEER],,[defined if cURL is not to verify cert validity]) |
195 | 199 | ||
196 | postels_law=true | 200 | postels_law=true |
197 | AC_ARG_ENABLE([postels-law], | 201 | AC_ARG_ENABLE([postels-law], |
198 | 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)]), | 202 | 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)]), |
199 | [ test "${enableval}" = "no" && postels_law=false ] | 203 | [ test "${enableval}" = "no" && postels_law=false ] |
200 | ) | 204 | ) |
201 | $postels_law && AC_DEFINE([POSTELS_LAW],,[defined if we want to adhere to Postel's Law]) | 205 | $postels_law && AC_DEFINE([POSTELS_LAW],,[defined if we want to adhere to Postel's Law]) |
202 | 206 | ||
203 | AC_DEFINE_UNQUOTED([OPKELE_SRC_DIR],["$PWD"],[source directory]) | 207 | AC_DEFINE_UNQUOTED([OPKELE_SRC_DIR],["$PWD"],[source directory]) |
204 | 208 | ||
205 | nitpick=false | 209 | nitpick=false |
206 | AC_ARG_ENABLE([nitpicking], | 210 | AC_ARG_ENABLE([nitpicking], |
207 | AC_HELP_STRING([--enable-nitpicking],[make compiler somewhat overly fastidious about the code it deals with]), | 211 | AC_HELP_STRING([--enable-nitpicking],[make compiler somewhat overly fastidious about the code it deals with]), |
208 | [ test "$enableval" = "no" || nitpick=true ] | 212 | [ test "$enableval" = "no" || nitpick=true ] |
209 | ) | 213 | ) |
210 | if $nitpick ; then | 214 | if $nitpick ; then |
211 | CPP_NITPICK="-pedantic -Wall -Wextra -Wundef -Wshadow \ | 215 | CPP_NITPICK="-pedantic -Wall -Wextra -Wundef -Wshadow \ |
212 | -Wunsafe-loop-optimizations -Wconversion -Wmissing-format-attribute \ | 216 | -Wunsafe-loop-optimizations -Wconversion -Wmissing-format-attribute \ |
213 | -Wredundant-decls -ansi" | 217 | -Wredundant-decls -ansi" |
214 | # -Wlogical-op -Wmissing-noreturn | 218 | # -Wlogical-op -Wmissing-noreturn |
215 | C_NITPICK="$CPP_NITPICK" | 219 | C_NITPICK="$CPP_NITPICK" |
216 | CXX_NITPICK="$C_NITPICK" | 220 | CXX_NITPICK="$C_NITPICK" |
217 | 221 | ||
218 | CPPFLAGS="$CPPFLAGS $CPP_NITPICK" | 222 | CPPFLAGS="$CPPFLAGS $CPP_NITPICK" |
219 | CFLAGS="$CFLAGS $C_NITPICK" | 223 | CFLAGS="$CFLAGS $C_NITPICK" |
220 | CXXFLAGS="$CXXFLAGS $CXX_NITPICK" | 224 | CXXFLAGS="$CXXFLAGS $CXX_NITPICK" |
221 | fi | 225 | fi |
222 | 226 | ||
223 | ndebug=true | 227 | ndebug=true |
224 | AC_ARG_ENABLE([debug], | 228 | AC_ARG_ENABLE([debug], |
225 | AC_HELP_STRING([--enable-debug],[enable debugging code]), | 229 | AC_HELP_STRING([--enable-debug],[enable debugging code]), |
226 | [ test "$enableval" = "no" || ndebug=false ] | 230 | [ test "$enableval" = "no" || ndebug=false ] |
227 | ) | 231 | ) |
228 | if $ndebug ; then | 232 | if $ndebug ; then |
diff --git a/libopkele.pc.in b/libopkele.pc.in index 011f2fe..2720a6a 100644 --- a/libopkele.pc.in +++ b/libopkele.pc.in | |||
@@ -1,11 +1,11 @@ | |||
1 | prefix=@prefix@ | 1 | prefix=@prefix@ |
2 | exec_prefix=@exec_prefix@ | 2 | exec_prefix=@exec_prefix@ |
3 | libdir=@libdir@ | 3 | libdir=@libdir@ |
4 | includedir=@includedir@ | 4 | includedir=@includedir@ |
5 | 5 | ||
6 | Name: libopkele | 6 | Name: libopkele |
7 | Description: C++ implementation of OpenID protocol | 7 | Description: C++ implementation of OpenID protocol |
8 | Version: @VERSION@ | 8 | Version: @VERSION@ |
9 | Requires: openssl libpcre @KONFORKA_KONFORKA@ | 9 | Requires: openssl libpcre @KONFORKA_KONFORKA@ @UUID_UUID@ |
10 | Cflags: -I${includedir} @LIBCURL_CPPFLAGS@ @PCRE_CFLAGS@ @EXPAT_CFLAGS@ @TIDY_CFLAGS@ | 10 | Cflags: -I${includedir} @LIBCURL_CPPFLAGS@ @PCRE_CFLAGS@ @EXPAT_CFLAGS@ @TIDY_CFLAGS@ |
11 | Libs: -L${libdir} -lopkele @LIBCURL@ @PCRE_LIBS@ @EXPAT_LIBS@ @TIDY_LIBS@ | 11 | Libs: -L${libdir} -lopkele @LIBCURL@ @PCRE_LIBS@ @EXPAT_LIBS@ @TIDY_LIBS@ |