From f3415849fa7f3def60d3fe4d50ff4bde2dcf67a9 Mon Sep 17 00:00:00 2001 From: Tomasz Kojm Date: Tue, 19 Jul 2005 20:09:13 +0000 Subject: [PATCH] fix compilation error when curl is installed in a non-standard location git-svn: trunk@1657 --- clamav-devel/ChangeLog | 6 ++++++ clamav-devel/configure | 6 +++++- clamav-devel/configure.in | 6 +++++- 3 files changed, 16 insertions(+), 2 deletions(-) diff --git a/clamav-devel/ChangeLog b/clamav-devel/ChangeLog index 96a2c23d5..a953314d2 100644 --- a/clamav-devel/ChangeLog +++ b/clamav-devel/ChangeLog @@ -1,3 +1,9 @@ +Tue Jul 19 22:07:15 CEST 2005 (tk) +---------------------------------- + * configure.in: fix compilation error when curl is installed in a + non-standard location (reported by Serge van den Boom + ) + Tue Jul 19 21:11:25 CEST 2005 (tk) ---------------------------------- * configure.in: add support for DragonFly (thanks to Joerg Sonnenberger diff --git a/clamav-devel/configure b/clamav-devel/configure index 904ddb95e..64bf84bdd 100755 --- a/clamav-devel/configure +++ b/clamav-devel/configure @@ -11400,7 +11400,11 @@ echo $ECHO_N "checking for curl >= $check... $ECHO_C" >&6 if test x$fail != x1; then curl_libs=`curl-config --libs` - LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS $curl_libs" + # openssl libs are required to link libcurl + openssl_libs="`pkg-config --libs openssl`" + curl_flags=`curl-config --cflags` + LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS $curl_libs $openssl_libs" + CPPFLAGS="$CPPFLAGS -I$ZLIB_HOME/include $curl_flags" my_cv_curl_vers="$ver" echo "$as_me:$LINENO: result: $my_cv_curl_vers" >&5 echo "${ECHO_T}$my_cv_curl_vers" >&6 diff --git a/clamav-devel/configure.in b/clamav-devel/configure.in index ef6a0a5b7..b85b565a6 100644 --- a/clamav-devel/configure.in +++ b/clamav-devel/configure.in @@ -220,7 +220,11 @@ then if test x$fail != x1; then curl_libs=`curl-config --libs` - LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS $curl_libs" + # openssl libs are required to link libcurl + openssl_libs="`pkg-config --libs openssl`" + curl_flags=`curl-config --cflags` + LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS $curl_libs $openssl_libs" + CPPFLAGS="$CPPFLAGS -I$ZLIB_HOME/include $curl_flags" my_cv_curl_vers="$ver" AC_MSG_RESULT([$my_cv_curl_vers]) AC_DEFINE(WITH_CURL,1,use libcurl in mbox code)