Browse code

fix compilation error when curl is installed in a non-standard location

git-svn: trunk@1657

Tomasz Kojm authored on 2005/07/20 05:09:13
Showing 3 changed files
... ...
@@ -1,3 +1,9 @@
1
+Tue Jul 19 22:07:15 CEST 2005 (tk)
2
+----------------------------------
3
+  * configure.in: fix compilation error when curl is installed in a
4
+		  non-standard location (reported by Serge van den Boom
5
+		  <svdb*stack.nl>)
6
+
1 7
 Tue Jul 19 21:11:25 CEST 2005 (tk)
2 8
 ----------------------------------
3 9
   * configure.in: add support for DragonFly (thanks to Joerg Sonnenberger
... ...
@@ -11400,7 +11400,11 @@ echo $ECHO_N "checking for curl >= $check... $ECHO_C" >&6
11400 11400
 
11401 11401
 	if test x$fail != x1; then
11402 11402
 	    curl_libs=`curl-config --libs`
11403
-	    LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS $curl_libs"
11403
+	    # openssl libs are required to link libcurl
11404
+	    openssl_libs="`pkg-config --libs openssl`"
11405
+	    curl_flags=`curl-config --cflags`
11406
+	    LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS $curl_libs $openssl_libs"
11407
+	    CPPFLAGS="$CPPFLAGS -I$ZLIB_HOME/include $curl_flags"
11404 11408
 	    my_cv_curl_vers="$ver"
11405 11409
 	    echo "$as_me:$LINENO: result: $my_cv_curl_vers" >&5
11406 11410
 echo "${ECHO_T}$my_cv_curl_vers" >&6
... ...
@@ -220,7 +220,11 @@ then
220 220
 
221 221
 	if test x$fail != x1; then
222 222
 	    curl_libs=`curl-config --libs`
223
-	    LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS $curl_libs"
223
+	    # openssl libs are required to link libcurl
224
+	    openssl_libs="`pkg-config --libs openssl`"
225
+	    curl_flags=`curl-config --cflags`
226
+	    LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS $curl_libs $openssl_libs"
227
+	    CPPFLAGS="$CPPFLAGS -I$ZLIB_HOME/include $curl_flags"
224 228
 	    my_cv_curl_vers="$ver"
225 229
 	    AC_MSG_RESULT([$my_cv_curl_vers])
226 230
 	    AC_DEFINE(WITH_CURL,1,use libcurl in mbox code)