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) (side-by-side diff) | |
tree | 301fba19a5ec2dc4c8fc673b1c1efcfe4ddf069e /configure.ac | |
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], [ test "${enableval}" = "no" && WANT_DOXYGEN="no" ] ) if test "${WANT_DOXYGEN}" = "yes" ; then AC_WITH_DOXYGEN AC_WITH_DOT else AM_CONDITIONAL([HAVE_DOXYGEN],[false]) AM_CONDITIONAL([HAVE_DOT],[false]) fi LIBCURL_CHECK_CONFIG(,,,[ AC_MSG_ERROR([no required libcurl library. get one from http://curl.haxx.se/]) ]) -PKG_CHECK_MODULES([PCRE],[libpcre],,[ - AC_MSG_ERROR([no libpcre found, go get it at http://www.pcre.org/]) -]) +if test -n "$PCRE_LIBS" -a -n "$PCRE_CFLAGS" ; then + AC_SUBST([PCRE_CFLAGS]) + AC_SUBST([PCRE_LIBS]) +else + PKG_CHECK_MODULES([PCRE],[libpcre],,[ + AC_MSG_ERROR([no libpcre found, go get it at http://www.pcre.org/]) + ]) +fi curl_ssl_verify_host="true" AC_ARG_ENABLE([ssl-verify-host], AC_HELP_STRING([--disable-ssl-verify-host],[disable cURL cert/host relationships verification]), [ test "${enableval}" = "no" && curl_ssl_verify_host="false" ] ) ${curl_ssl_verify_host} || AC_DEFINE([DISABLE_CURL_SSL_VERIFYHOST],,[defined if cURL is not to verify cert/host]) curl_ssl_verify_peer="true" AC_ARG_ENABLE([ssl-verify-peer], AC_HELP_STRING([--disable-ssl-verify-peer],[disable cURL cert validity verification]), [ test "${enableval}" = "no" && curl_ssl_verify_peer="false" ] ) ${curl_ssl_verify_peer} || AC_DEFINE([DISABLE_CURL_SSL_VERIFYPEER],,[defined if cURL is not to verify cert validity]) postels_law=true |