Update of /cvsroot/openantivirus/samba-vscan
In directory sc8-pr-cvs1:/tmp/cvs-serv22231
Modified Files:
Tag: VSCAN_0_3
Makefile.in configure.in
Log Message:
- revert my generic make rule patch...(seems to not work on FreeBSD)
- --with-single-libs was also broken :-(
- add filetype detection in configure.in
--with-filetype=yes|no|auto (default=auto)
Rainer, can you test the filetype detection stuff.
I don't have libmagic...
metze
Index: Makefile.in
===================================================================
RCS file: /cvsroot/openantivirus/samba-vscan/Makefile.in,v
retrieving revision 1.19.2.7
retrieving revision 1.19.2.8
diff -u -d -r1.19.2.7 -r1.19.2.8
--- Makefile.in 15 Sep 2003 13:21:29 -0000 1.19.2.7
+++ Makefile.in 24 Sep 2003 11:06:34 -0000 1.19.2.8
@@ -67,11 +67,11 @@
FLAGS = $(INCLUDE_FLAGS) $(CFLAGS) $(CPPFLAGS) @VSCAN_SINGLE_LIB_FLAGS@
-GLOBAL_VFS_OBJS =
+GLOBAL_LIBS = @GLOBAL_LIBS@
-GLOBAL_OBJS = $(GLOBAL_VFS_OBJS) global/vscan-functions.o \
-global/vscan-message.o global/vscan-quarantine.o \
-global/vscan-fileaccesslog.o global/vscan-filetype.o
+GLOBAL_OBJS = global/vscan-functions.o \
+ global/vscan-message.o global/vscan-quarantine.o \
+ global/vscan-fileaccesslog.o global/vscan-filetype.o
OAV_OBJS = openantivirus/vscan-oav.o openantivirus/vscan-oav_core.o
vscan-oav_OBJS = $(GLOBAL_OBJS) $(OAV_OBJS)
@@ -139,41 +139,114 @@
@BROKEN_CC@ -mv `echo $@ | sed -e 's%^.*/%%g' -e 's%\.po$$%.o%'` $@
@POBAD_CC@ @mv $*.po.o $@
-%.@SHLIBEXT@:
- @if test -n "$(${*}_OBJS:.@OBJEXT@=.@PICSUFFIX@)";then \
- make -s $(${*}_OBJS:.@OBJEXT@=.@PICSUFFIX@); \
- else \
- make -s $(*).@PICSUFFIX@; \
- fi
+.@PICSUFFIX@.@SHLIBEXT@:
@if (: >> $@ || : > $@) >/dev/null 2>&1; then rm -f $@; else \
dir=`echo $@ | sed 's,/[^/]*$$,,;s,^$$,.,'` $(MAKEDIR); fi
@echo "Linking $@"
- @echo "with libs: $(${*}_LIBS)"
-# FIXME: -lmagic should only be added when file type detection will be used
+ @$(SHLD) $(LDSHFLAGS) $(LDFLAGS) \
+ -o $@ $< -Wl,-soname=`basename $@`
+
+vscan-oav.$(SHLIBEXT): $(vscan-oav_OBJS:.@OBJEXT@=.@PICSUFFIX@)
+ @echo "Linking $@"
+ @if test -n "$(${*}_LIBS)" -o -n "$(GLOBAL_LIBS)";then \
+ echo "with libs: $(${*}_LIBS) $(GLOBAL_LIBS)"; \
+ fi
@$(SHLD) $(LDSHFLAGS) $(LDFLAGS) \
$(${*}_OBJS:.@OBJEXT@=.@PICSUFFIX@) \
- -o $@ @SONAMEFLAG@`basename $@` $(${*}_LIBS) -lmagic
+ -o $@ @SONAMEFLAG@`basename $@` $(${*}_LIBS) $(GLOBAL_LIBS)
oav: vscan-oav.$(SHLIBEXT)
+vscan-sophos.$(SHLIBEXT): $(vscan-sophos_OBJS:.@OBJEXT@=.@PICSUFFIX@)
+ @echo "Linking $@"
+ @if test -n "$(${*}_LIBS)" -o -n "$(GLOBAL_LIBS)";then \
+ echo "with libs: $(${*}_LIBS) $(GLOBAL_LIBS)"; \
+ fi
+ @$(SHLD) $(LDSHFLAGS) $(LDFLAGS) \
+ $(${*}_OBJS:.@OBJEXT@=.@PICSUFFIX@) \
+ -o $@ @SONAMEFLAG@`basename $@` $(${*}_LIBS) $(GLOBAL_LIBS)
+
sophos: vscan-sophos.$(SHLIBEXT)
+vscan-fprotd.$(SHLIBEXT): $(vscan-fprotd_OBJS:.@OBJEXT@=.@PICSUFFIX@)
+ @echo "Linking $@"
+ @if test -n "$(${*}_LIBS)" -o -n "$(GLOBAL_LIBS)";then \
+ echo "with libs: $(${*}_LIBS) $(GLOBAL_LIBS)"; \
+ fi
+ @$(SHLD) $(LDSHFLAGS) $(LDFLAGS) \
+ $(${*}_OBJS:.@OBJEXT@=.@PICSUFFIX@) \
+ -o $@ @SONAMEFLAG@`basename $@` $(${*}_LIBS) $(GLOBAL_LIBS)
+
fprotd: vscan-fprotd.$(SHLIBEXT)
+vscan-trend.$(SHLIBEXT): $(vscan-trend_OBJS:.@OBJEXT@=.@PICSUFFIX@)
+ @echo "Linking $@"
+ @if test -n "$(${*}_LIBS)" -o -n "$(GLOBAL_LIBS)";then \
+ echo "with libs: $(${*}_LIBS) $(GLOBAL_LIBS)"; \
+ fi
+ @$(SHLD) $(LDSHFLAGS) $(LDFLAGS) \
+ $(${*}_OBJS:.@OBJEXT@=.@PICSUFFIX@) \
+ -o $@ @SONAMEFLAG@`basename $@` $(${*}_LIBS) $(GLOBAL_LIBS)
+
trend: vscan-trend.$(SHLIBEXT)
+vscan-icap.$(SHLIBEXT): $(vscan-icap_OBJS:.@OBJEXT@=.@PICSUFFIX@)
+ @echo "Linking $@"
+ @if test -n "$(${*}_LIBS)" -o -n "$(GLOBAL_LIBS)";then \
+ echo "with libs: $(${*}_LIBS) $(GLOBAL_LIBS)"; \
+ fi
+ @$(SHLD) $(LDSHFLAGS) $(LDFLAGS) \
+ $(${*}_OBJS:.@OBJEXT@=.@PICSUFFIX@) \
+ -o $@ @SONAMEFLAG@`basename $@` $(${*}_LIBS) $(GLOBAL_LIBS)
+
icap: vscan-icap.$(SHLIBEXT)
libmksd: $(libmksd_OBJS:.@OBJEXT@=.@SHLIBEXT@)
+vscan-mksd.$(SHLIBEXT): $(vscan-mksd_OBJS:.@OBJEXT@=.@PICSUFFIX@)
+ @echo "Linking $@"
+ @if test -n "$(${*}_LIBS)" -o -n "$(GLOBAL_LIBS)";then \
+ echo "with libs: $(${*}_LIBS) $(GLOBAL_LIBS)"; \
+ fi
+ @$(SHLD) $(LDSHFLAGS) $(LDFLAGS) \
+ $(${*}_OBJS:.@OBJEXT@=.@PICSUFFIX@) \
+ -o $@ @SONAMEFLAG@`basename $@` $(${*}_LIBS) $(GLOBAL_LIBS)
+
mksd: vscan-mksd.$(SHLIBEXT)
libkavdc: $(libkavdc_OBJS:.@OBJEXT@=.@SHLIBEXT@)
+vscan-kavp.$(SHLIBEXT): $(vscan-kavp_OBJS:.@OBJEXT@=.@PICSUFFIX@)
+ @echo "Linking $@"
+ @if test -n "$(${*}_LIBS)" -o -n "$(GLOBAL_LIBS)";then \
+ echo "with libs: $(${*}_LIBS) $(GLOBAL_LIBS)"; \
+ fi
+ @$(SHLD) $(LDSHFLAGS) $(LDFLAGS) \
+ $(${*}_OBJS:.@OBJEXT@=.@PICSUFFIX@) \
+ -o $@ @SONAMEFLAG@`basename $@` $(${*}_LIBS) $(GLOBAL_LIBS)
+
kavp: vscan-kavp.$(SHLIBEXT)
+vscan-symantec.$(SHLIBEXT): $(vscan-symantec_OBJS:.@OBJEXT@=.@PICSUFFIX@)
+ @echo "Linking $@"
+ @if test -n "$(${*}_LIBS)" -o -n "$(GLOBAL_LIBS)";then \
+ echo "with libs: $(${*}_LIBS) $(GLOBAL_LIBS)"; \
+ fi
+ @$(SHLD) $(LDSHFLAGS) $(LDFLAGS) \
+ $(${*}_OBJS:.@OBJEXT@=.@PICSUFFIX@) \
+ -o $@ @SONAMEFLAG@`basename $@` $(${*}_LIBS) $(GLOBAL_LIBS)
+
symantec: vscan-symantec.$(SHLIBEXT)
+vscan-clamav.$(SHLIBEXT): $(vscan-clamav_OBJS:.@OBJEXT@=.@PICSUFFIX@)
+ @echo "Linking $@"
+ @if test -n "$(${*}_LIBS)" -o -n "$(GLOBAL_LIBS)";then \
+ echo "with libs: $(${*}_LIBS) $(GLOBAL_LIBS)"; \
+ fi
+ @$(SHLD) $(LDSHFLAGS) $(LDFLAGS) \
+ $(${*}_OBJS:.@OBJEXT@=.@PICSUFFIX@) \
+ -o $@ @SONAMEFLAG@`basename $@` $(${*}_LIBS) $(GLOBAL_LIBS)
+
clamav: vscan-clamav.$(SHLIBEXT)
all: @VSCAN_BACKENDS@
@@ -191,18 +264,26 @@
# Misc targets
clean:
- rm -rf .libs
- rm -f $(CLEAN_OBJS:.@OBJEXT@=.@PICSUFFIX@)
- rm -f $(CLEAN_OBJS:.@OBJEXT@=.@SHLIBEXT@)
- rm -f core *~ *% *.$(SHLIBEXT)
+ @echo "make clean..."
+ @echo "Remove all *.${OBJEXT} *.${PICSUFFIX} *.${SHLIBEXT} files"
+ @rm -rf .libs
+ @rm -f $(CLEAN_OBJS:.@OBJEXT@=.@PICSUFFIX@)
+ @rm -f $(CLEAN_OBJS:.@OBJEXT@=.@SHLIBEXT@)
+ @rm -f core *~ *% *.$(SHLIBEXT)
+ @echo "make clean done"
realclean: clean
- rm -f include/vscan-config.h
- rm -f config.log config.status
- rm -f Makefile
+ @echo "make realclean..."
+ @rm -f include/vscan-config.h
+ @rm -f config.log config.status
+ @rm -f Makefile
+ @echo "make realclean done"
distclean: realclean
+ @echo "make distclean done"
realdistclean: realclean
- rm -f include/vscan-config.h*
- rm -f configure
+ @echo "make realdistclean..."
+ @rm -f include/vscan-config.h*
+ @rm -f configure
+ @echo "make realdistclean done"
Index: configure.in
===================================================================
RCS file: /cvsroot/openantivirus/samba-vscan/configure.in,v
retrieving revision 1.17.2.5
retrieving revision 1.17.2.6
diff -u -d -r1.17.2.5 -r1.17.2.6
--- configure.in 26 Aug 2003 19:30:35 -0000 1.17.2.5
+++ configure.in 24 Sep 2003 11:06:34 -0000 1.17.2.6
@@ -157,6 +157,9 @@
AC_SUBST(EXTRA_SBIN_PROGS)
AC_SUBST(EXTRA_ALL_TARGETS)
+GLOBAL_LIBS=
+AC_SUBST(GLOBAL_LIBS)
+
AC_ARG_ENABLE(debug,
[ --enable-debug Turn on compiler debugging information (default=no)],
[if eval "test x$enable_debug = xyes"; then
@@ -814,6 +817,70 @@
#
###########################################################
+
+###########################################################
+#
+# check for magic.h and -lmagic
+#
+vscan_cv_filetype=auto
+MAGIC_LIB=
+AC_MSG_CHECKING(for filetype support)
+AC_ARG_WITH(filetype,
+[ --with-filetype Check for filetype support (default=auto)],
+[ case "$withval" in
+ yes)
+ vscan_cv_filetype=$withval
+ vscan_cv_filetype_wanted=yes
+ AC_MSG_RESULT(${vscan_cv_filetype})
+ ;;
+ no)
+ vscan_cv_filetype=$withval
+ vscan_cv_filetype_wanted=no
+ AC_MSG_RESULT(${vscan_cv_filetype})
+ ;;
+ *)
+ AC_MSG_RESULT(${vscan_cv_filetype})
+ ;;
+ esac ],
+ AC_MSG_RESULT(${vscan_cv_filetype})
+)
+
+if test x"$vscan_cv_filetype" != x"no"; then
+ vscan_cv_filetype=no
+
+ AC_CHECK_HEADERS(magic.h)
+ vscan_save_LIBS=$LIBS
+ AC_CHECK_LIB(magic,magic_load)
+ LIBS=$vscan_save_LIBS
+ if test x"$ac_cv_header_magic_h" = x"yes"; then
+ if test x"$ac_cv_lib_magic_magic_load" = x"yes"; then
+ vscan_cv_filetype=yes
+ MAGIC_LIB="-lmagic"
+ fi
+ fi
+fi
+
+AC_MSG_CHECKING(whether to use filetype support)
+if test x"$vscan_cv_filetype" = x"yes"; then
+ GLOBAL_LIBS="${MAGIC_LIB} ${GLOBAL_LIBS}"
+ AC_DEFINE(HAVE_FILETYPE_SUPPORT,1,[Whether to have -lmagic])
+ AC_MSG_RESULT(yes)
+else
+ AC_MSG_RESULT(no)
+ if test x"$vscan_cv_filetype_wanted" = x"yes"; then
+ AC_MSG_WARN(sorry no filetype support is possible)
+ AC_MSG_ERROR(please install libmagic if you need filetype support)
+ elif test x"$vscan_cv_filetype_wanted" = x"no"; then
+ TMP_DUMMY=
+ else
+ AC_MSG_WARN(sorry no filetype support is possible)
+ AC_MSG_WARN(please install libmagic if you need filetype support)
+ fi
+fi
+#
+###########################################################
+
+###########################################################
AC_OUTPUT(Makefile)
AC_MSG_RESULT([
@@ -822,6 +889,7 @@
Compile samba-vscan for Samba : $SAMBA_VERSION_STRING
Compile samba-vscan with sources in: $SAMBA_SOURCE
Compile samba-vscan backends : $VSCAN_BACKENDS
+ Use GLOBAL_LIBS : $GLOBAL_LIBS
Use libmksd as : $MKS_LIB
Use libkavdc as : $KAV_LIB
])
-------------------------------------------------------
This sf.net email is sponsored by:ThinkGeek
Welcome to geek heaven.
http://thinkgeek.com/sf
lmpx.com only provides a reader for public news (NNTP) servers. It is not
affiliated with the servers or forums shown here and is not responsible for
the content of articles, which is written by their respective authors.