author | Michael Krelin <hacker@klever.net> | 2007-09-22 20:56:57 (UTC) |
---|---|---|
committer | Michael Krelin <hacker@klever.net> | 2007-09-22 20:56:57 (UTC) |
commit | 5cb71518360f865cd4448a083b5d481e6f356a3e (patch) (side-by-side diff) | |
tree | 4faeab2b1a1a14c589745be714be18471879e781 /configure.ac | |
parent | 5cfe3f2743c2b2eb2689090516a4e667fd8ca29a (diff) | |
download | libopkele-5cb71518360f865cd4448a083b5d481e6f356a3e.zip libopkele-5cb71518360f865cd4448a083b5d481e6f356a3e.tar.gz libopkele-5cb71518360f865cd4448a083b5d481e6f356a3e.tar.bz2 |
got rid of all pcre wrappers altogether
although all claims against pcre++ make absolutely no sense. But for now I'll
live with no wrappers at all. I may reconsider it when implementing more
sophisticated discovery mechanisms for upcoming extensions.
Signed-off-by: Michael Krelin <hacker@klever.net>
-rw-r--r-- | configure.ac | 47 |
1 files changed, 3 insertions, 44 deletions
diff --git a/configure.ac b/configure.ac index 00c6bc4..53e22ba 100644 --- a/configure.ac +++ b/configure.ac @@ -54,48 +54,7 @@ LIBCURL_CHECK_CONFIG(,,,[ ]) -want_pcre_impl="" -AC_ARG_WITH([pcre-bindings], - AC_HELP_STRING([--with-pcre-bindings=(pcrepp|none|libpcrecpp)],[Specify which pcre c++ bindings to use. 'pcrepp' stands for quite sensible library, found at http://www.daemon.de/PCRE/, 'libcrecpp' makes use of crappy bindings by google and 'none' disables internal implementation of OP discovery]), - [ - case "$withval" in - pcrepp) want_pcre_impl="pcrepp" ;; - libpcrecpp) want_pcre_impl="libpcrecpp" ;; - none) want_pcre_impl="none";; - *) AC_MSG_ERROR([I'm not sure I understand what do you want for a pcre c++ bindings]) ;; - esac - ] -) - -found_pcre_impl="" - -if test -z "$want_pcre_impl" -o "$want_pcre_impl" = "pcrepp" ; then - AC_WITH_PCRE([ - AC_WITH_PCREPP([ - found_pcre_impl=pcrepp - ]) - ],[ - AC_MSG_ERROR([no pcre library found. get one at http://www.pcre.org/]) - ] - ) - test "$want_pcre_impl,$found_pcre_impl" = "pcrepp," && AC_MSG_ERROR([no pcre++ library found. get one at http://www.daemon.de/PCRE]) -fi - -if test "$found_pcre_impl,$want_pcre_impl" = "," -o "$want_pcre_impl" = "libpcrecpp" ; then - test -z "$want_pcre_impl" || AC_MSG_NOTICE([You want to use crappy libpcre c++ bindings]) - PKG_CHECK_MODULES([LIBPCRECPP],[libpcrecpp],[ - found_pcre_impl=libpcrecpp - CXXFLAGS="$CXXFLAGS $LIBPCRECPP_CFLAGS" - LIBS="$LIBS $LIBPCRECPP_LIBS" - ],[ - test -z "$want_pcre_impl" || AC_MSG_ERROR([no libpcre c++ bindings found. why would you want it if you don't have it installed?]) - ] - ) -fi -test "$want_pcre_impl,$found_pcre_impl" = "," && AC_MSG_ERROR([no pcre c++ bindings found, use --with-pcre-bindings=none to disable code that makes use of it]) - -case "$found_pcre_impl" in - pcrepp) AC_DEFINE([USE_PCREPP],,[defined if pcre++ is to be used]) ;; - libpcrecpp) AC_DEFINE([USE_LIBPCRECPP],,[defined if crappy google bindings are to be used]) ;; -esac +PKG_CHECK_MODULES([PCRE],[libpcre],,[ + AC_MSG_ERROR([no libpcre found, go get it at http://www.pcre.org/]) +]) curl_ssl_verify_host="true" |