summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBertrand Jacquin <beber@meleeweb.net>2011-06-10 00:42:26 +0200
committerBertrand Jacquin <beber@meleeweb.net>2011-06-10 00:42:26 +0200
commitac821812ba02f627528398914777631df0a4fd93 (patch)
treebe465e70007b66b18a8cfd5e121273830664efc8
parentsquid-3.1.18: presuppose that squid --with-squid is ok when cross (diff)
downloadpatches-ac821812ba02f627528398914777631df0a4fd93.tar.gz
havp-0.89: fix cross compilationHEADmaster
-rw-r--r--havp/havp-0.89-BJA-pkg-config-libclamav.diff68
1 files changed, 68 insertions, 0 deletions
diff --git a/havp/havp-0.89-BJA-pkg-config-libclamav.diff b/havp/havp-0.89-BJA-pkg-config-libclamav.diff
new file mode 100644
index 0000000..0f210d0
--- /dev/null
+++ b/havp/havp-0.89-BJA-pkg-config-libclamav.diff
@@ -0,0 +1,68 @@
+--- configure.in.ori 2007-10-04 10:29:24.000000000 +0200
++++ configure.in 2009-05-13 20:25:35.000000000 +0200
+@@ -5,6 +5,7 @@
+ unset CDPATH
+
+ AC_PROG_CXX
++PKG_PROG_PKG_CONFIG
+
+ AC_PREFIX_DEFAULT(/usr/local)
+
+@@ -83,48 +84,15 @@
+ AC_DEFINE(SSLTUNNEL)
+ fi
+
+-AC_MSG_CHECKING(for ClamAV scanner library)
+-
+-if test "$enable_clamav" = "yes"
+-then
+- clamprefix="`clamav-config --prefix 2>/dev/null`"
+- clamversion="`clamav-config --version 2>/dev/null`"
+-
+- if test "x$clamprefix" = "x"
+- then
+- AC_MSG_RESULT([clamav-config not found])
+-
+- echo ""
+- echo " Error finding ClamAV installation!"
+- echo " Add ClamAV binaries path to PATH and run configure again."
+- echo ""
+- echo " To disable ClamAV library support, use --disable-clamav."
+- echo ""
+-
+- exit 1
+- fi
+-
+- for cl in `clamav-config --cflags 2>/dev/null`; do
+- if test "x`echo $cl | perl -ne 'print if (/^-I/)' 2>/dev/null`" != "x"
+- then
+- CFLAGS="$CFLAGS $cl"
+- fi
+- done
+-
+- for cl in `clamav-config --libs 2>/dev/null`; do
+- if test "x`echo $cl | perl -ne 'print if (/(^-L|thread|c_r)/)' 2>/dev/null`" != "x"
+- then
+- LDFLAGS="$LDFLAGS $cl"
+- fi
+- done
+- LDFLAGS="$LDFLAGS -lclamav"
+-
+- SCANNEROBJECTS="clamlibscanner.o"
+- AC_DEFINE(USECLAMLIB)
+-
+- AC_MSG_RESULT([found $clamversion in $clamprefix])
+-else
+- AC_MSG_RESULT([disabled :-(])
++if test "$enable_clamav" = "yes" ; then
++ PKG_CHECK_MODULES(clamav, libclamav,
++ [
++ CFLAGS="$CFLAGS $clamav_CFLAGS"
++ LDFLAGS="$LDFLAGS $clamav_LIBS"
++
++ SCANNEROBJECTS="clamlibscanner.o"
++ AC_DEFINE(USECLAMLIB)
++ ])
+ fi
+
+ AC_MSG_CHECKING(for Trend Micro scanner)