open-dsi
/
clamav
mirror of https://github.com/Cisco-Talos/clamav
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

minor cleanup and fix for bb#260

Browse Source 
git-svn: trunk@2671
remotes/push_mirror/metadata
Tomasz Kojm 19 years ago
parent c3045077a4
commit 099cf13cd4
23 changed files with 71 additions and 121 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 4
      clamav-devel/ChangeLog
  2. 2
      clamav-devel/Makefile.in
  3. 2
      clamav-devel/clamav-milter/Makefile.am
  4. 4
      clamav-devel/clamav-milter/Makefile.in
  5. 2
      clamav-devel/clamconf/Makefile.am
  6. 4
      clamav-devel/clamconf/Makefile.in
  7. 2
      clamav-devel/clamd/Makefile.am
  8. 4
      clamav-devel/clamd/Makefile.in
  9. 3
      clamav-devel/clamdscan/Makefile.am
  10. 6
      clamav-devel/clamdscan/Makefile.in
  11. 3
      clamav-devel/clamscan/Makefile.am
  12. 6
      clamav-devel/clamscan/Makefile.in
  13. 64
      clamav-devel/configure
  14. 62
      clamav-devel/configure.in
  15. 2
      clamav-devel/database/Makefile.in
  16. 2
      clamav-devel/docs/Makefile.in
  17. 2
      clamav-devel/etc/Makefile.in
  18. 2
      clamav-devel/freshclam/Makefile.am
  19. 4
      clamav-devel/freshclam/Makefile.in
  20. 2
      clamav-devel/libclamav/Makefile.am
  21. 4
      clamav-devel/libclamav/Makefile.in
  22. 2
      clamav-devel/sigtool/Makefile.am
  23. 4
      clamav-devel/sigtool/Makefile.in

4
clamav-devel/ChangeLog
Unescape View File

@ -1,3 +1,7 @@
Fri Feb 2 23:38:12 CET 2007 (tk)
---------------------------------
* configure/make: minor cleanup and fix for bb#260
Thu Feb 1 12:42:56 GMT 2007 (njh)
----------------------------------
* libclamav: Remove some warnings from icc

2
clamav-devel/Makefile.in
Unescape View File

@ -112,7 +112,6 @@ GZIP_ENV = --best
distuninstallcheck_listfiles = find . -type f -print
distcleancheck_listfiles = find . -type f -print
ACLOCAL = @ACLOCAL@
ADDITIONAL_LIBS = @ADDITIONAL_LIBS@
AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
@ -182,6 +181,7 @@ RANLIB = @RANLIB@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
THREAD_LIBS = @THREAD_LIBS@
TH_SAFE = @TH_SAFE@
VERSION = @VERSION@
ac_ct_CC = @ac_ct_CC@

2
clamav-devel/clamav-milter/Makefile.am
Unescape View File

@ -42,6 +42,6 @@ man_MANS = $(top_srcdir)/docs/man/clamav-milter.8
endif
endif
LIBS = $(top_builddir)/libclamav/libclamav.la @CLAMAV_MILTER_LIBS@
LIBS = $(top_builddir)/libclamav/libclamav.la @CLAMAV_MILTER_LIBS@ @THREAD_LIBS@
INCLUDES = -I$(top_srcdir)/clamd -I$(top_srcdir)/libclamav -I$(top_srcdir)/shared
EXTRA_DIST = clamav-milter.c INSTALL

4
clamav-devel/clamav-milter/Makefile.in
Unescape View File

@ -107,7 +107,6 @@ ETAGS = etags
CTAGS = ctags
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
ADDITIONAL_LIBS = @ADDITIONAL_LIBS@
AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
@ -157,7 +156,7 @@ LDFLAGS = @LDFLAGS@
LIBCLAMAV_LIBS = @LIBCLAMAV_LIBS@
LIBCLAMAV_VERSION = @LIBCLAMAV_VERSION@
LIBOBJS = @LIBOBJS@
LIBS = $(top_builddir)/libclamav/libclamav.la @CLAMAV_MILTER_LIBS@
LIBS = $(top_builddir)/libclamav/libclamav.la @CLAMAV_MILTER_LIBS@ @THREAD_LIBS@
LIBTOOL = @LIBTOOL@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@ -177,6 +176,7 @@ RANLIB = @RANLIB@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
THREAD_LIBS = @THREAD_LIBS@
TH_SAFE = @TH_SAFE@
VERSION = @VERSION@
ac_ct_CC = @ac_ct_CC@

2
clamav-devel/clamconf/Makefile.am
Unescape View File

@ -30,4 +30,4 @@ clamconf_SOURCES = \
clamconf.c
INCLUDES = -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav
LIBS = $(top_builddir)/libclamav/libclamav.la
LIBS = $(top_builddir)/libclamav/libclamav.la @THREAD_LIBS@

4
clamav-devel/clamconf/Makefile.in
Unescape View File

@ -90,7 +90,6 @@ ETAGS = etags
CTAGS = ctags
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
ADDITIONAL_LIBS = @ADDITIONAL_LIBS@
AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
@ -140,7 +139,7 @@ LDFLAGS = @LDFLAGS@
LIBCLAMAV_LIBS = @LIBCLAMAV_LIBS@
LIBCLAMAV_VERSION = @LIBCLAMAV_VERSION@
LIBOBJS = @LIBOBJS@
LIBS = $(top_builddir)/libclamav/libclamav.la
LIBS = $(top_builddir)/libclamav/libclamav.la @THREAD_LIBS@
LIBTOOL = @LIBTOOL@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@ -160,6 +159,7 @@ RANLIB = @RANLIB@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
THREAD_LIBS = @THREAD_LIBS@
TH_SAFE = @TH_SAFE@
VERSION = @VERSION@
ac_ct_CC = @ac_ct_CC@

2
clamav-devel/clamd/Makefile.am
Unescape View File

@ -62,5 +62,5 @@ clamd_SOURCES = \
endif
LIBS = $(top_builddir)/libclamav/libclamav.la @CLAMD_LIBS@ @ADDITIONAL_LIBS@
LIBS = $(top_builddir)/libclamav/libclamav.la @CLAMD_LIBS@ @THREAD_LIBS@
INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav

4
clamav-devel/clamd/Makefile.in
Unescape View File

@ -112,7 +112,6 @@ ETAGS = etags
CTAGS = ctags
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
ADDITIONAL_LIBS = @ADDITIONAL_LIBS@
AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
@ -162,7 +161,7 @@ LDFLAGS = @LDFLAGS@
LIBCLAMAV_LIBS = @LIBCLAMAV_LIBS@
LIBCLAMAV_VERSION = @LIBCLAMAV_VERSION@
LIBOBJS = @LIBOBJS@
LIBS = $(top_builddir)/libclamav/libclamav.la @CLAMD_LIBS@ @ADDITIONAL_LIBS@
LIBS = $(top_builddir)/libclamav/libclamav.la @CLAMD_LIBS@ @THREAD_LIBS@
LIBTOOL = @LIBTOOL@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@ -182,6 +181,7 @@ RANLIB = @RANLIB@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
THREAD_LIBS = @THREAD_LIBS@
TH_SAFE = @TH_SAFE@
VERSION = @VERSION@
ac_ct_CC = @ac_ct_CC@

3
clamav-devel/clamdscan/Makefile.am
Unescape View File

@ -40,6 +40,5 @@ clamdscan_SOURCES = \
endif
DEFS = @DEFS@ -DCL_NOTHREADS
INCLUDES = -I$(top_srcdir)/clamscan -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav
LIBS = $(top_builddir)/libclamav/libclamav.la @FRESHCLAM_LIBS@ @ADDITIONAL_LIBS@
LIBS = $(top_builddir)/libclamav/libclamav.la @FRESHCLAM_LIBS@ @THREAD_LIBS@

6
clamav-devel/clamdscan/Makefile.in
Unescape View File

@ -101,7 +101,6 @@ ETAGS = etags
CTAGS = ctags
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
ADDITIONAL_LIBS = @ADDITIONAL_LIBS@
AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
@ -128,7 +127,7 @@ CXXDEPMODE = @CXXDEPMODE@
CXXFLAGS = @CXXFLAGS@
CYGPATH_W = @CYGPATH_W@
DBDIR = @DBDIR@
DEFS = @DEFS@ -DCL_NOTHREADS
DEFS = @DEFS@
DEPDIR = @DEPDIR@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
@ -151,7 +150,7 @@ LDFLAGS = @LDFLAGS@
LIBCLAMAV_LIBS = @LIBCLAMAV_LIBS@
LIBCLAMAV_VERSION = @LIBCLAMAV_VERSION@
LIBOBJS = @LIBOBJS@
LIBS = $(top_builddir)/libclamav/libclamav.la @FRESHCLAM_LIBS@ @ADDITIONAL_LIBS@
LIBS = $(top_builddir)/libclamav/libclamav.la @FRESHCLAM_LIBS@ @THREAD_LIBS@
LIBTOOL = @LIBTOOL@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@ -171,6 +170,7 @@ RANLIB = @RANLIB@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
THREAD_LIBS = @THREAD_LIBS@
TH_SAFE = @TH_SAFE@
VERSION = @VERSION@
ac_ct_CC = @ac_ct_CC@

3
clamav-devel/clamscan/Makefile.am
Unescape View File

@ -42,6 +42,5 @@ clamscan_SOURCES = \
treewalk.c \
treewalk.h
DEFS = @DEFS@ -DCL_NOTHREADS
LIBS = $(top_builddir)/libclamav/libclamav.la @ADDITIONAL_LIBS@
LIBS = $(top_builddir)/libclamav/libclamav.la @THREAD_LIBS@
INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav

6
clamav-devel/clamscan/Makefile.in
Unescape View File

@ -93,7 +93,6 @@ ETAGS = etags
CTAGS = ctags
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
ADDITIONAL_LIBS = @ADDITIONAL_LIBS@
AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
@ -120,7 +119,7 @@ CXXDEPMODE = @CXXDEPMODE@
CXXFLAGS = @CXXFLAGS@
CYGPATH_W = @CYGPATH_W@
DBDIR = @DBDIR@
DEFS = @DEFS@ -DCL_NOTHREADS
DEFS = @DEFS@
DEPDIR = @DEPDIR@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
@ -143,7 +142,7 @@ LDFLAGS = @LDFLAGS@
LIBCLAMAV_LIBS = @LIBCLAMAV_LIBS@
LIBCLAMAV_VERSION = @LIBCLAMAV_VERSION@
LIBOBJS = @LIBOBJS@
LIBS = $(top_builddir)/libclamav/libclamav.la @ADDITIONAL_LIBS@
LIBS = $(top_builddir)/libclamav/libclamav.la @THREAD_LIBS@
LIBTOOL = @LIBTOOL@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@ -163,6 +162,7 @@ RANLIB = @RANLIB@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
THREAD_LIBS = @THREAD_LIBS@
TH_SAFE = @TH_SAFE@
VERSION = @VERSION@
ac_ct_CC = @ac_ct_CC@

64
clamav-devel/configure vendored
Unescape View File

@ -883,7 +883,7 @@ CLAMD_LIBS
CLAMAV_MILTER_LIBS
FRESHCLAM_LIBS
TH_SAFE
ADDITIONAL_LIBS
THREAD_LIBS
BUILD_CLAMD_TRUE
BUILD_CLAMD_FALSE
HAVE_MILTER_TRUE
@ -23023,7 +23023,7 @@ cat >>confdefs.h <<\_ACEOF
_ACEOF
if test "$have_pthreads" = "yes"; then
LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS -lpthread"
THREAD_LIBS="-lpthread"
TH_SAFE="-thread-safe"
cat >>confdefs.h <<\_ACEOF
@ -23035,8 +23035,6 @@ cat >>confdefs.h <<\_ACEOF
#define _REENTRANT 1
_ACEOF
CLAMD_LIBS="$CLAMD_LIBS -lpthread"
CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -lpthread"
if test "$want_clamuko" = "yes"; then
cat >>confdefs.h <<\_ACEOF
@ -23044,7 +23042,6 @@ cat >>confdefs.h <<\_ACEOF
_ACEOF
fi
CLAMSCAN_LIBS="$CLAMSCAN_LIBS -lpthread"
fi
case `uname -r` in
1.*|2.0.*)
@ -23063,7 +23060,7 @@ cat >>confdefs.h <<\_ACEOF
_ACEOF
if test "$have_pthreads" = "yes"; then
LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS -lpthread"
THREAD_LIBS="-lpthread"
TH_SAFE="-thread-safe"
cat >>confdefs.h <<\_ACEOF
@ -23075,8 +23072,6 @@ cat >>confdefs.h <<\_ACEOF
#define _REENTRANT 1
_ACEOF
CLAMD_LIBS="$CLAMD_LIBS -lpthread"
CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -lpthread"
if test "$want_clamuko" = "yes"; then
cat >>confdefs.h <<\_ACEOF
@ -23084,7 +23079,6 @@ cat >>confdefs.h <<\_ACEOF
_ACEOF
fi
CLAMSCAN_LIBS="$CLAMSCAN_LIBS -lpthread"
fi
;;
cygwin*)
@ -23099,7 +23093,7 @@ _ACEOF
fi
fi
if test "$have_pthreads" = "yes"; then
LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS -lpthread"
THREAD_LIBS="-lpthread"
TH_SAFE="-thread-safe"
cat >>confdefs.h <<\_ACEOF
@ -23117,9 +23111,9 @@ _ACEOF
solaris*)
FRESHCLAM_LIBS="$FRESHCLAM_LIBS -lresolv"
if test "$have_pthreads" = "yes"; then
LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS -lpthread"
CLAMD_LIBS="$CLAMD_LIBS -lpthread -lresolv"
CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -lpthread -lresolv"
THREAD_LIBS="-lpthread"
CLAMD_LIBS="$CLAMD_LIBS -lresolv"
CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -lresolv"
TH_SAFE="-thread-safe"
cat >>confdefs.h <<\_ACEOF
@ -23140,9 +23134,7 @@ _ACEOF
;;
freebsd*)
if test "$have_pthreads" = "yes"; then
LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS -pthread -lc_r"
CLAMD_LIBS="$CLAMD_LIBS -pthread -lc_r"
CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -pthread -lc_r"
THREAD_LIBS="-lpthread -lc_r"
TH_SAFE="-thread-safe"
cat >>confdefs.h <<\_ACEOF
@ -23171,9 +23163,7 @@ _ACEOF
;;
dragonfly*)
if test "$have_pthreads" = "yes"; then
LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS -pthread"
CLAMD_LIBS="$CLAMD_LIBS -pthread"
CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -pthread"
THREAD_LIBS="-pthread"
TH_SAFE="-thread-safe"
cat >>confdefs.h <<\_ACEOF
@ -23202,13 +23192,10 @@ _ACEOF
;;
openbsd*)
if test "$have_pthreads" = "yes"; then
LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS -pthread"
if test "$use_cr" = "no"; then
CLAMD_LIBS="$CLAMD_LIBS -pthread"
CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -pthread"
THREAD_LIBS="-pthread"
else
CLAMD_LIBS="$CLAMD_LIBS -pthread -lc_r"
CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -pthread -lc_r"
THREAD_LIBS="-pthread -lc_r"
fi
TH_SAFE="-thread-safe"
@ -23231,9 +23218,7 @@ _ACEOF
;;
bsdi*)
if test "$have_pthreads" = "yes"; then
LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS -pthread"
CLAMD_LIBS="$CLAMD_LIBS -pthread"
CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -pthread"
THREAD_LIBS="-pthread"
TH_SAFE="-thread-safe"
cat >>confdefs.h <<\_ACEOF
@ -23255,9 +23240,7 @@ _ACEOF
;;
netbsd*)
if test "$have_pthreads" = "yes"; then
LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS -lpthread"
CLAMD_LIBS="-lpthread"
CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -lpthread"
THREAD_LIBS="-lpthread"
cat >>confdefs.h <<\_ACEOF
#define CL_THREAD_SAFE 1
@ -23268,7 +23251,6 @@ cat >>confdefs.h <<\_ACEOF
#define _REENTRANT 1
_ACEOF
ADDITIONAL_LIBS="$LIBS -lpthread"
fi
cat >>confdefs.h <<\_ACEOF
@ -23322,9 +23304,7 @@ os2*)
CLAMD_LIBS="$CLAMD_LIBS -lsyslog"
CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -lsyslog"
if test "$have_pthreads" = "yes"; then
LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS -lpthread"
CLAMD_LIBS="$CLAMD_LIBS -lpthread"
CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -lpthread"
THREAD_LIBS="-lpthread"
TH_SAFE="-thread-safe"
cat >>confdefs.h <<\_ACEOF
@ -23347,9 +23327,7 @@ sco*)
;;
hpux*)
if test "$have_pthreads" = "yes"; then
LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS -lpthread"
CLAMD_LIBS="$CLAMD_LIBS -lpthread"
CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -lpthread"
THREAD_LIBS="-lpthread"
TH_SAFE="-thread-safe"
cat >>confdefs.h <<\_ACEOF
@ -23370,9 +23348,7 @@ _ACEOF
;;
aix*)
if test "$have_pthreads" = "yes"; then
LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS -lpthread"
CLAMD_LIBS="$CLAMD_LIBS -lpthread"
CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -lpthread"
THREAD_LIBS="-lpthread"
TH_SAFE="-thread-safe"
cat >>confdefs.h <<\_ACEOF
@ -23412,9 +23388,7 @@ _ACEOF
;;
irix*)
if test "$have_pthreads" = "yes"; then
LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS -lpthread"
CLAMD_LIBS="$CLAMD_LIBS -lpthread"
CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -lpthread"
THREAD_LIBS="-lpthread"
TH_SAFE="-thread-safe"
cat >>confdefs.h <<\_ACEOF
@ -23445,7 +23419,7 @@ _ACEOF
fi
fi
if test "$have_pthreads" = "yes"; then
LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS -lpthread"
THREAD_LIBS="-lpthread"
TH_SAFE="-thread-safe"
cat >>confdefs.h <<\_ACEOF
@ -26674,7 +26648,7 @@ CLAMD_LIBS!$CLAMD_LIBS$ac_delim
CLAMAV_MILTER_LIBS!$CLAMAV_MILTER_LIBS$ac_delim
FRESHCLAM_LIBS!$FRESHCLAM_LIBS$ac_delim
TH_SAFE!$TH_SAFE$ac_delim
ADDITIONAL_LIBS!$ADDITIONAL_LIBS$ac_delim
THREAD_LIBS!$THREAD_LIBS$ac_delim
BUILD_CLAMD_TRUE!$BUILD_CLAMD_TRUE$ac_delim
BUILD_CLAMD_FALSE!$BUILD_CLAMD_FALSE$ac_delim
HAVE_MILTER_TRUE!$HAVE_MILTER_TRUE$ac_delim

62
clamav-devel/configure.in
Unescape View File

@ -391,16 +391,13 @@ case "$target_os" in
linux*)
AC_DEFINE(C_LINUX,1,[target is linux])
if test "$have_pthreads" = "yes"; then
LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS -lpthread"
THREAD_LIBS="-lpthread"
TH_SAFE="-thread-safe"
AC_DEFINE(CL_THREAD_SAFE,1,[thread safe])
AC_DEFINE(_REENTRANT,1,[thread safe])
CLAMD_LIBS="$CLAMD_LIBS -lpthread"
CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -lpthread"
if test "$want_clamuko" = "yes"; then
AC_DEFINE(CLAMUKO,1,[enable clamuko])
fi
CLAMSCAN_LIBS="$CLAMSCAN_LIBS -lpthread"
fi
case `uname -r` in
1.*|2.0.*)
@ -411,16 +408,13 @@ linux*)
kfreebsd*-gnu)
AC_DEFINE(C_KFREEBSD_GNU,1,[target is kfreebsd-gnu])
if test "$have_pthreads" = "yes"; then
LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS -lpthread"
THREAD_LIBS="-lpthread"
TH_SAFE="-thread-safe"
AC_DEFINE(CL_THREAD_SAFE,1,[thread safe])
AC_DEFINE(_REENTRANT,1,[thread safe])
CLAMD_LIBS="$CLAMD_LIBS -lpthread"
CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -lpthread"
if test "$want_clamuko" = "yes"; then
AC_DEFINE(CLAMUKO,1,[enable clamuko])
fi
CLAMSCAN_LIBS="$CLAMSCAN_LIBS -lpthread"
fi
;;
cygwin*)
@ -431,7 +425,7 @@ cygwin*)
fi
fi
if test "$have_pthreads" = "yes"; then
LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS -lpthread"
THREAD_LIBS="-lpthread"
TH_SAFE="-thread-safe"
AC_DEFINE(CL_THREAD_SAFE,1,[thread safe])
AC_DEFINE(_REENTRANT,1,[thread safe])
@ -441,9 +435,9 @@ cygwin*)
solaris*)
FRESHCLAM_LIBS="$FRESHCLAM_LIBS -lresolv"
if test "$have_pthreads" = "yes"; then
LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS -lpthread"
CLAMD_LIBS="$CLAMD_LIBS -lpthread -lresolv"
CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -lpthread -lresolv"
THREAD_LIBS="-lpthread"
CLAMD_LIBS="$CLAMD_LIBS -lresolv"
CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -lresolv"
TH_SAFE="-thread-safe"
AC_DEFINE(CL_THREAD_SAFE,1,[thread safe])
AC_DEFINE(_REENTRANT,1,[thread safe])
@ -452,9 +446,7 @@ solaris*)
;;
freebsd*)
if test "$have_pthreads" = "yes"; then
LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS -pthread -lc_r"
CLAMD_LIBS="$CLAMD_LIBS -pthread -lc_r"
CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -pthread -lc_r"
THREAD_LIBS="-lpthread -lc_r"
TH_SAFE="-thread-safe"
AC_DEFINE(CL_THREAD_SAFE,1,[thread safe])
AC_DEFINE(_REENTRANT,1,[thread safe])
@ -467,9 +459,7 @@ freebsd*)
;;
dragonfly*)
if test "$have_pthreads" = "yes"; then
LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS -pthread"
CLAMD_LIBS="$CLAMD_LIBS -pthread"
CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -pthread"
THREAD_LIBS="-pthread"
TH_SAFE="-thread-safe"
AC_DEFINE(CL_THREAD_SAFE,1,[thread safe])
AC_DEFINE(_REENTRANT,1,[thread safe])
@ -482,13 +472,10 @@ dragonfly*)
;;
openbsd*)
if test "$have_pthreads" = "yes"; then
LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS -pthread"
if test "$use_cr" = "no"; then
CLAMD_LIBS="$CLAMD_LIBS -pthread"
CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -pthread"
THREAD_LIBS="-pthread"
else
CLAMD_LIBS="$CLAMD_LIBS -pthread -lc_r"
CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -pthread -lc_r"
THREAD_LIBS="-pthread -lc_r"
fi
TH_SAFE="-thread-safe"
AC_DEFINE(CL_THREAD_SAFE,1,[thread safe])
@ -499,9 +486,7 @@ openbsd*)
;;
bsdi*)
if test "$have_pthreads" = "yes"; then
LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS -pthread"
CLAMD_LIBS="$CLAMD_LIBS -pthread"
CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -pthread"
THREAD_LIBS="-pthread"
TH_SAFE="-thread-safe"
AC_DEFINE(CL_THREAD_SAFE,1,[thread safe])
AC_DEFINE(_REENTRANT,1,[thread safe])
@ -511,12 +496,9 @@ bsdi*)
;;
netbsd*)
if test "$have_pthreads" = "yes"; then
LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS -lpthread"
CLAMD_LIBS="-lpthread"
CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -lpthread"
THREAD_LIBS="-lpthread"
AC_DEFINE(CL_THREAD_SAFE,1,[thread safe])
AC_DEFINE(_REENTRANT,1,[thread safe])
ADDITIONAL_LIBS="$LIBS -lpthread"
fi
AC_DEFINE(C_BSD,1,[os is NetBSD])
use_gethostbyname_r="no"
@ -544,9 +526,7 @@ os2*)
CLAMD_LIBS="$CLAMD_LIBS -lsyslog"
CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -lsyslog"
if test "$have_pthreads" = "yes"; then
LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS -lpthread"
CLAMD_LIBS="$CLAMD_LIBS -lpthread"
CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -lpthread"
THREAD_LIBS="-lpthread"
TH_SAFE="-thread-safe"
AC_DEFINE(CL_THREAD_SAFE,1,[thread safe])
AC_DEFINE(_REENTRANT,1,[thread safe])
@ -561,9 +541,7 @@ sco*)
;;
hpux*)
if test "$have_pthreads" = "yes"; then
LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS -lpthread"
CLAMD_LIBS="$CLAMD_LIBS -lpthread"
CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -lpthread"
THREAD_LIBS="-lpthread"
TH_SAFE="-thread-safe"
AC_DEFINE(CL_THREAD_SAFE,1,[thread safe])
AC_DEFINE(_REENTRANT,1,[thread safe])
@ -572,9 +550,7 @@ hpux*)
;;
aix*)
if test "$have_pthreads" = "yes"; then
LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS -lpthread"
CLAMD_LIBS="$CLAMD_LIBS -lpthread"
CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -lpthread"
THREAD_LIBS="-lpthread"
TH_SAFE="-thread-safe"
AC_DEFINE(CL_THREAD_SAFE,1,[thread safe])
AC_DEFINE(_REENTRANT,1,[thread safe])
@ -590,9 +566,7 @@ nto-qnx*)
;;
irix*)
if test "$have_pthreads" = "yes"; then
LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS -lpthread"
CLAMD_LIBS="$CLAMD_LIBS -lpthread"
CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -lpthread"
THREAD_LIBS="-lpthread"
TH_SAFE="-thread-safe"
AC_DEFINE(CL_THREAD_SAFE,1,[thread safe])
AC_DEFINE(_REENTRANT,1,[thread safe])
@ -607,7 +581,7 @@ interix*)
fi
fi
if test "$have_pthreads" = "yes"; then
LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS -lpthread"
THREAD_LIBS="-lpthread"
TH_SAFE="-thread-safe"
AC_DEFINE(CL_THREAD_SAFE,1,[thread safe])
AC_DEFINE(_REENTRANT,1,[thread safe])
@ -622,7 +596,7 @@ AC_SUBST(CLAMD_LIBS)
AC_SUBST(CLAMAV_MILTER_LIBS)
AC_SUBST(FRESHCLAM_LIBS)
AC_SUBST(TH_SAFE)
AC_SUBST(ADDITIONAL_LIBS)
AC_SUBST(THREAD_LIBS)
dnl --enable-milter
if test "$have_milter" = "yes"; then

2
clamav-devel/database/Makefile.in
Unescape View File

@ -70,7 +70,6 @@ SOURCES =
DIST_SOURCES =
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
ADDITIONAL_LIBS = @ADDITIONAL_LIBS@
AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
@ -140,6 +139,7 @@ RANLIB = @RANLIB@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
THREAD_LIBS = @THREAD_LIBS@
TH_SAFE = @TH_SAFE@
VERSION = @VERSION@
ac_ct_CC = @ac_ct_CC@

2
clamav-devel/docs/Makefile.in
Unescape View File

@ -75,7 +75,6 @@ NROFF = nroff
MANS = $(man_MANS)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
ADDITIONAL_LIBS = @ADDITIONAL_LIBS@
AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
@ -145,6 +144,7 @@ RANLIB = @RANLIB@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
THREAD_LIBS = @THREAD_LIBS@
TH_SAFE = @TH_SAFE@
VERSION = @VERSION@
ac_ct_CC = @ac_ct_CC@

2
clamav-devel/etc/Makefile.in
Unescape View File

@ -68,7 +68,6 @@ SOURCES =
DIST_SOURCES =
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
ADDITIONAL_LIBS = @ADDITIONAL_LIBS@
AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
@ -138,6 +137,7 @@ RANLIB = @RANLIB@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
THREAD_LIBS = @THREAD_LIBS@
TH_SAFE = @TH_SAFE@
VERSION = @VERSION@
ac_ct_CC = @ac_ct_CC@

2
clamav-devel/freshclam/Makefile.am
Unescape View File

@ -50,4 +50,4 @@ freshclam_SOURCES = \
DEFS = @DEFS@ -DCL_NOTHREADS
INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav
LIBS = $(top_builddir)/libclamav/libclamav.la @FRESHCLAM_LIBS@ @ADDITIONAL_LIBS@
LIBS = $(top_builddir)/libclamav/libclamav.la @FRESHCLAM_LIBS@ @THREAD_LIBS@

4
clamav-devel/freshclam/Makefile.in
Unescape View File

@ -94,7 +94,6 @@ ETAGS = etags
CTAGS = ctags
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
ADDITIONAL_LIBS = @ADDITIONAL_LIBS@
AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
@ -144,7 +143,7 @@ LDFLAGS = @LDFLAGS@
LIBCLAMAV_LIBS = @LIBCLAMAV_LIBS@
LIBCLAMAV_VERSION = @LIBCLAMAV_VERSION@
LIBOBJS = @LIBOBJS@
LIBS = $(top_builddir)/libclamav/libclamav.la @FRESHCLAM_LIBS@ @ADDITIONAL_LIBS@
LIBS = $(top_builddir)/libclamav/libclamav.la @FRESHCLAM_LIBS@ @THREAD_LIBS@
LIBTOOL = @LIBTOOL@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@ -164,6 +163,7 @@ RANLIB = @RANLIB@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
THREAD_LIBS = @THREAD_LIBS@
TH_SAFE = @TH_SAFE@
VERSION = @VERSION@
ac_ct_CC = @ac_ct_CC@

2
clamav-devel/libclamav/Makefile.am
Unescape View File

@ -19,7 +19,7 @@
INCLUDES = -I$(top_srcdir) -I@srcdir@/unrar
libclamav_la_LIBADD = @LIBCLAMAV_LIBS@
libclamav_la_LIBADD = @LIBCLAMAV_LIBS@ @THREAD_LIBS@
libclamav_la_LDFLAGS = @TH_SAFE@ -version-info @LIBCLAMAV_VERSION@ -no-undefined

4
clamav-devel/libclamav/Makefile.in
Unescape View File

@ -110,7 +110,6 @@ ETAGS = etags
CTAGS = ctags
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
ADDITIONAL_LIBS = @ADDITIONAL_LIBS@
AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
@ -180,6 +179,7 @@ RANLIB = @RANLIB@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
THREAD_LIBS = @THREAD_LIBS@
TH_SAFE = @TH_SAFE@
VERSION = @VERSION@
ac_ct_CC = @ac_ct_CC@
@ -235,7 +235,7 @@ target_cpu = @target_cpu@
target_os = @target_os@
target_vendor = @target_vendor@
INCLUDES = -I$(top_srcdir) -I@srcdir@/unrar
libclamav_la_LIBADD = @LIBCLAMAV_LIBS@
libclamav_la_LIBADD = @LIBCLAMAV_LIBS@ @THREAD_LIBS@
libclamav_la_LDFLAGS = @TH_SAFE@ -version-info @LIBCLAMAV_VERSION@ -no-undefined
include_HEADERS = clamav.h
libclamav_la_SOURCES = \

2
clamav-devel/sigtool/Makefile.am
Unescape View File

@ -41,4 +41,4 @@ sigtool_SOURCES = \
DEFS = @DEFS@ -DCL_NOTHREADS
INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav
LIBS = $(top_builddir)/libclamav/libclamav.la @FRESHCLAM_LIBS@ @ADDITIONAL_LIBS@
LIBS = $(top_builddir)/libclamav/libclamav.la @FRESHCLAM_LIBS@ @THREAD_LIBS@

4
clamav-devel/sigtool/Makefile.in
Unescape View File

@ -92,7 +92,6 @@ ETAGS = etags
CTAGS = ctags
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
ADDITIONAL_LIBS = @ADDITIONAL_LIBS@
AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
@ -144,7 +143,7 @@ LDFLAGS = @LDFLAGS@
LIBCLAMAV_LIBS = @LIBCLAMAV_LIBS@
LIBCLAMAV_VERSION = @LIBCLAMAV_VERSION@
LIBOBJS = @LIBOBJS@
LIBS = $(top_builddir)/libclamav/libclamav.la @FRESHCLAM_LIBS@ @ADDITIONAL_LIBS@
LIBS = $(top_builddir)/libclamav/libclamav.la @FRESHCLAM_LIBS@ @THREAD_LIBS@
LIBTOOL = @LIBTOOL@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@ -164,6 +163,7 @@ RANLIB = @RANLIB@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
THREAD_LIBS = @THREAD_LIBS@
TH_SAFE = @TH_SAFE@
VERSION = @VERSION@
ac_ct_CC = @ac_ct_CC@

Write Preview
Loading…
Cancel
Save