samba-vscan Makefile.in,1.19.2.8,1.19.2.9 configure.in,1.17.2.7,1.17.2.8

Update of /cvsroot/openantivirus/samba-vscan
In directory sc8-pr-cvs1:/tmp/cvs-serv29535

Modified Files:
      Tag: VSCAN_0_3
	Makefile.in configure.in 
Log Message:
added support for libclamav into vscan-clamav (clamd still support).
use --wih-clamav to enable libclamav support. Build currently, but
not usable with Samba 3.0.0 up to now. Reason unkown.


Index: Makefile.in
===================================================================
RCS file: /cvsroot/openantivirus/samba-vscan/Makefile.in,v
retrieving revision 1.19.2.8
retrieving revision 1.19.2.9
diff -u -d -r1.19.2.8 -r1.19.2.9
--- Makefile.in	24 Sep 2003 11:06:34 -0000	1.19.2.8
+++ Makefile.in	1 Dec 2003 13:20:39 -0000	1.19.2.9
@@ -104,6 +104,7 @@
 
 CLAMAV_OBJS = clamav/vscan-clamav.o clamav/vscan-clamav_core.o
 vscan-clamav_OBJS = $(GLOBAL_OBJS) $(CLAMAV_OBJS)
+vscan-clamav_LIBS = @CLAMAV_LIBS@  
 
 CLEAN_OBJS = $(GLOBAL_OBJS) $(OAV_OBJS) $(SOPHOS_OBJS) $(FPROT_OBJS) \
 		$(TREND_OBJS) $(ICAP_OBJS) $(MKS_OBJS) $(libmksd_OBJS) \

Index: configure.in
===================================================================
RCS file: /cvsroot/openantivirus/samba-vscan/configure.in,v
retrieving revision 1.17.2.7
retrieving revision 1.17.2.8
diff -u -d -r1.17.2.7 -r1.17.2.8
--- configure.in	17 Nov 2003 19:55:04 -0000	1.17.2.7
+++ configure.in	1 Dec 2003 13:20:40 -0000	1.17.2.8
@@ -668,6 +668,32 @@
 
 ###########################################################
 #
+# clamav
+#
+AC_MSG_CHECKING(whether to use libclamav, disables clamd support)
+AC_ARG_WITH(libclamav,
+[ --with-libclamav  Use libclamav instead of clamd (default=no)],
+[ if test x"$withval" = "xyes" ; then
+   AC_CHECK_HEADERS(clamav.h)
+   vscan_save_LIBS=$LIBS
+   AC_CHECK_LIB(clamav,cl_loaddbdir)
+   LIBS=$vscan_save_LIBS
+   if test x"$ac_cv_header_clamav_h" = x"yes"; then
+    if test x"$ac_cv_lib_clamav_cl_loaddbdir" = x"yes"; then
+      CLAMAV_LIBS="-lclamav"
+      AC_DEFINE(LIBCLAMAV,1,[Whether to use lib clamav])
+      AC_MSG_RESULT(yes)
+    else
+      AC_MSG_RESULT(no)
+    fi
+   fi
+  else
+   AC_MSG_RESULT(no) 
+ fi
+])
+AC_SUBST(CLAMAV_LIBS)
+
+#
 # MKS lib (libmksd)
 #
 vscan_cv_libmksd_builtin=auto




-------------------------------------------------------
This SF.net email is sponsored by: SF.net Giveback Program.
Does SourceForge.net help you be more productive?  Does it
help you create better code?  SHARE THE LOVE, and help us help
YOU!  Click Here: http://sourceforge.net/donate/