author | Michael Krelin <hacker@klever.net> | 2007-11-19 19:02:42 (UTC) |
---|---|---|
committer | Michael Krelin <hacker@klever.net> | 2007-11-19 19:02:42 (UTC) |
commit | 09494e1183dba8879d438b57f6921f46518087b0 (patch) (unidiff) | |
tree | 301fba19a5ec2dc4c8fc673b1c1efcfe4ddf069e | |
parent | f2ccc66f71063d45f5bde741a69d9aae954d58da (diff) | |
download | libopkele-09494e1183dba8879d438b57f6921f46518087b0.zip libopkele-09494e1183dba8879d438b57f6921f46518087b0.tar.gz libopkele-09494e1183dba8879d438b57f6921f46518087b0.tar.bz2 |
pay attention to PCRE_{CFLAGS,LIBS} environment variables.
pkgconfig macros only check the variables in question if pkgconfig itself isn't
available. Since libpcre prior to 5.0 lacks pkgconfig support I want
PCRE_{CFLAGS,LIBS} variables to be _really_ influential.
Signed-off-by: Michael Krelin <hacker@klever.net>
-rw-r--r-- | configure.ac | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac index 4f9b6c2..68872d9 100644 --- a/configure.ac +++ b/configure.ac | |||
@@ -40,35 +40,40 @@ AC_ARG_ENABLE([doxygen], | |||
40 | [ | 40 | [ |
41 | test "${enableval}" = "no" && WANT_DOXYGEN="no" | 41 | test "${enableval}" = "no" && WANT_DOXYGEN="no" |
42 | ] | 42 | ] |
43 | ) | 43 | ) |
44 | if test "${WANT_DOXYGEN}" = "yes" ; then | 44 | if test "${WANT_DOXYGEN}" = "yes" ; then |
45 | AC_WITH_DOXYGEN | 45 | AC_WITH_DOXYGEN |
46 | AC_WITH_DOT | 46 | AC_WITH_DOT |
47 | else | 47 | else |
48 | AM_CONDITIONAL([HAVE_DOXYGEN],[false]) | 48 | AM_CONDITIONAL([HAVE_DOXYGEN],[false]) |
49 | AM_CONDITIONAL([HAVE_DOT],[false]) | 49 | AM_CONDITIONAL([HAVE_DOT],[false]) |
50 | fi | 50 | fi |
51 | 51 | ||
52 | LIBCURL_CHECK_CONFIG(,,,[ | 52 | LIBCURL_CHECK_CONFIG(,,,[ |
53 | AC_MSG_ERROR([no required libcurl library. get one from http://curl.haxx.se/]) | 53 | AC_MSG_ERROR([no required libcurl library. get one from http://curl.haxx.se/]) |
54 | ]) | 54 | ]) |
55 | 55 | ||
56 | PKG_CHECK_MODULES([PCRE],[libpcre],,[ | 56 | if test -n "$PCRE_LIBS" -a -n "$PCRE_CFLAGS" ; then |
57 | AC_MSG_ERROR([no libpcre found, go get it at http://www.pcre.org/]) | 57 | AC_SUBST([PCRE_CFLAGS]) |
58 | ]) | 58 | AC_SUBST([PCRE_LIBS]) |
59 | else | ||
60 | PKG_CHECK_MODULES([PCRE],[libpcre],,[ | ||
61 | AC_MSG_ERROR([no libpcre found, go get it at http://www.pcre.org/]) | ||
62 | ]) | ||
63 | fi | ||
59 | 64 | ||
60 | curl_ssl_verify_host="true" | 65 | curl_ssl_verify_host="true" |
61 | AC_ARG_ENABLE([ssl-verify-host], | 66 | AC_ARG_ENABLE([ssl-verify-host], |
62 | AC_HELP_STRING([--disable-ssl-verify-host],[disable cURL cert/host relationships verification]), | 67 | AC_HELP_STRING([--disable-ssl-verify-host],[disable cURL cert/host relationships verification]), |
63 | [ test "${enableval}" = "no" && curl_ssl_verify_host="false" ] | 68 | [ test "${enableval}" = "no" && curl_ssl_verify_host="false" ] |
64 | ) | 69 | ) |
65 | ${curl_ssl_verify_host} || AC_DEFINE([DISABLE_CURL_SSL_VERIFYHOST],,[defined if cURL is not to verify cert/host]) | 70 | ${curl_ssl_verify_host} || AC_DEFINE([DISABLE_CURL_SSL_VERIFYHOST],,[defined if cURL is not to verify cert/host]) |
66 | 71 | ||
67 | curl_ssl_verify_peer="true" | 72 | curl_ssl_verify_peer="true" |
68 | AC_ARG_ENABLE([ssl-verify-peer], | 73 | AC_ARG_ENABLE([ssl-verify-peer], |
69 | AC_HELP_STRING([--disable-ssl-verify-peer],[disable cURL cert validity verification]), | 74 | AC_HELP_STRING([--disable-ssl-verify-peer],[disable cURL cert validity verification]), |
70 | [ test "${enableval}" = "no" && curl_ssl_verify_peer="false" ] | 75 | [ test "${enableval}" = "no" && curl_ssl_verify_peer="false" ] |
71 | ) | 76 | ) |
72 | ${curl_ssl_verify_peer} || AC_DEFINE([DISABLE_CURL_SSL_VERIFYPEER],,[defined if cURL is not to verify cert validity]) | 77 | ${curl_ssl_verify_peer} || AC_DEFINE([DISABLE_CURL_SSL_VERIFYPEER],,[defined if cURL is not to verify cert validity]) |
73 | 78 | ||
74 | postels_law=true | 79 | postels_law=true |