Support for clamav-config.h

git-svn: trunk@246
remotes/push_mirror/metadata
Tomasz Kojm 22 years ago
parent 8095542b45
commit 6d6e82711c
  1. 5
      clamav-devel/ChangeLog
  2. 37
      clamav-devel/Makefile.in
  3. 82
      clamav-devel/aclocal.m4
  4. 3
      clamav-devel/clamav-milter/Makefile.in
  5. 3
      clamav-devel/clamd/Makefile.in
  6. 5
      clamav-devel/clamd/cfgfile.c
  7. 7
      clamav-devel/clamd/clamd.c
  8. 6
      clamav-devel/clamd/clamuko.c
  9. 4
      clamav-devel/clamd/dazukoio.c
  10. 6
      clamav-devel/clamd/localserver.c
  11. 4
      clamav-devel/clamd/options.c
  12. 4
      clamav-devel/clamd/others.c
  13. 4
      clamav-devel/clamd/scanner.c
  14. 6
      clamav-devel/clamd/server-proc.c
  15. 4
      clamav-devel/clamd/server-th.c
  16. 4
      clamav-devel/clamd/session.c
  17. 4
      clamav-devel/clamd/tcpserver.c
  18. 4
      clamav-devel/clamd/tests.c
  19. 3
      clamav-devel/clamdscan/Makefile.in
  20. 7
      clamav-devel/clamdscan/clamdscan.c
  21. 6
      clamav-devel/clamdscan/client.c
  22. 3
      clamav-devel/clamscan/Makefile.in
  23. 6
      clamav-devel/clamscan/clamscan.c
  24. 2
      clamav-devel/clamscan/getopt.c
  25. 4
      clamav-devel/clamscan/options.c
  26. 4
      clamav-devel/clamscan/others.c
  27. 4
      clamav-devel/clamscan/treewalk.c
  28. 446
      clamav-devel/configure
  29. 110
      clamav-devel/configure.in
  30. 8
      clamav-devel/database/Makefile.am
  31. 9
      clamav-devel/database/Makefile.in
  32. 1
      clamav-devel/docs/Makefile.in
  33. 1
      clamav-devel/etc/Makefile.in
  34. 3
      clamav-devel/freshclam/Makefile.in
  35. 4
      clamav-devel/freshclam/freshclam.c
  36. 6
      clamav-devel/freshclam/manager.c
  37. 4
      clamav-devel/freshclam/notify.c
  38. 3
      clamav-devel/libclamav/Makefile.in
  39. 7
      clamav-devel/libclamav/blob.c
  40. 8
      clamav-devel/libclamav/cltypes.h
  41. 6
      clamav-devel/libclamav/cvd.c
  42. 6
      clamav-devel/libclamav/dsig.c
  43. 4
      clamav-devel/libclamav/matcher.c
  44. 9
      clamav-devel/libclamav/mbox.c
  45. 8
      clamav-devel/libclamav/md5.c
  46. 9
      clamav-devel/libclamav/message.c
  47. 10
      clamav-devel/libclamav/ole2_extract.c
  48. 4
      clamav-devel/libclamav/others.c
  49. 4
      clamav-devel/libclamav/readdb.c
  50. 166
      clamav-devel/libclamav/scanners.c
  51. 4
      clamav-devel/libclamav/str.c
  52. 4
      clamav-devel/libclamav/text.c
  53. 4
      clamav-devel/libclamav/unrarlib.c
  54. 2
      clamav-devel/libclamav/unrarlib.h
  55. 3
      clamav-devel/libclamav/vba_extract.h
  56. 4
      clamav-devel/libclamav/zziplib/strc.c
  57. 4
      clamav-devel/libclamav/zziplib/zzip-dir.c
  58. 4
      clamav-devel/libclamav/zziplib/zzip-err.c
  59. 4
      clamav-devel/libclamav/zziplib/zzip-file.c
  60. 4
      clamav-devel/libclamav/zziplib/zzip-info.c
  61. 4
      clamav-devel/libclamav/zziplib/zzip-io.c
  62. 4
      clamav-devel/libclamav/zziplib/zzip-stat.c
  63. 4
      clamav-devel/libclamav/zziplib/zzip-zip.c
  64. 3
      clamav-devel/sigtool/Makefile.in
  65. 4
      clamav-devel/sigtool/options.c
  66. 7
      clamav-devel/sigtool/sigtool.c

@ -1,3 +1,8 @@
Fri Feb 6 14:36:36 CET 2004 (tk)
---------------------------------
* support for clamav-config.h instead of multiple defines (Thomas Lamy)
* libclamav: more flexible file type recognition (Thomas Lamy)
Fri Feb 6 13:20:51 GMT 2004 (njh)
----------------------------------
* libclamav: Added new bounce message

@ -120,6 +120,7 @@ EXTRA_DIST = FAQ contrib test examples BUGS
subdir = .
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = clamav-config.h
CONFIG_CLEAN_FILES =
DIST_SOURCES =
@ -128,11 +129,12 @@ RECURSIVE_TARGETS = info-recursive dvi-recursive install-info-recursive \
install-exec-recursive installdirs-recursive install-recursive \
uninstall-recursive check-recursive installcheck-recursive
DIST_COMMON = README AUTHORS COPYING ChangeLog INSTALL Makefile.am \
Makefile.in NEWS TODO acinclude.m4 aclocal.m4 config.guess \
config.sub configure configure.in depcomp install-sh ltmain.sh \
missing mkinstalldirs
Makefile.in NEWS TODO acinclude.m4 aclocal.m4 \
clamav-config.h.in config.guess config.sub configure \
configure.in depcomp install-sh ltmain.sh missing mkinstalldirs
DIST_SUBDIRS = $(SUBDIRS)
all: all-recursive
all: clamav-config.h
$(MAKE) $(AM_MAKEFLAGS) all-recursive
.SUFFIXES:
$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
@ -149,6 +151,23 @@ $(srcdir)/configure: $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENC
$(ACLOCAL_M4): configure.in acinclude.m4
cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
clamav-config.h: stamp-h1
@if test ! -f $@; then \
rm -f stamp-h1; \
$(MAKE) stamp-h1; \
else :; fi
stamp-h1: $(srcdir)/clamav-config.h.in $(top_builddir)/config.status
@rm -f stamp-h1
cd $(top_builddir) && $(SHELL) ./config.status clamav-config.h
$(srcdir)/clamav-config.h.in: $(top_srcdir)/configure.in $(ACLOCAL_M4)
cd $(top_srcdir) && $(AUTOHEADER)
touch $(srcdir)/clamav-config.h.in
distclean-hdr:
-rm -f clamav-config.h
mostlyclean-libtool:
-rm -f *.lo
@ -228,7 +247,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
END { for (i in files) print i; }'`; \
mkid -fID $$unique
TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
TAGS: tags-recursive $(HEADERS) $(SOURCES) clamav-config.h.in $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
here=`pwd`; \
@ -237,7 +256,7 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \
fi; \
done; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
list='$(SOURCES) $(HEADERS) clamav-config.h.in $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@ -357,7 +376,7 @@ distcleancheck: distclean
exit 1; } >&2
check-am: all-am
check: check-recursive
all-am: Makefile
all-am: Makefile clamav-config.h
installdirs: installdirs-recursive
installdirs-am:
@ -391,7 +410,7 @@ clean-am: clean-generic clean-libtool mostlyclean-am
distclean: distclean-recursive
-rm -f config.status config.cache config.log
distclean-am: clean-am distclean-generic distclean-libtool \
distclean-am: clean-am distclean-generic distclean-hdr distclean-libtool \
distclean-tags
dvi: dvi-recursive
@ -426,7 +445,7 @@ uninstall-info: uninstall-info-recursive
.PHONY: $(RECURSIVE_TARGETS) GTAGS all all-am check check-am clean \
clean-generic clean-libtool clean-recursive dist dist-all \
dist-gzip distcheck distclean distclean-generic \
dist-gzip distcheck distclean distclean-generic distclean-hdr \
distclean-libtool distclean-recursive distclean-tags \
distcleancheck distdir dvi dvi-am dvi-recursive info info-am \
info-recursive install install-am install-data install-data-am \

@ -81,7 +81,7 @@ dnl there is now a CREATE_PREFIX_TARGET_H in this file as a shorthand for
dnl PREFIX_CONFIG_H from a target.h file, however w/o the target.h ever created
dnl (the prefix is a bit different, since we add an extra -target- and -host-)
dnl
dnl @version: $Id: aclocal.m4,v 1.17 2004/02/01 01:18:56 kojm Exp $
dnl @version: $Id: aclocal.m4,v 1.18 2004/02/06 13:46:07 kojm Exp $
dnl @author Guido Draheim <guidod@gmx.de> STATUS: used often
AC_DEFUN([AC_CREATE_TARGET_H],
@ -4041,7 +4041,7 @@ dnl AC_COMPILE_CHECK_SIZEOF(ptrdiff_t, $headers)
dnl AC_COMPILE_CHECK_SIZEOF(off_t, $headers)
dnl
dnl @author Kaveh Ghazi <ghazi@caip.rutgers.edu>
dnl @version $Id: aclocal.m4,v 1.17 2004/02/01 01:18:56 kojm Exp $
dnl @version $Id: aclocal.m4,v 1.18 2004/02/06 13:46:07 kojm Exp $
dnl
AC_DEFUN([AC_COMPILE_CHECK_SIZEOF],
[changequote(<<, >>)dnl
@ -4809,3 +4809,81 @@ AC_CONFIG_COMMANDS_PRE(
Usually this means the macro was only invoked conditionally.])
fi])])
# Like AC_CONFIG_HEADER, but automatically create stamp file. -*- Autoconf -*-
# Copyright 1996, 1997, 2000, 2001 Free Software Foundation, Inc.
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2, or (at your option)
# any later version.
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
# 02111-1307, USA.
AC_PREREQ([2.52])
# serial 6
# When config.status generates a header, we must update the stamp-h file.
# This file resides in the same directory as the config header
# that is generated. We must strip everything past the first ":",
# and everything past the last "/".
# _AM_DIRNAME(PATH)
# -----------------
# Like AS_DIRNAME, only do it during macro expansion
AC_DEFUN([_AM_DIRNAME],
[m4_if(regexp([$1], [^.*[^/]//*[^/][^/]*/*$]), -1,
m4_if(regexp([$1], [^//\([^/]\|$\)]), -1,
m4_if(regexp([$1], [^/.*]), -1,
[.],
patsubst([$1], [^\(/\).*], [\1])),
patsubst([$1], [^\(//\)\([^/].*\|$\)], [\1])),
patsubst([$1], [^\(.*[^/]\)//*[^/][^/]*/*$], [\1]))[]dnl
])# _AM_DIRNAME
# The stamp files are numbered to have different names.
# We could number them on a directory basis, but that's additional
# complications, let's have a unique counter.
m4_define([_AM_STAMP_Count], [0])
# _AM_STAMP(HEADER)
# -----------------
# The name of the stamp file for HEADER.
AC_DEFUN([_AM_STAMP],
[m4_define([_AM_STAMP_Count], m4_incr(_AM_STAMP_Count))dnl
AS_ESCAPE(_AM_DIRNAME(patsubst([$1],
[:.*])))/stamp-h[]_AM_STAMP_Count])
# _AM_CONFIG_HEADER(HEADER[:SOURCES], COMMANDS, INIT-COMMANDS)
# ------------------------------------------------------------
# We used to try to get a real timestamp in stamp-h. But the fear is that
# that will cause unnecessary cvs conflicts.
AC_DEFUN([_AM_CONFIG_HEADER],
[# Add the stamp file to the list of files AC keeps track of,
# along with our hook.
AC_CONFIG_HEADERS([$1],
[# update the timestamp
echo 'timestamp for $1' >"_AM_STAMP([$1])"
$2],
[$3])
])# _AM_CONFIG_HEADER
# AM_CONFIG_HEADER(HEADER[:SOURCES]..., COMMANDS, INIT-COMMANDS)
# --------------------------------------------------------------
AC_DEFUN([AM_CONFIG_HEADER],
[AC_FOREACH([_AM_File], [$1], [_AM_CONFIG_HEADER(_AM_File, [$2], [$3])])
])# AM_CONFIG_HEADER

@ -132,6 +132,7 @@ INCLUDES = -I../clamd -I../libclamav -I../clamscan
EXTRA_DIST = clamav-milter.c clamd.sh clamav-milter.sh INSTALL
subdir = clamav-milter
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = $(top_builddir)/clamav-config.h
CONFIG_CLEAN_FILES =
@BUILD_CLAMD_FALSE@@HAVE_MILTER_TRUE@sbin_PROGRAMS =
@BUILD_CLAMD_FALSE@@HAVE_MILTER_FALSE@sbin_PROGRAMS =
@ -151,7 +152,7 @@ clamav_milter_OBJECTS = $(am_clamav_milter_OBJECTS)
@BUILD_CLAMD_TRUE@@HAVE_MILTER_TRUE@ ../clamscan/getopt.o
@BUILD_CLAMD_TRUE@@HAVE_MILTER_FALSE@clamav_milter_DEPENDENCIES =
clamav_milter_LDFLAGS =
DEFAULT_INCLUDES = -I. -I$(srcdir)
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
CPPFLAGS = @CPPFLAGS@
LDFLAGS = @LDFLAGS@
depcomp = $(SHELL) $(top_srcdir)/depcomp

@ -153,6 +153,7 @@ LIBS = -L../libclamav -lclamav @CLAMD_LIBS@
INCLUDES = -I../clamscan -I../libclamav
subdir = clamd
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = $(top_builddir)/clamav-config.h
CONFIG_CLEAN_FILES =
@BUILD_CLAMD_TRUE@sbin_PROGRAMS = clamd$(EXEEXT)
@BUILD_CLAMD_FALSE@sbin_PROGRAMS =
@ -169,7 +170,7 @@ clamd_OBJECTS = $(am_clamd_OBJECTS)
@BUILD_CLAMD_TRUE@clamd_DEPENDENCIES = ../clamscan/getopt.o
@BUILD_CLAMD_FALSE@clamd_DEPENDENCIES =
clamd_LDFLAGS =
DEFAULT_INCLUDES = -I. -I$(srcdir)
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
CPPFLAGS = @CPPFLAGS@
LDFLAGS = @LDFLAGS@
depcomp = $(SHELL) $(top_srcdir)/depcomp

@ -16,6 +16,10 @@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
#if HAVE_CONFIG_H
#include "clamav-config.h"
#endif
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
@ -27,7 +31,6 @@
#include "defaults.h"
#include "str.h"
struct cfgstruct *parsecfg(const char *cfgfile)
{
char buff[LINE_LENGTH], *name, *arg;

@ -16,6 +16,10 @@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
#if HAVE_CONFIG_H
#include "clamav-config.h"
#endif
#include <stdio.h>
#include <stdlib.h>
#include <unistd.h>
@ -35,11 +39,14 @@
#include "options.h"
#include "cfgfile.h"
#include "others.h"
/* Fixes gcc warning */
#include "../libclamav/others.h"
#include "tcpserver.h"
#include "localserver.h"
#include "others.h"
#include "defaults.h"
void help(void);
void daemonize(void);

@ -1,5 +1,5 @@
/*
* Copyright (C) 2002, 2003 Tomasz Kojm <zolw@konarski.edu.pl>
* Copyright (C) 2002 - 2004 Tomasz Kojm <tkojm@clamav.net>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@ -16,6 +16,10 @@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
#if HAVE_CONFIG_H
#include "clamav-config.h"
#endif
#ifdef CLAMUKO
#include <stdio.h>

@ -17,6 +17,10 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#if HAVE_CONFIG_H
#include "clamav-config.h"
#endif
#ifdef CLAMUKO
#include <stdlib.h>

@ -1,5 +1,5 @@
/*
* Copyright (C) 2002 Tomasz Kojm <zolw@konarski.edu.pl>
* Copyright (C) 2002 - 2004 Tomasz Kojm <tkojm@clamav.net>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@ -16,6 +16,10 @@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
#if HAVE_CONFIG_H
#include "clamav-config.h"
#endif
#include <stdio.h>
#include <string.h>
#include <sys/types.h>

@ -19,6 +19,10 @@
* from Alejandro Dubrovsky <s328940@student.uq.edu.au>
*/
#if HAVE_CONFIG_H
#include "clamav-config.h"
#endif
#include <stdio.h>
#include <stdlib.h>
#include <string.h>

@ -16,6 +16,10 @@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
#if HAVE_CONFIG_H
#include "clamav-config.h"
#endif
#include <stdio.h>
#include <stdarg.h>
#include <stdlib.h>

@ -16,6 +16,10 @@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
#if HAVE_CONFIG_H
#include "clamav-config.h"
#endif
#include <stdio.h>
#include <stdlib.h>
#include <string.h>

@ -1,5 +1,5 @@
/*
* Copyright (C) 2002, 2003 Tomasz Kojm <zolw@konarski.edu.pl>
* Copyright (C) 2002 - 2004 Tomasz Kojm <tkojm@clamav.net>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@ -16,6 +16,10 @@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
#if HAVE_CONFIG_H
#include "clamav-config.h"
#endif
#include <stdio.h>
#include <stdlib.h>
#include <string.h>

@ -16,6 +16,10 @@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
#if HAVE_CONFIG_H
#include "clamav-config.h"
#endif
#include <stdio.h>
#include <stdlib.h>
#include <string.h>

@ -16,6 +16,10 @@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
#if HAVE_CONFIG_H
#include "clamav-config.h"
#endif
#include <stdio.h>
#include <stdlib.h>
#include <string.h>

@ -16,6 +16,10 @@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
#if HAVE_CONFIG_H
#include "clamav-config.h"
#endif
#include <stdio.h>
#include <string.h>
#include <sys/types.h>

@ -16,6 +16,10 @@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
#if HAVE_CONFIG_H
#include "clamav-config.h"
#endif
#include <stdio.h>
#include <string.h>
#include <clamav.h>

@ -130,6 +130,7 @@ INCLUDES = -I../clamscan -I../clamd -I../libclamav
LIBS = -L../libclamav -lclamav @FRESHCLAM_LIBS@
subdir = clamdscan
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = $(top_builddir)/clamav-config.h
CONFIG_CLEAN_FILES =
@BUILD_CLAMD_TRUE@bin_PROGRAMS = clamdscan$(EXEEXT)
@BUILD_CLAMD_FALSE@bin_PROGRAMS =
@ -145,7 +146,7 @@ clamdscan_OBJECTS = $(am_clamdscan_OBJECTS)
clamdscan_LDFLAGS =
DEFS = @DEFS@
DEFAULT_INCLUDES = -I. -I$(srcdir)
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
CPPFLAGS = @CPPFLAGS@
LDFLAGS = @LDFLAGS@
depcomp = $(SHELL) $(top_srcdir)/depcomp

@ -1,5 +1,5 @@
/*
* Copyright (C) 2002 Tomasz Kojm <zolw@konarski.edu.pl>
* Copyright (C) 2002 - 2004 Tomasz Kojm <tkojm@clamav.net>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@ -16,6 +16,10 @@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
#if HAVE_CONFIG_H
#include "clamav-config.h"
#endif
#include <stdio.h>
#include <string.h>
#include <stdlib.h>
@ -29,6 +33,7 @@
#include "defaults.h"
#include "client.h"
void help(void);
/* this local macro takes care about freeing memory at exit */

@ -1,5 +1,5 @@
/*
* Copyright (C) 2002 Tomasz Kojm <zolw@konarski.edu.pl>
* Copyright (C) 2002 - 2004 Tomasz Kojm <tkojm@clamav.net>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@ -16,6 +16,10 @@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
#if HAVE_CONFIG_H
#include "clamav-config.h"
#endif
#include <stdio.h>
#include <unistd.h>
#include <sys/types.h>

@ -139,6 +139,7 @@ LIBS = -L../libclamav -lclamav
INCLUDES = -I.. -I../libclamav
subdir = clamscan
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = $(top_builddir)/clamav-config.h
CONFIG_CLEAN_FILES =
bin_PROGRAMS = clamscan$(EXEEXT)
PROGRAMS = $(bin_PROGRAMS)
@ -150,7 +151,7 @@ clamscan_OBJECTS = $(am_clamscan_OBJECTS)
clamscan_LDADD = $(LDADD)
clamscan_DEPENDENCIES =
clamscan_LDFLAGS =
DEFAULT_INCLUDES = -I. -I$(srcdir)
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
CPPFLAGS = @CPPFLAGS@
LDFLAGS = @LDFLAGS@
depcomp = $(SHELL) $(top_srcdir)/depcomp

@ -1,5 +1,5 @@
/*
* Copyright (C) 2002 - 2004 Tomasz Kojm <zolw@konarski.edu.pl>
* Copyright (C) 2002 - 2004 Tomasz Kojm <tkojm@clamav.net>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@ -16,6 +16,10 @@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
#if HAVE_CONFIG_H
#include "clamav-config.h"
#endif
#include <stdio.h>
#include <stdlib.h>
#include <string.h>

@ -28,7 +28,7 @@
#endif
#ifdef HAVE_CONFIG_H
# include <config.h>
# include <clamav-config.h>
#endif
#if !defined __STDC__ || !__STDC__

@ -19,6 +19,10 @@
* from Alejandro Dubrovsky <s328940@student.uq.edu.au>
*/
#if HAVE_CONFIG_H
#include "clamav-config.h"
#endif
#include <stdio.h>
#include <stdlib.h>
#include <string.h>

@ -21,6 +21,10 @@
*
*/
#if HAVE_CONFIG_H
#include "clamav-config.h"
#endif
#include <stdio.h>
#include <stdarg.h>
#include <string.h>

@ -16,6 +16,10 @@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
#if HAVE_CONFIG_H
#include "clamav-config.h"
#endif
#include <stdio.h>
#include <stdlib.h>
#include <string.h>

@ -1671,8 +1671,6 @@ do
done
am__api_version="1.6"
# Find a good install program. We prefer a C program (faster),
# so one script is as good as another. But avoid the broken or
@ -2028,6 +2026,13 @@ INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"
# Add the stamp file to the list of files AC keeps track of,
# along with our hook.
ac_config_headers="$ac_config_headers clamav-config.h"
LC_CURRENT=1
LC_REVISION=3
LC_AGE=0
@ -4535,7 +4540,7 @@ test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
case $host in
*-*-irix6*)
# Find out which ABI we are using.
echo '#line 4538 "configure"' > conftest.$ac_ext
echo '#line 4543 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@ -5071,7 +5076,7 @@ chmod -w .
save_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS -o out/conftest2.$ac_objext"
compiler_c_o=no
if { (eval echo configure:5074: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then
if { (eval echo configure:5079: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings
if test -s out/conftest.err; then
@ -6864,7 +6869,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
#line 6867 "configure"
#line 6872 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@ -6962,7 +6967,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
#line 6965 "configure"
#line 6970 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@ -7691,10 +7696,12 @@ LIBTOOL='$(SHELL) $(top_builddir)/libtool'
cat >>confdefs.h <<\_ACEOF
#define SCANBUFF 131072
_ACEOF
cat >>confdefs.h <<\_ACEOF
#define FILEBUFF 8192
_ACEOF
@ -8426,7 +8433,8 @@ echo "${ECHO_T}$ac_cv_header_zlib_h" >&6
fi
if test $ac_cv_header_zlib_h = yes; then
LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS -lz"; cat >>confdefs.h <<\_ACEOF
LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS -lz";
cat >>confdefs.h <<\_ACEOF
#define HAVE_ZLIB_H 1
_ACEOF
@ -8547,7 +8555,8 @@ echo "${ECHO_T}$ac_cv_header_bzlib_h" >&6
fi
if test $ac_cv_header_bzlib_h = yes; then
LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS -lbz2"; cat >>confdefs.h <<\_ACEOF
LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS -lbz2";
cat >>confdefs.h <<\_ACEOF
#define HAVE_BZLIB_H 1
_ACEOF
@ -8610,7 +8619,8 @@ fi
echo "$as_me:$LINENO: result: $ac_cv_lib_bz2_bzReadOpen" >&5
echo "${ECHO_T}$ac_cv_lib_bz2_bzReadOpen" >&6
if test $ac_cv_lib_bz2_bzReadOpen = yes; then
cat >>confdefs.h <<\_ACEOF
cat >>confdefs.h <<\_ACEOF
#define NOBZ2PREFIX 1
_ACEOF
@ -8620,7 +8630,8 @@ fi
for ac_func in setsid memcpy
for ac_func in setsid memcpy snprintf
do
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
echo "$as_me:$LINENO: checking for $ac_func" >&5
@ -8943,7 +8954,8 @@ fi
echo "$as_me:$LINENO: result: $ac_cv_lib_gmp___gmpz_init" >&5
echo "${ECHO_T}$ac_cv_lib_gmp___gmpz_init" >&6
if test $ac_cv_lib_gmp___gmpz_init = yes; then
LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS -lgmp"; cat >>confdefs.h <<\_ACEOF
LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS -lgmp";
cat >>confdefs.h <<\_ACEOF
#define HAVE_GMP 1
_ACEOF
@ -9004,7 +9016,8 @@ fi
echo "$as_me:$LINENO: result: $ac_cv_lib_gmp_mpz_init" >&5
echo "${ECHO_T}$ac_cv_lib_gmp_mpz_init" >&6
if test $ac_cv_lib_gmp_mpz_init = yes; then
LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS -lgmp"; cat >>confdefs.h <<\_ACEOF
LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS -lgmp";
cat >>confdefs.h <<\_ACEOF
#define HAVE_GMP 1
_ACEOF
@ -9118,7 +9131,8 @@ echo "${ECHO_T}$ac_cv_header_syslog_h" >&6
fi
if test $ac_cv_header_syslog_h = yes; then
cat >>confdefs.h <<\_ACEOF
cat >>confdefs.h <<\_ACEOF
#define CLAMD_USE_SYSLOG 1
_ACEOF
@ -9172,10 +9186,12 @@ else
clamav_group="clamav"
fi;
cat >>confdefs.h <<_ACEOF
#define CLAMAVUSER "$clamav_user"
_ACEOF
cat >>confdefs.h <<_ACEOF
#define CLAMAVGROUP "$clamav_group"
_ACEOF
@ -9198,7 +9214,8 @@ fi;
# Check whether --enable-debug or --disable-debug was given.
if test "${enable_debug+set}" = set; then
enableval="$enable_debug"
cat >>confdefs.h <<\_ACEOF
cat >>confdefs.h <<\_ACEOF
#define CL_DEBUG 1
_ACEOF
@ -9207,7 +9224,8 @@ fi;
# Check whether --enable-bigstack or --disable-bigstack was given.
if test "${enable_bigstack+set}" = set; then
enableval="$enable_bigstack"
cat >>confdefs.h <<\_ACEOF
cat >>confdefs.h <<\_ACEOF
#define C_BIGSTACK 1
_ACEOF
@ -9226,12 +9244,14 @@ fi;
# Check whether --with-db1 or --without-db1 was given.
if test "${with_db1+set}" = set; then
withval="$with_db1"
cat >>confdefs.h <<_ACEOF
cat >>confdefs.h <<_ACEOF
#define DB1NAME "$withval"
_ACEOF
else
cat >>confdefs.h <<\_ACEOF
cat >>confdefs.h <<\_ACEOF
#define DB1NAME "main.cvd"
_ACEOF
@ -9241,12 +9261,14 @@ fi;
# Check whether --with-db2 or --without-db2 was given.
if test "${with_db2+set}" = set; then
withval="$with_db2"
cat >>confdefs.h <<_ACEOF
cat >>confdefs.h <<_ACEOF
#define DB2NAME "$withval"
_ACEOF
else
cat >>confdefs.h <<\_ACEOF
cat >>confdefs.h <<\_ACEOF
#define DB2NAME "daily.cvd"
_ACEOF
@ -9286,6 +9308,7 @@ fi
CFGDIR=$cfg_dir
cat >>confdefs.h <<_ACEOF
#define CONFDIR "$cfg_dir"
_ACEOF
@ -9317,7 +9340,8 @@ then
if test -r /dev/urandom ; then
echo "$as_me:$LINENO: result: /dev/(u)random detected." >&5
echo "${ECHO_T}/dev/(u)random detected." >&6
cat >>confdefs.h <<\_ACEOF
cat >>confdefs.h <<\_ACEOF
#define C_URANDOM 1
_ACEOF
@ -9330,24 +9354,28 @@ fi
case "$target_os" in
linux*)
cat >>confdefs.h <<\_ACEOF
cat >>confdefs.h <<\_ACEOF
#define C_LINUX 1
_ACEOF
if test "$have_pthreads" = "yes"; then
LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS -lpthread"
TH_SAFE="-thread-safe"
cat >>confdefs.h <<\_ACEOF
cat >>confdefs.h <<\_ACEOF
#define CL_THREAD_SAFE 1
_ACEOF
cat >>confdefs.h <<\_ACEOF
cat >>confdefs.h <<\_ACEOF
#define _REENTRANT 1
_ACEOF
CLAMD_LIBS="-lpthread"
if test "$want_clamuko" = "yes"; then
cat >>confdefs.h <<\_ACEOF
cat >>confdefs.h <<\_ACEOF
#define CLAMUKO 1
_ACEOF
@ -9356,7 +9384,8 @@ _ACEOF
fi
;;
cygwin*)
cat >>confdefs.h <<\_ACEOF
cat >>confdefs.h <<\_ACEOF
#define C_CYGWIN 1
_ACEOF
@ -9368,11 +9397,13 @@ _ACEOF
if test "$have_pthreads" = "yes"; then
LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS -lpthread"
TH_SAFE="-thread-safe"
cat >>confdefs.h <<\_ACEOF
cat >>confdefs.h <<\_ACEOF
#define CL_THREAD_SAFE 1
_ACEOF
cat >>confdefs.h <<\_ACEOF
cat >>confdefs.h <<\_ACEOF
#define _REENTRANT 1
_ACEOF
@ -9384,16 +9415,19 @@ solaris*)
LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS -lpthread"
CLAMD_LIBS="-lpthread -lsocket -lnsl -lresolv"
TH_SAFE="-thread-safe"
cat >>confdefs.h <<\_ACEOF
cat >>confdefs.h <<\_ACEOF
#define CL_THREAD_SAFE 1
_ACEOF
cat >>confdefs.h <<\_ACEOF
cat >>confdefs.h <<\_ACEOF
#define _REENTRANT 1
_ACEOF
fi
cat >>confdefs.h <<\_ACEOF
cat >>confdefs.h <<\_ACEOF
#define C_SOLARIS 1
_ACEOF
@ -9403,16 +9437,19 @@ freebsd*)
LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS -pthread -lc_r"
CLAMD_LIBS="-pthread -lc_r"
TH_SAFE="-thread-safe"
cat >>confdefs.h <<\_ACEOF
cat >>confdefs.h <<\_ACEOF
#define CL_THREAD_SAFE 1
_ACEOF
cat >>confdefs.h <<\_ACEOF
cat >>confdefs.h <<\_ACEOF
#define _REENTRANT 1
_ACEOF
fi
cat >>confdefs.h <<\_ACEOF
cat >>confdefs.h <<\_ACEOF
#define C_BSD 1
_ACEOF
@ -9447,16 +9484,19 @@ openbsd*)
CLAMD_LIBS="-pthread -lc_r"
fi
TH_SAFE="-thread-safe"
cat >>confdefs.h <<\_ACEOF
cat >>confdefs.h <<\_ACEOF
#define CL_THREAD_SAFE 1
_ACEOF
cat >>confdefs.h <<\_ACEOF
cat >>confdefs.h <<\_ACEOF
#define _REENTRANT 1
_ACEOF
fi
cat >>confdefs.h <<\_ACEOF
cat >>confdefs.h <<\_ACEOF
#define C_BSD 1
_ACEOF
@ -9465,7 +9505,8 @@ netbsd*)
echo "$as_me:$LINENO: result: NetBSD detected. Disabling thread support." >&5
echo "${ECHO_T}NetBSD detected. Disabling thread support." >&6
have_pthreads="no"
cat >>confdefs.h <<\_ACEOF
cat >>confdefs.h <<\_ACEOF
#define C_BSD 1
_ACEOF
@ -9474,7 +9515,8 @@ bsd*)
echo "$as_me:$LINENO: result: Unknown BSD detected. Disabling thread support." >&5
echo "${ECHO_T}Unknown BSD detected. Disabling thread support." >&6
have_pthreads="no"
cat >>confdefs.h <<\_ACEOF
cat >>confdefs.h <<\_ACEOF
#define C_BSD 1
_ACEOF
@ -9483,17 +9525,20 @@ beos*)
echo "$as_me:$LINENO: result: BeOS detected. Disabling thread support." >&5
echo "${ECHO_T}BeOS detected. Disabling thread support." >&6
have_pthreads="no"
cat >>confdefs.h <<\_ACEOF
cat >>confdefs.h <<\_ACEOF
#define C_BEOS 1
_ACEOF
;;
darwin*)
cat >>confdefs.h <<\_ACEOF
cat >>confdefs.h <<\_ACEOF
#define C_BSD 1
_ACEOF
cat >>confdefs.h <<\_ACEOF
cat >>confdefs.h <<\_ACEOF
#define C_DARWIN 1
_ACEOF
@ -9502,26 +9547,25 @@ _ACEOF
sco*)
FRESHCLAM_LIBS="-lsocket"
CLAMD_LIBS="-lsocket"
cat >>confdefs.h <<\_ACEOF
#define NO_SNPRINTF 1
_ACEOF
;;
;;
hpux*)
if test "$have_pthreads" = "yes"; then
LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS -lpthread"
CLAMD_LIBS="-lpthread"
TH_SAFE="-thread-safe"
cat >>confdefs.h <<\_ACEOF
cat >>confdefs.h <<\_ACEOF
#define CL_THREAD_SAFE 1
_ACEOF
cat >>confdefs.h <<\_ACEOF
cat >>confdefs.h <<\_ACEOF
#define _REENTRANT 1
_ACEOF
fi
cat >>confdefs.h <<\_ACEOF
cat >>confdefs.h <<\_ACEOF
#define C_HPUX 1
_ACEOF
@ -9531,16 +9575,19 @@ aix*)
LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS -lpthread"
CLAMD_LIBS="-lpthread"
TH_SAFE="-thread-safe"
cat >>confdefs.h <<\_ACEOF
cat >>confdefs.h <<\_ACEOF
#define CL_THREAD_SAFE 1
_ACEOF
cat >>confdefs.h <<\_ACEOF
cat >>confdefs.h <<\_ACEOF
#define _REENTRANT 1
_ACEOF
fi
cat >>confdefs.h <<\_ACEOF
cat >>confdefs.h <<\_ACEOF
#define C_AIX 1
_ACEOF
@ -9550,24 +9597,23 @@ irix*)
LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS -lpthread"
CLAMD_LIBS="-lpthread"
TH_SAFE="-thread-safe"
cat >>confdefs.h <<\_ACEOF
cat >>confdefs.h <<\_ACEOF
#define CL_THREAD_SAFE 1
_ACEOF
cat >>confdefs.h <<\_ACEOF
cat >>confdefs.h <<\_ACEOF
#define _REENTRANT 1
_ACEOF
fi
cat >>confdefs.h <<\_ACEOF
#define C_IRIX 1
_ACEOF
cat >>confdefs.h <<\_ACEOF
#define NO_SNPRINTF 1
cat >>confdefs.h <<\_ACEOF
#define C_IRIX 1
_ACEOF
;;
;;
*)
;;
@ -9601,7 +9647,8 @@ fi
if test "$have_pthreads" = "yes"
then
cat >>confdefs.h <<\_ACEOF
cat >>confdefs.h <<\_ACEOF
#define BUILD_CLAMD 1
_ACEOF
@ -10133,13 +10180,15 @@ presetting ac_cv_c_bigendian=no (or yes) will help" >&2;}
esac
if test $ac_cv_c_bigendian = yes; then
cat >>confdefs.h <<\_ACEOF
cat >>confdefs.h <<\_ACEOF
#define WORDS_BIGENDIAN 1
_ACEOF
else
cat >>confdefs.h <<\_ACEOF
#define WORDS_LITTLEENDIAN 1
cat >>confdefs.h <<\_ACEOF
#define WORDS_BIGENDIAN 0
_ACEOF
fi
@ -10239,7 +10288,8 @@ fi
echo "$as_me:$LINENO: result: $have_pragma_pack" >&5
echo "${ECHO_T}$have_pragma_pack" >&6
cat >>confdefs.h <<\_ACEOF
cat >>confdefs.h <<\_ACEOF
#define HAVE_PRAGMA_PACK 1
_ACEOF
@ -10251,7 +10301,8 @@ echo "$as_me: error: Need to know how to pack structures with this compiler" >&2
{ (exit 1); exit 1; }; }
fi
if test "$have_attrib_packed" = yes; then
cat >>confdefs.h <<\_ACEOF
cat >>confdefs.h <<\_ACEOF
#define HAVE_ATTRIB_PACKED 1
_ACEOF
@ -10332,38 +10383,7 @@ s/^[^=]*=[ ]*$//;
}'
fi
# Transform confdefs.h into DEFS.
# Protect against shell expansion while executing Makefile rules.
# Protect against Makefile macro expansion.
#
# If the first sed substitution is executed (which looks for macros that
# take arguments), then we branch to the quote section. Otherwise,
# look for a macro that doesn't take arguments.
cat >confdef2opt.sed <<\_ACEOF
t clear
: clear
s,^[ ]*#[ ]*define[ ][ ]*\([^ (][^ (]*([^)]*)\)[ ]*\(.*\),-D\1=\2,g
t quote
s,^[ ]*#[ ]*define[ ][ ]*\([^ ][^ ]*\)[ ]*\(.*\),-D\1=\2,g
t quote
d
: quote
s,[ `~#$^&*(){}\\|;'"<>?],\\&,g
s,\[,\\&,g
s,\],\\&,g
s,\$,$$,g
p
_ACEOF
# We use echo to avoid assuming a particular line-breaking character.
# The extra dot is to prevent the shell from consuming trailing
# line-breaks from the sub-command output. A line-break within
# single-quotes doesn't work because, if this script is created in a
# platform that uses two characters for line-breaks (e.g., DOS), tr
# would break.
ac_LF_and_DOT=`echo; echo .`
DEFS=`sed -n -f confdef2opt.sed confdefs.h | tr "$ac_LF_and_DOT" ' .'`
rm -f confdef2opt.sed
DEFS=-DHAVE_CONFIG_H
if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
{ { echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined.
@ -10694,10 +10714,15 @@ Usage: $0 [OPTIONS] [FILE]...
--recheck update $as_me by reconfiguring in the same conditions
--file=FILE[:TEMPLATE]
instantiate the configuration file FILE
--header=FILE[:TEMPLATE]
instantiate the configuration header FILE
Configuration files:
$config_files
Configuration headers:
$config_headers
Configuration commands:
$config_commands
@ -10812,6 +10837,7 @@ do
"etc/Makefile" ) CONFIG_FILES="$CONFIG_FILES etc/Makefile" ;;
"Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
"depfiles" ) CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
"clamav-config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS clamav-config.h" ;;
*) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
{ (exit 1); exit 1; }; };;
@ -10824,6 +10850,7 @@ done
# bizarre bug on SunOS 4.1.3.
if $ac_need_defaults; then
test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files
test "${CONFIG_HEADERS+set}" = set || CONFIG_HEADERS=$config_headers
test "${CONFIG_COMMANDS+set}" = set || CONFIG_COMMANDS=$config_commands
fi
@ -11163,6 +11190,229 @@ done
_ACEOF
cat >>$CONFIG_STATUS <<\_ACEOF
#
# CONFIG_HEADER section.
#
# These sed commands are passed to sed as "A NAME B NAME C VALUE D", where
# NAME is the cpp macro being defined and VALUE is the value it is being given.
#
# ac_d sets the value in "#define NAME VALUE" lines.
ac_dA='s,^\([ ]*\)#\([ ]*define[ ][ ]*\)'
ac_dB='[ ].*$,\1#\2'
ac_dC=' '
ac_dD=',;t'
# ac_u turns "#undef NAME" without trailing blanks into "#define NAME VALUE".
ac_uA='s,^\([ ]*\)#\([ ]*\)undef\([ ][ ]*\)'
ac_uB='$,\1#\2define\3'
ac_uC=' '
ac_uD=',;t'
for ac_file in : $CONFIG_HEADERS; do test "x$ac_file" = x: && continue
# Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
case $ac_file in
- | *:- | *:-:* ) # input from stdin
cat >$tmp/stdin
ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
*:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
* ) ac_file_in=$ac_file.in ;;
esac
test x"$ac_file" != x- && { echo "$as_me:$LINENO: creating $ac_file" >&5
echo "$as_me: creating $ac_file" >&6;}
# First look for the input files in the build tree, otherwise in the
# src tree.
ac_file_inputs=`IFS=:
for f in $ac_file_in; do
case $f in
-) echo $tmp/stdin ;;
[\\/$]*)
# Absolute (can't be DOS-style, as IFS=:)
test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
echo "$as_me: error: cannot find input file: $f" >&2;}
{ (exit 1); exit 1; }; }
echo $f;;
*) # Relative
if test -f "$f"; then
# Build tree
echo $f
elif test -f "$srcdir/$f"; then
# Source tree
echo $srcdir/$f
else
# /dev/null tree
{ { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
echo "$as_me: error: cannot find input file: $f" >&2;}
{ (exit 1); exit 1; }; }
fi;;
esac
done` || { (exit 1); exit 1; }
# Remove the trailing spaces.
sed 's/[ ]*$//' $ac_file_inputs >$tmp/in
_ACEOF
# Transform confdefs.h into two sed scripts, `conftest.defines' and
# `conftest.undefs', that substitutes the proper values into
# config.h.in to produce config.h. The first handles `#define'
# templates, and the second `#undef' templates.
# And first: Protect against being on the right side of a sed subst in
# config.status. Protect against being in an unquoted here document
# in config.status.
rm -f conftest.defines conftest.undefs
# Using a here document instead of a string reduces the quoting nightmare.
# Putting comments in sed scripts is not portable.
#
# `end' is used to avoid that the second main sed command (meant for
# 0-ary CPP macros) applies to n-ary macro definitions.
# See the Autoconf documentation for `clear'.
cat >confdef2sed.sed <<\_ACEOF
s/[\\&,]/\\&/g
s,[\\$`],\\&,g
t clear
: clear
s,^[ ]*#[ ]*define[ ][ ]*\([^ (][^ (]*\)\(([^)]*)\)[ ]*\(.*\)$,${ac_dA}\1${ac_dB}\1\2${ac_dC}\3${ac_dD},gp
t end
s,^[ ]*#[ ]*define[ ][ ]*\([^ ][^ ]*\)[ ]*\(.*\)$,${ac_dA}\1${ac_dB}\1${ac_dC}\2${ac_dD},gp
: end
_ACEOF
# If some macros were called several times there might be several times
# the same #defines, which is useless. Nevertheless, we may not want to
# sort them, since we want the *last* AC-DEFINE to be honored.
uniq confdefs.h | sed -n -f confdef2sed.sed >conftest.defines
sed 's/ac_d/ac_u/g' conftest.defines >conftest.undefs
rm -f confdef2sed.sed
# This sed command replaces #undef with comments. This is necessary, for
# example, in the case of _POSIX_SOURCE, which is predefined and required
# on some systems where configure will not decide to define it.
cat >>conftest.undefs <<\_ACEOF
s,^[ ]*#[ ]*undef[ ][ ]*[a-zA-Z_][a-zA-Z_0-9]*,/* & */,
_ACEOF
# Break up conftest.defines because some shells have a limit on the size
# of here documents, and old seds have small limits too (100 cmds).
echo ' # Handle all the #define templates only if necessary.' >>$CONFIG_STATUS
echo ' if egrep "^[ ]*#[ ]*define" $tmp/in >/dev/null; then' >>$CONFIG_STATUS
echo ' # If there are no defines, we may have an empty if/fi' >>$CONFIG_STATUS
echo ' :' >>$CONFIG_STATUS
rm -f conftest.tail
while grep . conftest.defines >/dev/null
do
# Write a limited-size here document to $tmp/defines.sed.
echo ' cat >$tmp/defines.sed <<CEOF' >>$CONFIG_STATUS
# Speed up: don't consider the non `#define' lines.
echo '/^[ ]*#[ ]*define/!b' >>$CONFIG_STATUS
# Work around the forget-to-reset-the-flag bug.
echo 't clr' >>$CONFIG_STATUS
echo ': clr' >>$CONFIG_STATUS
sed ${ac_max_here_lines}q conftest.defines >>$CONFIG_STATUS
echo 'CEOF
sed -f $tmp/defines.sed $tmp/in >$tmp/out
rm -f $tmp/in
mv $tmp/out $tmp/in
' >>$CONFIG_STATUS
sed 1,${ac_max_here_lines}d conftest.defines >conftest.tail
rm -f conftest.defines
mv conftest.tail conftest.defines
done
rm -f conftest.defines
echo ' fi # egrep' >>$CONFIG_STATUS
echo >>$CONFIG_STATUS
# Break up conftest.undefs because some shells have a limit on the size
# of here documents, and old seds have small limits too (100 cmds).
echo ' # Handle all the #undef templates' >>$CONFIG_STATUS
rm -f conftest.tail
while grep . conftest.undefs >/dev/null
do
# Write a limited-size here document to $tmp/undefs.sed.
echo ' cat >$tmp/undefs.sed <<CEOF' >>$CONFIG_STATUS
# Speed up: don't consider the non `#undef'
echo '/^[ ]*#[ ]*undef/!b' >>$CONFIG_STATUS
# Work around the forget-to-reset-the-flag bug.
echo 't clr' >>$CONFIG_STATUS
echo ': clr' >>$CONFIG_STATUS
sed ${ac_max_here_lines}q conftest.undefs >>$CONFIG_STATUS
echo 'CEOF
sed -f $tmp/undefs.sed $tmp/in >$tmp/out
rm -f $tmp/in
mv $tmp/out $tmp/in
' >>$CONFIG_STATUS
sed 1,${ac_max_here_lines}d conftest.undefs >conftest.tail
rm -f conftest.undefs
mv conftest.tail conftest.undefs
done
rm -f conftest.undefs
cat >>$CONFIG_STATUS <<\_ACEOF
# Let's still pretend it is `configure' which instantiates (i.e., don't
# use $as_me), people would be surprised to read:
# /* config.h. Generated by config.status. */
if test x"$ac_file" = x-; then
echo "/* Generated by configure. */" >$tmp/config.h
else
echo "/* $ac_file. Generated by configure. */" >$tmp/config.h
fi
cat $tmp/in >>$tmp/config.h
rm -f $tmp/in
if test x"$ac_file" != x-; then
if cmp -s $ac_file $tmp/config.h 2>/dev/null; then
{ echo "$as_me:$LINENO: $ac_file is unchanged" >&5
echo "$as_me: $ac_file is unchanged" >&6;}
else
ac_dir=`(dirname "$ac_file") 2>/dev/null ||
$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
X"$ac_file" : 'X\(//\)[^/]' \| \
X"$ac_file" : 'X\(//\)$' \| \
X"$ac_file" : 'X\(/\)' \| \
. : '\(.\)' 2>/dev/null ||
echo X"$ac_file" |
sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
/^X\(\/\/\)[^/].*/{ s//\1/; q; }
/^X\(\/\/\)$/{ s//\1/; q; }
/^X\(\/\).*/{ s//\1/; q; }
s/.*/./; q'`
{ case "$ac_dir" in
[\\/]* | ?:[\\/]* ) as_incr_dir=;;
*) as_incr_dir=.;;
esac
as_dummy="$ac_dir"
for as_mkdir_dir in `IFS='/\\'; set X $as_dummy; shift; echo "$@"`; do
case $as_mkdir_dir in
# Skip DOS drivespec
?:) as_incr_dir=$as_mkdir_dir ;;
*)
as_incr_dir=$as_incr_dir/$as_mkdir_dir
test -d "$as_incr_dir" ||
mkdir "$as_incr_dir" ||
{ { echo "$as_me:$LINENO: error: cannot create \"$ac_dir\"" >&5
echo "$as_me: error: cannot create \"$ac_dir\"" >&2;}
{ (exit 1); exit 1; }; }
;;
esac
done; }
rm -f $ac_file
mv $tmp/config.h $ac_file
fi
else
cat $tmp/config.h
rm -f $tmp/config.h
fi
# Run the commands associated with the file.
case $ac_file in
clamav-config.h ) # update the timestamp
echo 'timestamp for clamav-config.h' >"./stamp-h1"
;;
esac
done
_ACEOF
cat >>$CONFIG_STATUS <<\_ACEOF
#
# CONFIG_COMMANDS section.
#

@ -17,10 +17,10 @@ dnl Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
AC_INIT(clamscan/clamscan.c)
AC_CREATE_TARGET_H(target.h)
AC_CANONICAL_SYSTEM
AM_INIT_AUTOMAKE(clamav, "devel-`date +%Y%m%d`")
dnl AM_INIT_AUTOMAKE(clamav, `date +%Y%m%d`)
AM_CONFIG_HEADER(clamav-config.h)
LC_CURRENT=1
LC_REVISION=3
LC_AGE=0
@ -48,8 +48,8 @@ dnl AC_SUBST(LT_AGE)
dnl BUFFSIZE must be at least 16 kb !!!
AC_DEFINE(SCANBUFF, 131072)
AC_DEFINE(FILEBUFF, 8192)
AC_DEFINE(SCANBUFF, 131072, [scan buffer size])
AC_DEFINE(FILEBUFF, 8192, [file i/o buffer size])
AC_HEADER_STDC
AC_CHECK_HEADERS(stdint.h unistd.h sys/int_types.h dlfcn.h inttypes.h sys/inttypes.h memory.h ndir.h stdlib.h strings.h string.h sys/mman.h sys/param.h sys/stat.h sys/types.h malloc.h)
@ -61,7 +61,7 @@ AC_COMPILE_CHECK_SIZEOF(long)
have_pthreads=no
AC_CHECK_HEADER(pthread.h,[have_pthreads=yes],)
AC_CHECK_HEADER(zlib.h,[LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS -lz"; AC_DEFINE(HAVE_ZLIB_H)],[echo "Please install zlib and zlib-devel packages."; exit 1])
AC_CHECK_HEADER(zlib.h,[LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS -lz"; AC_DEFINE(HAVE_ZLIB_H,1,zlib installed)],[echo "Please install zlib and zlib-devel packages."; exit 1])
want_bzip2="yes"
AC_ARG_ENABLE(bzip2,
@ -70,11 +70,11 @@ want_bzip2="no",)
if test "$want_bzip2" = "yes"
then
AC_CHECK_HEADER(bzlib.h,[LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS -lbz2"; AC_DEFINE(HAVE_BZLIB_H)],)
AC_CHECK_LIB(bz2, bzReadOpen, AC_DEFINE(NOBZ2PREFIX),)
AC_CHECK_HEADER(bzlib.h,[LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS -lbz2"; AC_DEFINE(HAVE_BZLIB_H,1,have bzip2)],)
AC_CHECK_LIB(bz2, bzReadOpen, AC_DEFINE(NOBZ2PREFIX,1,bzip funtions do not have bz2 prefix),)
fi
AC_CHECK_FUNCS(setsid memcpy)
AC_CHECK_FUNCS(setsid memcpy snprintf)
AC_FUNC_SETPGRP
have_milter="no"
@ -91,10 +91,10 @@ want_dsig="no",)
if test "$want_dsig" = "yes"
then
AC_CHECK_LIB(gmp, __gmpz_init, [LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS -lgmp"; AC_DEFINE(HAVE_GMP)], [AC_CHECK_LIB(gmp, mpz_init, [LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS -lgmp"; AC_DEFINE(HAVE_GMP)], [echo "WARNING: GNU MP 2 or newer NOT FOUND - digital signature support will be disabled !"; want_dsig="no"])])
AC_CHECK_LIB(gmp, __gmpz_init, [LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS -lgmp"; AC_DEFINE(HAVE_GMP,1,have gmp installed)], [AC_CHECK_LIB(gmp, mpz_init, [LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS -lgmp"; AC_DEFINE(HAVE_GMP,1,have gmp installed)], [echo "WARNING: GNU MP 2 or newer NOT FOUND - digital signature support will be disabled !"; want_dsig="no"])])
fi
AC_CHECK_HEADER(syslog.h,AC_DEFINE(CLAMD_USE_SYSLOG),)
AC_CHECK_HEADER(syslog.h,AC_DEFINE(CLAMD_USE_SYSLOG,1,[use syslog]),)
dnl AC_CHECK_LIB(c, strtok_r,, AC_DEFINE(NO_STRTOK_R))
dnl AC_CHECK_LIB(c, mkstemp, AC_DEFINE(HAVE_MKSTEMP),)
@ -126,8 +126,8 @@ AC_ARG_WITH(group,
[ --with-group=gid name of the clamav group (default=clamav).],
clamav_group="$withval", clamav_group="clamav")
AC_DEFINE_UNQUOTED(CLAMAVUSER,"$clamav_user",)
AC_DEFINE_UNQUOTED(CLAMAVGROUP,"$clamav_group",)
AC_DEFINE_UNQUOTED(CLAMAVUSER,"$clamav_user",[name of the clamav user])
AC_DEFINE_UNQUOTED(CLAMAVGROUP,"$clamav_group",[name of the clamav group])
test_clamav=yes
AC_ARG_ENABLE(clamav,
@ -141,11 +141,11 @@ want_clamuko=no,)
AC_ARG_ENABLE(debug,
[ --enable-debug Enable debug messages.],
AC_DEFINE(CL_DEBUG),)
AC_DEFINE(CL_DEBUG,1,[enable debugging]),)
AC_ARG_ENABLE(bigstack,
[ --enable-bigstack Increase thread stack size.],
AC_DEFINE(C_BIGSTACK),)
AC_DEFINE(C_BIGSTACK,1,[Increase thread stack size.]),)
dnl database directory
AC_ARG_WITH(dbdir,
@ -155,12 +155,12 @@ db_dir="$withval", db_dir="_default_")
dnl main.cvd
AC_ARG_WITH(db1,
[ --with-db1=name Name of the main database (main.cvd).],
AC_DEFINE_UNQUOTED(DB1NAME,"$withval",), AC_DEFINE(DB1NAME, "main.cvd"))
AC_DEFINE_UNQUOTED(DB1NAME,"$withval",[Name of the main database]), AC_DEFINE(DB1NAME, "main.cvd",[Name of the main database]))
dnl daily.cvd
AC_ARG_WITH(db2,
[ --with-db2=name Name of the daily database (daily.cvd).],
AC_DEFINE_UNQUOTED(DB2NAME,"$withval",), AC_DEFINE(DB2NAME, "daily.cvd"))
AC_DEFINE_UNQUOTED(DB2NAME,"$withval",[Name of the daily database]), AC_DEFINE(DB2NAME, "daily.cvd",[Name of the daily database]))
dnl I had problems with $pkgdatadir, that's why I'm using these funny checks
if test "$db_dir" = "_default_"
@ -193,7 +193,7 @@ fi
CFGDIR=$cfg_dir
AC_SUBST(CFGDIR)
AC_DEFINE_UNQUOTED(CONFDIR,"$cfg_dir",)
AC_DEFINE_UNQUOTED(CONFDIR,"$cfg_dir",[where to look for the config file])
dnl Do not overwrite the current config file
AM_CONDITIONAL(INSTALL_CLAMAV_CONF, test ! -r "$cfg_dir/clamav.conf")
@ -203,7 +203,7 @@ if test "$test_urandom" = "yes"
then
if test -r /dev/urandom ; then
AC_MSG_RESULT(/dev/(u)random detected.)
AC_DEFINE(C_URANDOM)
AC_DEFINE(C_URANDOM,1,[use /dev/urandom])
else
AC_MSG_RESULT(/dev/(u)random not detected - using weak software rand())
fi
@ -216,22 +216,22 @@ dnl TH_SAFE=""
case "$target_os" in
linux*)
AC_DEFINE(C_LINUX)
AC_DEFINE(C_LINUX,1,[target is linux])
if test "$have_pthreads" = "yes"; then
LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS -lpthread"
TH_SAFE="-thread-safe"
AC_DEFINE(CL_THREAD_SAFE)
AC_DEFINE(_REENTRANT)
AC_DEFINE(CL_THREAD_SAFE,1,[thread safe])
AC_DEFINE(_REENTRANT,1,[thread safe])
CLAMD_LIBS="-lpthread"
if test "$want_clamuko" = "yes"; then
AC_DEFINE(CLAMUKO)
AC_DEFINE(CLAMUKO,1,[enable clamuko])
fi
CLAMSCAN_LIBS="-lpthread"
fi
;;
cygwin*)
dnl It probably won't work.
AC_DEFINE(C_CYGWIN)
AC_DEFINE(C_CYGWIN,1,[os is cygwin])
if test "$test_clamav" = "yes"; then
if test ! -r /etc/passwd; then
test_clamav="no"
@ -240,8 +240,8 @@ cygwin*)
if test "$have_pthreads" = "yes"; then
LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS -lpthread"
TH_SAFE="-thread-safe"
AC_DEFINE(CL_THREAD_SAFE)
AC_DEFINE(_REENTRANT)
AC_DEFINE(CL_THREAD_SAFE,1,[thread safe])
AC_DEFINE(_REENTRANT,1,[thread safe])
fi
;;
solaris*)
@ -250,20 +250,20 @@ solaris*)
LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS -lpthread"
CLAMD_LIBS="-lpthread -lsocket -lnsl -lresolv"
TH_SAFE="-thread-safe"
AC_DEFINE(CL_THREAD_SAFE)
AC_DEFINE(_REENTRANT)
AC_DEFINE(CL_THREAD_SAFE,1,[thread safe])
AC_DEFINE(_REENTRANT,1,[thread safe])
fi
AC_DEFINE(C_SOLARIS)
AC_DEFINE(C_SOLARIS,1,[os is solaris])
;;
freebsd*)
if test "$have_pthreads" = "yes"; then
LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS -pthread -lc_r"
CLAMD_LIBS="-pthread -lc_r"
TH_SAFE="-thread-safe"
AC_DEFINE(CL_THREAD_SAFE)
AC_DEFINE(_REENTRANT)
AC_DEFINE(CL_THREAD_SAFE,1,[thread safe])
AC_DEFINE(_REENTRANT,1,[thread safe])
fi
AC_DEFINE(C_BSD)
AC_DEFINE(C_BSD,1,[os is solaris])
;;
openbsd3.3*)
if test "$have_pthreads" = "yes"; then
@ -286,29 +286,29 @@ openbsd*)
CLAMD_LIBS="-pthread -lc_r"
fi
TH_SAFE="-thread-safe"
AC_DEFINE(CL_THREAD_SAFE)
AC_DEFINE(_REENTRANT)
AC_DEFINE(CL_THREAD_SAFE,1,[thread safe])
AC_DEFINE(_REENTRANT,1,[thread safe])
fi
AC_DEFINE(C_BSD)
AC_DEFINE(C_BSD,1,[os is bsd flavor])
;;
netbsd*)
AC_MSG_RESULT(NetBSD detected. Disabling thread support.)
have_pthreads="no"
AC_DEFINE(C_BSD)
AC_DEFINE(C_BSD,1,[os is bsd flavor])
;;
bsd*)
AC_MSG_RESULT(Unknown BSD detected. Disabling thread support.)
have_pthreads="no"
AC_DEFINE(C_BSD)
AC_DEFINE(C_BSD,1,[os is bsd flavor])
;;
beos*)
AC_MSG_RESULT(BeOS detected. Disabling thread support.)
have_pthreads="no"
AC_DEFINE(C_BEOS)
AC_DEFINE(C_BEOS,1,[os is beos])
;;
darwin*)
AC_DEFINE(C_BSD)
AC_DEFINE(C_DARWIN)
AC_DEFINE(C_BSD,1,[os is bsd flavor])
AC_DEFINE(C_DARWIN,1,[os is darwin])
use_netinfo="yes"
dnl have_pthreads="no"
dnl AC_MSG_RESULT(Darwin detected. Disabling thread support.)
@ -317,38 +317,38 @@ sco*)
dnl njh@bandsman.sco.uk: SCO Unix port
FRESHCLAM_LIBS="-lsocket"
CLAMD_LIBS="-lsocket"
AC_DEFINE(NO_SNPRINTF)
dnl AC_DEFINE(NO_SNPRINTF)
;;
hpux*)
if test "$have_pthreads" = "yes"; then
LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS -lpthread"
CLAMD_LIBS="-lpthread"
TH_SAFE="-thread-safe"
AC_DEFINE(CL_THREAD_SAFE)
AC_DEFINE(_REENTRANT)
AC_DEFINE(CL_THREAD_SAFE,1,[thread safe])
AC_DEFINE(_REENTRANT,1,[thread safe])
fi
AC_DEFINE(C_HPUX)
AC_DEFINE(C_HPUX,1,[os is hpux])
;;
aix*)
if test "$have_pthreads" = "yes"; then
LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS -lpthread"
CLAMD_LIBS="-lpthread"
TH_SAFE="-thread-safe"
AC_DEFINE(CL_THREAD_SAFE)
AC_DEFINE(_REENTRANT)
AC_DEFINE(CL_THREAD_SAFE,1,[thread safe])
AC_DEFINE(_REENTRANT,1,[thread safe])
fi
AC_DEFINE(C_AIX)
AC_DEFINE(C_AIX,1,[os is aix])
;;
irix*)
if test "$have_pthreads" = "yes"; then
LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS -lpthread"
CLAMD_LIBS="-lpthread"
TH_SAFE="-thread-safe"
AC_DEFINE(CL_THREAD_SAFE)
AC_DEFINE(_REENTRANT)
AC_DEFINE(CL_THREAD_SAFE,1,[thread safe])
AC_DEFINE(_REENTRANT,1,[thread safe])
fi
AC_DEFINE(C_IRIX)
AC_DEFINE(NO_SNPRINTF)
AC_DEFINE(C_IRIX,1,[os is irix])
dnl AC_DEFINE(NO_SNPRINTF,1,no snprintf available)
;;
*)
@ -365,7 +365,7 @@ AM_CONDITIONAL(HAVE_MILTER, test "$have_milter" = "yes")
if test "$have_pthreads" = "yes"
then
AC_DEFINE(BUILD_CLAMD)
AC_DEFINE(BUILD_CLAMD, 1, "build clamd")
fi
if test "$have_milter" = "yes"
@ -420,9 +420,9 @@ fi
AC_C_CONST
AC_C_BIGENDIAN
if test $ac_cv_c_bigendian = yes; then
AC_DEFINE(WORDS_BIGENDIAN)
AC_DEFINE(WORDS_BIGENDIAN,1,endianess)
else
AC_DEFINE(WORDS_LITTLEENDIAN)
AC_DEFINE(WORDS_BIGENDIAN,0,endianess)
fi
dnl check for __attribute__((packed))
@ -446,14 +446,14 @@ if test "$have_attrib_packed" = no; then
[have_pragma_pack=no])
])
AC_MSG_RESULT($have_pragma_pack)
AC_DEFINE(HAVE_PRAGMA_PACK)
AC_DEFINE(HAVE_PRAGMA_PACK, 1, "pragma pack")
fi
if test "$have_attrib_packed" = no -a "$have_pragma_pack" = no ; then
AC_MSG_ERROR(Need to know how to pack structures with this compiler)
fi
if test "$have_attrib_packed" = yes; then
AC_DEFINE(HAVE_ATTRIB_PACKED)
AC_DEFINE(HAVE_ATTRIB_PACKED, 1, "attrib packed")
fi
AC_OUTPUT([

@ -24,9 +24,11 @@ CLAMAVGROUP = @CLAMAVGROUP@
install:
$(mkinstalldirs) $(DESTDIR)$(DBINST)
@$(INSTALL_DATA) main.cvd $(DESTDIR)$(DBINST)
@$(INSTALL_DATA) daily.cvd $(DESTDIR)$(DBINST)
@$(INSTALL_DATA) mirrors.txt $(DESTDIR)$(DBINST)
test -f $(DESTDIR)$(DBINST)/main.cvd || @$(INSTALL_DATA) main.cvd $(DESTDIR)$(DBINST)
test -f $(DESTDIR)$(DBINST)/daily.cvd || @$(INSTALL_DATA) daily.cvd $(DESTDIR)$(DBINST)
test -f $(DESTDIR)$(DBINST)/mirrors.txt || @$(INSTALL_DATA) mirrors.txt $(DESTDIR)$(DBINST)
test -f $(DESTDIR)$(DBINST)/viruses.db && rm -f $(DESTDIR)$(DBINST)/viruses.db || true
test -f $(DESTDIR)$(DBINST)/viruses.db2 && rm -f $(DESTDIR)$(DBINST)/viruses.db2 || true
@if test `id -u` -eq 0 && test -n "${CLAMAVUSER}" && test -n "${CLAMAVGROUP}"; then \
chmod 775 $(DESTDIR)$(DBINST); \
chown ${CLAMAVUSER} $(DESTDIR)$(DBINST); \

@ -121,6 +121,7 @@ EXTRA_DIST = main.cvd daily.cvd mirrors.txt
DBINST = @DBDIR@
subdir = database
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = $(top_builddir)/clamav-config.h
CONFIG_CLEAN_FILES =
DIST_SOURCES =
DIST_COMMON = Makefile.am Makefile.in
@ -247,9 +248,11 @@ uninstall-am: uninstall-info-am
install:
$(mkinstalldirs) $(DESTDIR)$(DBINST)
@$(INSTALL_DATA) main.cvd $(DESTDIR)$(DBINST)
@$(INSTALL_DATA) daily.cvd $(DESTDIR)$(DBINST)
@$(INSTALL_DATA) mirrors.txt $(DESTDIR)$(DBINST)
test -f $(DESTDIR)$(DBINST)/main.cvd || @$(INSTALL_DATA) main.cvd $(DESTDIR)$(DBINST)
test -f $(DESTDIR)$(DBINST)/daily.cvd || @$(INSTALL_DATA) daily.cvd $(DESTDIR)$(DBINST)
test -f $(DESTDIR)$(DBINST)/mirrors.txt || @$(INSTALL_DATA) mirrors.txt $(DESTDIR)$(DBINST)
test -f $(DESTDIR)$(DBINST)/viruses.db && rm -f $(DESTDIR)$(DBINST)/viruses.db || true
test -f $(DESTDIR)$(DBINST)/viruses.db2 && rm -f $(DESTDIR)$(DBINST)/viruses.db2 || true
@if test `id -u` -eq 0 && test -n "${CLAMAVUSER}" && test -n "${CLAMAVGROUP}"; then \
chmod 775 $(DESTDIR)$(DBINST); \
chown ${CLAMAVUSER} $(DESTDIR)$(DBINST); \

@ -119,6 +119,7 @@ EXTRA_DIST = clamdoc.pdf DMS Spanish Japanese html man FreeBSD-HowTo Portugese T
man_MANS = man/clamscan.1 man/freshclam.1 man/sigtool.1 man/clamd.8 man/clamav.conf.5 man/clamdscan.1 man/clamav-milter.8
subdir = docs
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = $(top_builddir)/clamav-config.h
CONFIG_CLEAN_FILES =
DIST_SOURCES =

@ -121,6 +121,7 @@ EXTRA_DIST = clamav.conf freshclam.conf
CFGINST = @CFGDIR@
subdir = etc
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = $(top_builddir)/clamav-config.h
CONFIG_CLEAN_FILES =
DIST_SOURCES =
DIST_COMMON = Makefile.am Makefile.in

@ -137,6 +137,7 @@ INCLUDES = -I../clamscan -I../clamd -I../libclamav
LIBS = -L../libclamav -lclamav @FRESHCLAM_LIBS@
subdir = freshclam
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = $(top_builddir)/clamav-config.h
CONFIG_CLEAN_FILES =
bin_PROGRAMS = freshclam$(EXEEXT)
PROGRAMS = $(bin_PROGRAMS)
@ -149,7 +150,7 @@ freshclam_OBJECTS = $(am_freshclam_OBJECTS)
@BUILD_CLAMD_FALSE@freshclam_DEPENDENCIES = ../clamscan/getopt.o \
@BUILD_CLAMD_FALSE@ ../clamscan/others.o
freshclam_LDFLAGS =
DEFAULT_INCLUDES = -I. -I$(srcdir)
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
CPPFLAGS = @CPPFLAGS@
LDFLAGS = @LDFLAGS@
depcomp = $(SHELL) $(top_srcdir)/depcomp

@ -19,6 +19,10 @@
/* TODO: Handle SIGALRM more gently */
#if HAVE_CONFIG_H
#include "clamav-config.h"
#endif
#include <stdio.h>
#include <stdlib.h>
#include <unistd.h>

@ -20,6 +20,10 @@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
#if HAVE_CONFIG_H
#include "clamav-config.h"
#endif
#include <stdio.h>
#include <stdlib.h>
#include <unistd.h>
@ -505,8 +509,8 @@ int get_database(const char *dbfile, int socketfd, const char *file, const char
mprintf("Downloading %s [%c]\r", dbfile, rotation[rot]);
fflush(stdout);
/* rot = ++rot % 4; -> operation on `rot' may be undefined (why ?) */
rot %= 4;
rot++;
rot %= 4;
}
mprintf("Downloading %s [*]\n", dbfile);

@ -16,6 +16,10 @@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
#if HAVE_CONFIG_H
#include "clamav-config.h"
#endif
#ifdef BUILD_CLAMD
#include <stdio.h>

@ -181,6 +181,7 @@ libclamav_la_SOURCES = \
lib_LTLIBRARIES = libclamav.la
subdir = libclamav
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = $(top_builddir)/clamav-config.h
CONFIG_CLEAN_FILES =
LTLIBRARIES = $(lib_LTLIBRARIES)
@ -193,7 +194,7 @@ am_libclamav_la_OBJECTS = matcher.lo md5.lo others.lo readdb.lo cvd.lo \
libclamav_la_OBJECTS = $(am_libclamav_la_OBJECTS)
DEFS = @DEFS@
DEFAULT_INCLUDES = -I. -I$(srcdir)
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
CPPFLAGS = @CPPFLAGS@
LDFLAGS = @LDFLAGS@
LIBS = @LIBS@

@ -17,7 +17,11 @@
*
* $LOG$
*/
static char const rcsid[] = "$Id: blob.c,v 1.3 2004/01/14 10:08:59 nigelhorne Exp $";
static char const rcsid[] = "$Id: blob.c,v 1.4 2004/02/06 13:46:08 kojm Exp $";
#if HAVE_CONFIG_H
#include "clamav-config.h"
#endif
#include <stdlib.h>
#include <string.h>
@ -33,6 +37,7 @@ static char const rcsid[] = "$Id: blob.c,v 1.3 2004/01/14 10:08:59 nigelhorne Ex
#include "blob.h"
#include "others.h"
/*#define OPTIMIZE_SPACE /* for machines short of RAM */
#ifndef CL_DEBUG

@ -21,6 +21,10 @@
#ifndef __CLTYPES_H
#define __CLTYPES_H
#if HAVE_CONFIG_H
#include "clamav-config.h"
#endif
#ifdef HAVE_STDINT_H
#include <stdint.h>
#elif defined HAVE_SYS_INT_TYPES_H /*solaris*/
@ -39,9 +43,9 @@
typedef unsigned short uint16_t; typedef signed short int16_t;
# endif
# if defined SIZEOF_INT == 4
# if SIZEOF_INT == 4
typedef unsigned int uint32_t; typedef signed int int32_t;
# elif defined SIZEOF_LONG == 4
# elif SIZEOF_LONG == 4
typedef unsigned long uint32_t; typedef signed long int32_t;
# else
# error unable to typedef int32_t from either int or long

@ -1,5 +1,5 @@
/*
* Copyright (C) 2003 Tomasz Kojm <zolw@konarski.edu.pl>
* Copyright (C) 2003 - 2004 Tomasz Kojm <tkojm@clamav.net>
*
* untgz() is based on public domain minitar utility by Charles G. Waldman
*
@ -18,6 +18,10 @@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
#if HAVE_CONFIG_H
#include "clamav-config.h"
#endif
#include <stdio.h>
#include <string.h>
#include <stdlib.h>

@ -1,5 +1,5 @@
/*
* Copyright (C) 2003 Tomasz Kojm <zolw@konarski.edu.pl>
* Copyright (C) 2003 - 2004 Tomasz Kojm <tkojm@clamav.net>
*
* Number encoding rutines are based on yyyRSA by Erik Thiele
*
@ -18,6 +18,10 @@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
#if HAVE_CONFIG_H
#include "clamav-config.h"
#endif
#ifdef HAVE_GMP
#include <stdio.h>

@ -21,6 +21,10 @@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
#if HAVE_CONFIG_H
#include "clamav-config.h"
#endif
#include <stdio.h>
#include <string.h>
#include <stdlib.h>

@ -17,6 +17,9 @@
*
* Change History:
* $Log: mbox.c,v $
* Revision 1.39 2004/02/06 13:46:08 kojm
* Support for clamav-config.h
*
* Revision 1.38 2004/02/04 13:29:48 nigelhorne
* Handle partial writes - and print when write fails
*
@ -105,7 +108,11 @@
* Compilable under SCO; removed duplicate code with message.c
*
*/
static char const rcsid[] = "$Id: mbox.c,v 1.38 2004/02/04 13:29:48 nigelhorne Exp $";
static char const rcsid[] = "$Id: mbox.c,v 1.39 2004/02/06 13:46:08 kojm Exp $";
#if HAVE_CONFIG_H
#include "clamav-config.h"
#endif
#ifndef CL_DEBUG
/*#define NDEBUG /* map CLAMAV debug onto standard */

@ -21,7 +21,7 @@
/* Written by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995. */
#ifdef HAVE_CONFIG_H
# include <config.h>
# include <clamav-config.h>
#endif
#include <sys/types.h>
@ -37,16 +37,16 @@
#include "md5.h"
/* Not needed, since endianess is already taken care of by configure
#ifdef _LIBC
# include <endian.h>
# if __BYTE_ORDER == __BIG_ENDIAN
# define WORDS_BIGENDIAN 1
# endif
/* We need to keep the namespace clean so define the MD5 function
protected using leading __ . */
#endif
*/
#ifdef WORDS_BIGENDIAN
#if WORDS_BIGENDIAN
# define SWAP(n) \
(((n) << 24) | (((n) & 0xff00) << 8) | (((n) >> 8) & 0xff00) | ((n) >> 24))
#else

@ -17,6 +17,9 @@
*
* Change History:
* $Log: message.c,v $
* Revision 1.27 2004/02/06 13:46:08 kojm
* Support for clamav-config.h
*
* Revision 1.26 2004/02/06 13:10:34 nigelhorne
* Now integrates with winzip
*
@ -75,7 +78,11 @@
* uuencodebegin() no longer static
*
*/
static char const rcsid[] = "$Id: message.c,v 1.26 2004/02/06 13:10:34 nigelhorne Exp $";
static char const rcsid[] = "$Id: message.c,v 1.27 2004/02/06 13:46:08 kojm Exp $";
#if HAVE_CONFIG_H
#include "clamav-config.h"
#endif
#ifndef CL_DEBUG
/*#define NDEBUG /* map CLAMAV debug onto standard */

@ -20,6 +20,10 @@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
#if HAVE_CONFIG_H
#include "clamav-config.h"
#endif
#include <sys/types.h>
#include <sys/stat.h>
#include <fcntl.h>
@ -38,13 +42,13 @@
#define MIN(a, b) (((a) < (b)) ? (a) : (b))
#ifdef WORDS_LITTLEENDIAN
#define ole2_endian_convert_16(v) (v)
#else
#if WORDS_BIGENDIAN
static uint16_t ole2_endian_convert_16(uint16_t v)
{
return ((v >> 8) + (v << 8));
}
#else
#define ole2_endian_convert_16(v) (v)
#endif
#ifdef WORDS_LITTLEENDIAN

@ -17,6 +17,10 @@
*
*/
#if HAVE_CONFIG_H
#include "clamav-config.h"
#endif
#include <stdio.h>
#include <stdarg.h>
#include <string.h>

@ -16,6 +16,10 @@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
#if HAVE_CONFIG_H
#include "clamav-config.h"
#endif
#include <stdio.h>
#include <stdlib.h>
#include <string.h>

@ -1,5 +1,6 @@
/*
* Copyright (C) 2002 - 2004 Tomasz Kojm <tkojm@clamav.net>
* With enhancements from Thomas Lamy <Thomas.Lamy@in-online.net>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@ -16,6 +17,10 @@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
#if HAVE_CONFIG_H
#include "clamav-config.h"
#endif
#include <stdio.h>
#include <string.h>
#include <stdlib.h>
@ -28,8 +33,8 @@
#ifdef CL_THREAD_SAFE
# include <pthread.h>
pthread_mutex_t cli_scanrar_mutex = PTHREAD_MUTEX_INITIALIZER;
int cli_scanrar_inuse = 0;
#endif
int cli_scanrar_inuse = 0;
#include "clamav.h"
#include "others.h"
@ -52,17 +57,56 @@ int cli_scanrar_inuse = 0;
#define SCAN_OLE2 (options & CL_OLE2)
#define DISABLE_RAR (options & CL_DISABLERAR)
typedef enum {
CL_UNKNOWN_TYPE = 0,
CL_MAILFILE,
CL_GZFILE,
CL_ZIPFILE,
CL_BZFILE,
CL_RARFILE,
CL_OLE2FILE
} cl_file_t;
struct cl_magic_s {
int offset;
char *magic;
size_t length;
char *descr;
cl_file_t type;
};
#define MAGIC_BUFFER_SIZE 14
#define RAR_MAGIC_STR "Rar!"
#define ZIP_MAGIC_STR "PK\003\004"
#define GZIP_MAGIC_STR "\037\213"
#define MAIL_MAGIC_STR "From "
#define RAWMAIL_MAGIC_STR "Received: "
#define MAILDIR_MAGIC_STR "Return-Path: "
#define DELIVERED_MAGIC_STR "Delivered-To: "
#define XUIDL_MAGIC_STR "X-UIDL: "
#define BZIP_MAGIC_STR "BZh"
#define OLE2_MAGIC_STR "\xD0\xCF\x11\xE0\xA1\xB1\x1A\xE1"
static const struct cl_magic_s cl_magic[] = {
{0, "Rar!", 4, "RAR file", CL_RARFILE},
{0, "PK\003\004", 4, "ZIP file", CL_ZIPFILE},
{0, "\037\213", 2, "GZip file", CL_GZFILE},
{0, "BZh", 3, "BZip file", CL_BZFILE},
{0, "From ", 5, "MBox file", CL_MAILFILE},
{0, "Received: ", 10, "Raw mail", CL_MAILFILE},
{0, "Return-Path: ", 13, "Maildir file", CL_MAILFILE},
{0, "Delivered-To: ", 14, "Mail file", CL_MAILFILE},
{0, "X-UIDL: ", 8, "Mail file", CL_MAILFILE},
{0, "\320\317\021\340\241\261\032\341",
8, "OLE2 container", CL_OLE2FILE},
{-1, NULL, 0, NULL, CL_UNKNOWN_TYPE}
};
cl_file_t cl_filetype(const char *buf, size_t buflen)
{
int i;
for (i = 0; cl_magic[i].magic; i++) {
if (buflen >= cl_magic[i].offset+cl_magic[i].length) {
if (memcmp(buf+cl_magic[i].offset, cl_magic[i].magic, cl_magic[i].length) == 0) {
cli_dbgmsg("Recognized %s file\n", cl_magic[i].descr);
return cl_magic[i].type;
}
}
}
cli_dbgmsg("cl_filetype(): File type not recognized\n");
return CL_UNKNOWN_TYPE;
}
int cli_magic_scandesc(int desc, char **virname, long int *scanned, const struct cl_node *root, const struct cl_limits *limits, int options, int *reclev);
@ -70,7 +114,7 @@ int cli_scandesc(int desc, char **virname, long int *scanned, const struct
cl_node *root)
{
char *buffer, *buff, *endbl, *pt;
int bytes, buffsize, length;
int bytes, buffsize, length, ret;
/* prepare the buffer */
buffsize = root->maxpatlen + SCANBUFF;
@ -96,9 +140,9 @@ cl_node *root)
if(bytes < SCANBUFF)
length -= SCANBUFF - bytes;
if(cl_scanbuff(pt, length, virname, root) == CL_VIRUS) {
if((ret = cl_scanbuff(pt, length, virname, root)) != CL_CLEAN) {
free(buffer);
return CL_VIRUS;
return ret;
}
if(bytes == SCANBUFF)
@ -204,15 +248,17 @@ int cli_scanrar(int desc, char **virname, long int *scanned, const struct cl_nod
}
lseek(fd, 0, SEEK_SET);
if((ret = cli_magic_scandesc(fd, virname, scanned, root, limits, options, reclev)) == CL_VIRUS ) {
cli_dbgmsg("RAR -> Found %s virus.\n", *virname);
if((ret = cli_magic_scandesc(fd, virname, scanned, root, limits, options, reclev)) == CL_CLEAN ) {
if(ret == CL_VIRUS)
cli_dbgmsg("RAR -> Found %s virus.\n", *virname);
fclose(tmp);
urarlib_freelist(rarlist);
#ifdef CL_THREAD_SAFE
pthread_mutex_unlock(&cli_scanrar_mutex);
cli_scanrar_inuse = 0;
#endif
return CL_VIRUS;
return ret;
}
} else {
@ -699,6 +745,7 @@ int cli_magic_scandesc(int desc, char **virname, long int *scanned, const struct
char magic[MAGIC_BUFFER_SIZE+1];
int ret = CL_CLEAN;
int bread = 0;
cl_file_t type;
if(!root) {
@ -728,54 +775,49 @@ int cli_magic_scandesc(int desc, char **virname, long int *scanned, const struct
(*reclev)--;
return ret;
}
#ifdef CL_THREAD_SAFE
/* this check protects against recursive deadlock */
if(!DISABLE_RAR && SCAN_ARCHIVE && !cli_scanrar_inuse && !strncmp(magic, RAR_MAGIC_STR, strlen(RAR_MAGIC_STR))) {
cli_dbgmsg("Recognized rar file.\n");
ret = cli_scanrar(desc, virname, scanned, root, limits, options, reclev);
}
#else
if(!DISABLE_RAR && SCAN_ARCHIVE && !strncmp(magic, RAR_MAGIC_STR, strlen(RAR_MAGIC_STR))) {
cli_dbgmsg("Recognized rar file.\n");
ret = cli_scanrar(desc, virname, scanned, root, limits, options, reclev);
}
#endif
#ifdef HAVE_ZLIB_H
else if(SCAN_ARCHIVE && !strncmp(magic, ZIP_MAGIC_STR, strlen(ZIP_MAGIC_STR))) {
cli_dbgmsg("Recognized zip file.\n");
ret = cli_scanzip(desc, virname, scanned, root, limits, options, reclev);
} else if(SCAN_ARCHIVE && !strncmp(magic, GZIP_MAGIC_STR, strlen(GZIP_MAGIC_STR))) {
cli_dbgmsg("Recognized gzip file.\n");
ret = cli_scangzip(desc, virname, scanned, root, limits, options, reclev);
}
#endif
type = cl_filetype(magic, bread);
switch(type) {
case CL_RARFILE:
if(!DISABLE_RAR && SCAN_ARCHIVE && !cli_scanrar_inuse) {
ret = cli_scanrar(desc, virname, scanned, root, limits, options, reclev);
}
break;
case CL_ZIPFILE:
if(SCAN_ARCHIVE) {
ret = cli_scanzip(desc, virname, scanned, root, limits, options, reclev);
}
break;
case CL_GZFILE:
if(SCAN_ARCHIVE) {
ret = cli_scangzip(desc, virname, scanned, root, limits, options, reclev);
}
break;
#ifdef HAVE_BZLIB_H
else if(SCAN_ARCHIVE && !strncmp(magic, BZIP_MAGIC_STR, strlen(BZIP_MAGIC_STR))) {
cli_dbgmsg("Recognized bzip file.\n");
ret = cli_scanbzip(desc, virname, scanned, root, limits, options, reclev);
}
case CL_BZFILE:
if(SCAN_ARCHIVE) {
ret = cli_scanbzip(desc, virname, scanned, root, limits, options, reclev);
}
break;
#endif
else if(SCAN_OLE2 && !strncmp(magic, OLE2_MAGIC_STR, 8)) {
cli_dbgmsg("Recognized OLE2 file.\n");
ret = cli_scanole2(desc, virname, scanned, root, limits, options, reclev);
}
else if(SCAN_MAIL && !strncmp(magic, MAIL_MAGIC_STR, strlen(MAIL_MAGIC_STR))) {
cli_dbgmsg("Recognized mail file.\n");
ret = cli_scanmail(desc, virname, scanned, root, limits, options, reclev);
}
else if(SCAN_MAIL && !strncmp(magic, RAWMAIL_MAGIC_STR, strlen(RAWMAIL_MAGIC_STR))) {
cli_dbgmsg("Recognized raw mail file.\n");
ret = cli_scanmail(desc, virname, scanned, root, limits, options, reclev);
} else if(SCAN_MAIL && !strncasecmp(magic, MAILDIR_MAGIC_STR, strlen(MAILDIR_MAGIC_STR))) {
cli_dbgmsg("Recognized Maildir mail file.\n");
ret = cli_scanmail(desc, virname, scanned, root, limits, options, reclev);
} else if(SCAN_MAIL && !strncmp(magic, DELIVERED_MAGIC_STR, strlen(DELIVERED_MAGIC_STR))) {
cli_dbgmsg("Recognized (Delivered-To) mail file.\n");
ret = cli_scanmail(desc, virname, scanned, root, limits, options, reclev);
} else if(SCAN_MAIL && !strncmp(magic, XUIDL_MAGIC_STR, strlen(XUIDL_MAGIC_STR))) {
cli_dbgmsg("Recognized (X-UIDL) mail file.\n");
ret = cli_scanmail(desc, virname, scanned, root, limits, options, reclev);
case CL_MAILFILE:
if (SCAN_MAIL) {
ret = cli_scanmail(desc, virname, scanned, root, limits, options, reclev);
}
break;
case CL_OLE2FILE:
if(SCAN_OLE2) {
ret = cli_scanole2(desc, virname, scanned, root, limits, options, reclev);
}
break;
}
(*reclev)--;
}

@ -16,6 +16,10 @@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
#if HAVE_CONFIG_H
#include "clamav-config.h"
#endif
#include <stdio.h>
#include <stdlib.h>
#include <string.h>

@ -16,6 +16,10 @@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
#if HAVE_CONFIG_H
#include "clamav-config.h"
#endif
#include <stdlib.h>
#if C_DARWIN
#include <sys/types.h>

@ -63,6 +63,10 @@
************************************************************************** */
/* -- include files ------------------------------------------------------- */
#if HAVE_CONFIG_H
#include "clamav-config.h"
#endif
#include "unrarlib.h" /* include global configuration */
#include "others.h"
/* ------------------------------------------------------------------------ */

@ -80,7 +80,7 @@ extern "C"
/* ------------------------------------------------------------------------ */
/* detected by clamav/configure */
#ifndef WORDS_LITTLEENDIAN
#if WORDS_LITTLEENDIAN
#define NON_INTEL_BYTE_ORDER
#endif

@ -32,4 +32,7 @@ typedef struct vba_project_tag {
char *dir;
} vba_project_t;
vba_project_t *vba56_dir_read(const char *dir);
unsigned char *vba_decompress(int fd, uint32_t offset);
#endif

@ -18,6 +18,10 @@
write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA. */
#if HAVE_CONFIG_H
#include "clamav-config.h"
#endif
#ifndef C_DARWIN
#include <ctype.h>

@ -10,6 +10,10 @@
* that can be found in COPYING.ZZIP
*/
#if HAVE_CONFIG_H
#include "clamav-config.h"
#endif
#include <zzip.h> /* exported... */
#include <zzip-file.h>
#include <stddef.h> /*offsetof*/

@ -11,6 +11,10 @@
* that can be found in COPYING.ZZIP
*/
#if HAVE_CONFIG_H
#include "clamav-config.h"
#endif
#include <zzip.h> /* exported... */
#include <zlib.h>

@ -11,6 +11,10 @@
* that can be found in COPYING.ZZIP
*/
#if HAVE_CONFIG_H
#include "clamav-config.h"
#endif
#include <zzip.h> /* exported...*/
#include <zzip-file.h>

@ -10,6 +10,10 @@
* that can be found in COPYING.ZZIP
*/
#if HAVE_CONFIG_H
#include "clamav-config.h"
#endif
#include <zzip.h> /* exported... */
#include <zzip-file.h>
#include <zzipformat.h>

@ -11,6 +11,10 @@
* that can be found in COPYING.ZZIP
*/
#if HAVE_CONFIG_H
#include "clamav-config.h"
#endif
#include <zzip.h>
#include <zzip-io.h>

@ -17,6 +17,10 @@
* of
*/
#if HAVE_CONFIG_H
#include "clamav-config.h"
#endif
#include <zzip.h> /* exported...*/
#include <string.h>

@ -11,6 +11,10 @@
* that can be found in COPYING.ZZIP
*/
#if HAVE_CONFIG_H
#include "clamav-config.h"
#endif
#include <zzip.h> /* archive handling */
#include <zzip-file.h>
#include <zzipformat.h>

@ -130,6 +130,7 @@ DEFS = @DEFS@
LIBS = -L../libclamav -lclamav @FRESHCLAM_LIBS@
subdir = sigtool
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = $(top_builddir)/clamav-config.h
CONFIG_CLEAN_FILES =
bin_PROGRAMS = sigtool$(EXEEXT)
PROGRAMS = $(bin_PROGRAMS)
@ -138,7 +139,7 @@ am_sigtool_OBJECTS = options.$(OBJEXT) sigtool.$(OBJEXT)
sigtool_OBJECTS = $(am_sigtool_OBJECTS)
sigtool_DEPENDENCIES = ../clamscan/getopt.o ../clamscan/others.o
sigtool_LDFLAGS =
DEFAULT_INCLUDES = -I. -I$(srcdir)
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
CPPFLAGS = @CPPFLAGS@
LDFLAGS = @LDFLAGS@
depcomp = $(SHELL) $(top_srcdir)/depcomp

@ -16,6 +16,10 @@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
#if HAVE_CONFIG_H
#include "clamav-config.h"
#endif
#include <stdio.h>
#include <stdlib.h>
#include <string.h>

@ -1,5 +1,5 @@
/*
* Copyright (C) 2002, 2003 Tomasz Kojm <zolw@konarski.edu.pl>
* Copyright (C) 2002 - 2004 Tomasz Kojm <tkojm@clamav.net>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@ -18,6 +18,11 @@
/* some things may need to be tuned here (look at jmp variables) */
#if HAVE_CONFIG_H
#include "clamav-config.h"
#endif
#include <stdio.h>
#include <stdlib.h>
#include <string.h>

Loading…
Cancel
Save