git-svn-id: file:///var/lib/svn/clamav-devel/trunk/clamav-devel@1338 77e5149b-7576-45b1-b177-96237e5ba77b
Tomasz Kojm authored on 2005/02/14 08:01:51... | ... |
@@ -1,3 +1,12 @@ |
1 |
+Sun Feb 13 23:55:45 CET 2005 (tk) |
|
2 |
+--------------------------------- |
|
3 |
+ * clamd: change default value of StreamMaxPort to 2048 |
|
4 |
+ |
|
5 |
+Sun Feb 13 23:53:18 CET 2005 (tk) |
|
6 |
+--------------------------------- |
|
7 |
+ * configure: --enable-maintainer-mode (patch by Stephen Gran |
|
8 |
+ <steve*lobefin.net>) |
|
9 |
+ |
|
1 | 10 |
Sun Feb 13 23:17:16 CET 2005 (tk) |
2 | 11 |
--------------------------------- |
3 | 12 |
* libclamav/untar.c: do not try to continue if there's no space on device |
... | ... |
@@ -151,6 +151,9 @@ LIBS = @LIBS@ |
151 | 151 |
LIBTOOL = @LIBTOOL@ |
152 | 152 |
LN_S = @LN_S@ |
153 | 153 |
LTLIBOBJS = @LTLIBOBJS@ |
154 |
+MAINT = @MAINT@ |
|
155 |
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ |
|
156 |
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ |
|
154 | 157 |
MAKEINFO = @MAKEINFO@ |
155 | 158 |
OBJEXT = @OBJEXT@ |
156 | 159 |
PACKAGE = @PACKAGE@ |
... | ... |
@@ -218,7 +221,7 @@ all: clamav-config.h |
218 | 218 |
.SUFFIXES: |
219 | 219 |
am--refresh: |
220 | 220 |
@: |
221 |
-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) |
|
221 |
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) |
|
222 | 222 |
@for dep in $?; do \ |
223 | 223 |
case '$(am__configure_deps)' in \ |
224 | 224 |
*$$dep*) \ |
... | ... |
@@ -245,9 +248,9 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status |
245 | 245 |
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) |
246 | 246 |
$(SHELL) ./config.status --recheck |
247 | 247 |
|
248 |
-$(top_srcdir)/configure: $(am__configure_deps) |
|
248 |
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) |
|
249 | 249 |
cd $(srcdir) && $(AUTOCONF) |
250 |
-$(ACLOCAL_M4): $(am__aclocal_m4_deps) |
|
250 |
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) |
|
251 | 251 |
cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) |
252 | 252 |
|
253 | 253 |
clamav-config.h: stamp-h1 |
... | ... |
@@ -259,7 +262,7 @@ clamav-config.h: stamp-h1 |
259 | 259 |
stamp-h1: $(srcdir)/clamav-config.h.in $(top_builddir)/config.status |
260 | 260 |
@rm -f stamp-h1 |
261 | 261 |
cd $(top_builddir) && $(SHELL) ./config.status clamav-config.h |
262 |
-$(srcdir)/clamav-config.h.in: $(am__configure_deps) |
|
262 |
+$(srcdir)/clamav-config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) |
|
263 | 263 |
cd $(top_srcdir) && $(AUTOHEADER) |
264 | 264 |
rm -f stamp-h1 |
265 | 265 |
touch $@ |
... | ... |
@@ -68,7 +68,7 @@ dnl there is now a CREATE_PREFIX_TARGET_H in this file as a shorthand for |
68 | 68 |
dnl PREFIX_CONFIG_H from a target.h file, however w/o the target.h ever created |
69 | 69 |
dnl (the prefix is a bit different, since we add an extra -target- and -host-) |
70 | 70 |
dnl |
71 |
-dnl @version: $Id: acinclude.m4,v 1.6 2005/01/08 02:58:06 kojm Exp $ |
|
71 |
+dnl @version: $Id: acinclude.m4,v 1.7 2005/02/13 23:01:48 kojm Exp $ |
|
72 | 72 |
dnl @author Guido Draheim <guidod@gmx.de> STATUS: used often |
73 | 73 |
|
74 | 74 |
AC_DEFUN([AC_CREATE_TARGET_H], |
... | ... |
@@ -4135,7 +4135,7 @@ dnl AC_COMPILE_CHECK_SIZEOF(ptrdiff_t, $headers) |
4135 | 4135 |
dnl AC_COMPILE_CHECK_SIZEOF(off_t, $headers) |
4136 | 4136 |
dnl |
4137 | 4137 |
dnl @author Kaveh Ghazi <ghazi@caip.rutgers.edu> |
4138 |
-dnl @version $Id: acinclude.m4,v 1.6 2005/01/08 02:58:06 kojm Exp $ |
|
4138 |
+dnl @version $Id: acinclude.m4,v 1.7 2005/02/13 23:01:48 kojm Exp $ |
|
4139 | 4139 |
dnl |
4140 | 4140 |
AC_DEFUN([AC_COMPILE_CHECK_SIZEOF], |
4141 | 4141 |
[changequote(<<, >>)dnl |
... | ... |
@@ -4162,4 +4162,22 @@ AC_DEFINE_UNQUOTED(AC_TYPE_NAME, $AC_CV_NAME, [The number of bytes in type $1]) |
4162 | 4162 |
undefine([AC_TYPE_NAME])dnl |
4163 | 4163 |
undefine([AC_CV_NAME])dnl |
4164 | 4164 |
]) |
4165 |
- |
|
4165 |
+dnl Add --enable-maintainer-mode option to configure. |
|
4166 |
+dnl From Jim Meyering |
|
4167 |
+ |
|
4168 |
+dnl serial 1 |
|
4169 |
+ |
|
4170 |
+AC_DEFUN([AM_MAINTAINER_MODE], |
|
4171 |
+[AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles]) |
|
4172 |
+ dnl maintainer-mode is disabled by default |
|
4173 |
+ AC_ARG_ENABLE(maintainer-mode, |
|
4174 |
+[ --enable-maintainer-mode enable make rules and dependencies not useful |
|
4175 |
+ (and sometimes confusing) to the casual installer], |
|
4176 |
+ USE_MAINTAINER_MODE=$enableval, |
|
4177 |
+ USE_MAINTAINER_MODE=no) |
|
4178 |
+ AC_MSG_RESULT($USE_MAINTAINER_MODE) |
|
4179 |
+ AM_CONDITIONAL(MAINTAINER_MODE, test $USE_MAINTAINER_MODE = yes) |
|
4180 |
+ MAINT=$MAINTAINER_MODE_TRUE |
|
4181 |
+ AC_SUBST(MAINT)dnl |
|
4182 |
+] |
|
4183 |
+) |
... | ... |
@@ -151,6 +151,9 @@ LIBS = $(top_builddir)/libclamav/libclamav.la @CLAMAV_MILTER_LIBS@ |
151 | 151 |
LIBTOOL = @LIBTOOL@ |
152 | 152 |
LN_S = @LN_S@ |
153 | 153 |
LTLIBOBJS = @LTLIBOBJS@ |
154 |
+MAINT = @MAINT@ |
|
155 |
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ |
|
156 |
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ |
|
154 | 157 |
MAKEINFO = @MAKEINFO@ |
155 | 158 |
OBJEXT = @OBJEXT@ |
156 | 159 |
PACKAGE = @PACKAGE@ |
... | ... |
@@ -224,7 +227,7 @@ all: all-am |
224 | 224 |
|
225 | 225 |
.SUFFIXES: |
226 | 226 |
.SUFFIXES: .c .lo .o .obj |
227 |
-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) |
|
227 |
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) |
|
228 | 228 |
@for dep in $?; do \ |
229 | 229 |
case '$(am__configure_deps)' in \ |
230 | 230 |
*$$dep*) \ |
... | ... |
@@ -249,9 +252,9 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status |
249 | 249 |
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) |
250 | 250 |
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh |
251 | 251 |
|
252 |
-$(top_srcdir)/configure: $(am__configure_deps) |
|
252 |
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) |
|
253 | 253 |
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh |
254 |
-$(ACLOCAL_M4): $(am__aclocal_m4_deps) |
|
254 |
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) |
|
255 | 255 |
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh |
256 | 256 |
install-sbinPROGRAMS: $(sbin_PROGRAMS) |
257 | 257 |
@$(NORMAL_INSTALL) |
... | ... |
@@ -165,6 +165,9 @@ LIBS = $(top_builddir)/libclamav/libclamav.la @CLAMD_LIBS@ @ADDITIONAL_LIBS@ |
165 | 165 |
LIBTOOL = @LIBTOOL@ |
166 | 166 |
LN_S = @LN_S@ |
167 | 167 |
LTLIBOBJS = @LTLIBOBJS@ |
168 |
+MAINT = @MAINT@ |
|
169 |
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ |
|
170 |
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ |
|
168 | 171 |
MAKEINFO = @MAKEINFO@ |
169 | 172 |
OBJEXT = @OBJEXT@ |
170 | 173 |
PACKAGE = @PACKAGE@ |
... | ... |
@@ -265,7 +268,7 @@ all: all-am |
265 | 265 |
|
266 | 266 |
.SUFFIXES: |
267 | 267 |
.SUFFIXES: .c .lo .o .obj |
268 |
-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) |
|
268 |
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) |
|
269 | 269 |
@for dep in $?; do \ |
270 | 270 |
case '$(am__configure_deps)' in \ |
271 | 271 |
*$$dep*) \ |
... | ... |
@@ -290,9 +293,9 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status |
290 | 290 |
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) |
291 | 291 |
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh |
292 | 292 |
|
293 |
-$(top_srcdir)/configure: $(am__configure_deps) |
|
293 |
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) |
|
294 | 294 |
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh |
295 |
-$(ACLOCAL_M4): $(am__aclocal_m4_deps) |
|
295 |
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) |
|
296 | 296 |
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh |
297 | 297 |
install-sbinPROGRAMS: $(sbin_PROGRAMS) |
298 | 298 |
@$(NORMAL_INSTALL) |
... | ... |
@@ -151,6 +151,9 @@ LIBS = $(top_builddir)/libclamav/libclamav.la @FRESHCLAM_LIBS@ @ADDITIONAL_LIBS@ |
151 | 151 |
LIBTOOL = @LIBTOOL@ |
152 | 152 |
LN_S = @LN_S@ |
153 | 153 |
LTLIBOBJS = @LTLIBOBJS@ |
154 |
+MAINT = @MAINT@ |
|
155 |
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ |
|
156 |
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ |
|
154 | 157 |
MAKEINFO = @MAKEINFO@ |
155 | 158 |
OBJEXT = @OBJEXT@ |
156 | 159 |
PACKAGE = @PACKAGE@ |
... | ... |
@@ -227,7 +230,7 @@ all: all-am |
227 | 227 |
|
228 | 228 |
.SUFFIXES: |
229 | 229 |
.SUFFIXES: .c .lo .o .obj |
230 |
-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) |
|
230 |
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) |
|
231 | 231 |
@for dep in $?; do \ |
232 | 232 |
case '$(am__configure_deps)' in \ |
233 | 233 |
*$$dep*) \ |
... | ... |
@@ -252,9 +255,9 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status |
252 | 252 |
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) |
253 | 253 |
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh |
254 | 254 |
|
255 |
-$(top_srcdir)/configure: $(am__configure_deps) |
|
255 |
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) |
|
256 | 256 |
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh |
257 |
-$(ACLOCAL_M4): $(am__aclocal_m4_deps) |
|
257 |
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) |
|
258 | 258 |
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh |
259 | 259 |
install-binPROGRAMS: $(bin_PROGRAMS) |
260 | 260 |
@$(NORMAL_INSTALL) |
... | ... |
@@ -146,6 +146,9 @@ LIBS = $(top_builddir)/libclamav/libclamav.la @ADDITIONAL_LIBS@ |
146 | 146 |
LIBTOOL = @LIBTOOL@ |
147 | 147 |
LN_S = @LN_S@ |
148 | 148 |
LTLIBOBJS = @LTLIBOBJS@ |
149 |
+MAINT = @MAINT@ |
|
150 |
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ |
|
151 |
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ |
|
149 | 152 |
MAKEINFO = @MAKEINFO@ |
150 | 153 |
OBJEXT = @OBJEXT@ |
151 | 154 |
PACKAGE = @PACKAGE@ |
... | ... |
@@ -230,7 +233,7 @@ all: all-am |
230 | 230 |
|
231 | 231 |
.SUFFIXES: |
232 | 232 |
.SUFFIXES: .c .lo .o .obj |
233 |
-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) |
|
233 |
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) |
|
234 | 234 |
@for dep in $?; do \ |
235 | 235 |
case '$(am__configure_deps)' in \ |
236 | 236 |
*$$dep*) \ |
... | ... |
@@ -255,9 +258,9 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status |
255 | 255 |
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) |
256 | 256 |
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh |
257 | 257 |
|
258 |
-$(top_srcdir)/configure: $(am__configure_deps) |
|
258 |
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) |
|
259 | 259 |
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh |
260 |
-$(ACLOCAL_M4): $(am__aclocal_m4_deps) |
|
260 |
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) |
|
261 | 261 |
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh |
262 | 262 |
install-binPROGRAMS: $(bin_PROGRAMS) |
263 | 263 |
@$(NORMAL_INSTALL) |
... | ... |
@@ -468,7 +468,7 @@ ac_includes_default="\ |
468 | 468 |
# include <unistd.h> |
469 | 469 |
#endif" |
470 | 470 |
|
471 |
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot LIBCLAMAV_VERSION CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE LN_S ECHO EGREP RANLIB ac_ct_RANLIB CPP LIBTOOL DBDIR CFGDIR LIBCLAMAV_LIBS CLAMD_LIBS CLAMAV_MILTER_LIBS FRESHCLAM_LIBS TH_SAFE ADDITIONAL_LIBS BUILD_CLAMD_TRUE BUILD_CLAMD_FALSE HAVE_MILTER_TRUE HAVE_MILTER_FALSE SENDMAIL GETENT CLAMAVUSER CLAMAVGROUP LIBOBJS LTLIBOBJS' |
|
471 |
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot LIBCLAMAV_VERSION CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE LN_S ECHO EGREP RANLIB ac_ct_RANLIB CPP LIBTOOL MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT DBDIR CFGDIR LIBCLAMAV_LIBS CLAMD_LIBS CLAMAV_MILTER_LIBS FRESHCLAM_LIBS TH_SAFE ADDITIONAL_LIBS BUILD_CLAMD_TRUE BUILD_CLAMD_FALSE HAVE_MILTER_TRUE HAVE_MILTER_FALSE SENDMAIL GETENT CLAMAVUSER CLAMAVGROUP LIBOBJS LTLIBOBJS' |
|
472 | 472 |
ac_subst_files='' |
473 | 473 |
|
474 | 474 |
# Initialize some variables set by options. |
... | ... |
@@ -1015,6 +1015,8 @@ Optional Features: |
1015 | 1015 |
--enable-static=PKGS build static libraries default=yes |
1016 | 1016 |
--enable-fast-install=PKGS optimize for fast installation default=yes |
1017 | 1017 |
--disable-libtool-lock avoid locking (might break parallel builds) |
1018 |
+ --enable-maintainer-mode enable make rules and dependencies not useful |
|
1019 |
+ (and sometimes confusing) to the casual installer |
|
1018 | 1020 |
--disable-zlib-vcheck do not check for buggy zlib version |
1019 | 1021 |
--disable-bzip2 disable bzip2 support |
1020 | 1022 |
--disable-dns disable support for database verification through |
... | ... |
@@ -2192,7 +2194,7 @@ INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s" |
2192 | 2192 |
|
2193 | 2193 |
|
2194 | 2194 |
LC_CURRENT=1 |
2195 |
-LC_REVISION=7 |
|
2195 |
+LC_REVISION=8 |
|
2196 | 2196 |
LC_AGE=0 |
2197 | 2197 |
LIBCLAMAV_VERSION="$LC_CURRENT":"$LC_REVISION":"$LC_AGE" |
2198 | 2198 |
|
... | ... |
@@ -5021,7 +5023,7 @@ test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes |
5021 | 5021 |
case $host in |
5022 | 5022 |
*-*-irix6*) |
5023 | 5023 |
# Find out which ABI we are using. |
5024 |
- echo '#line 5024 "configure"' > conftest.$ac_ext |
|
5024 |
+ echo '#line 5026 "configure"' > conftest.$ac_ext |
|
5025 | 5025 |
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 |
5026 | 5026 |
(eval $ac_compile) 2>&5 |
5027 | 5027 |
ac_status=$? |
... | ... |
@@ -5612,7 +5614,7 @@ chmod -w . |
5612 | 5612 |
save_CFLAGS="$CFLAGS" |
5613 | 5613 |
CFLAGS="$CFLAGS -o out/conftest2.$ac_objext" |
5614 | 5614 |
compiler_c_o=no |
5615 |
-if { (eval echo configure:5615: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then |
|
5615 |
+if { (eval echo configure:5617: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then |
|
5616 | 5616 |
# The compiler can only warn and ignore the option if not recognized |
5617 | 5617 |
# So say no if there are warnings |
5618 | 5618 |
if test -s out/conftest.err; then |
... | ... |
@@ -7546,7 +7548,7 @@ else |
7546 | 7546 |
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 |
7547 | 7547 |
lt_status=$lt_dlunknown |
7548 | 7548 |
cat > conftest.$ac_ext <<EOF |
7549 |
-#line 7549 "configure" |
|
7549 |
+#line 7551 "configure" |
|
7550 | 7550 |
#include "confdefs.h" |
7551 | 7551 |
|
7552 | 7552 |
#if HAVE_DLFCN_H |
... | ... |
@@ -7644,7 +7646,7 @@ else |
7644 | 7644 |
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 |
7645 | 7645 |
lt_status=$lt_dlunknown |
7646 | 7646 |
cat > conftest.$ac_ext <<EOF |
7647 |
-#line 7647 "configure" |
|
7647 |
+#line 7649 "configure" |
|
7648 | 7648 |
#include "confdefs.h" |
7649 | 7649 |
|
7650 | 7650 |
#if HAVE_DLFCN_H |
... | ... |
@@ -10262,6 +10264,30 @@ fi |
10262 | 10262 |
|
10263 | 10263 |
|
10264 | 10264 |
|
10265 |
+echo "$as_me:$LINENO: checking whether to enable maintainer-specific portions of Makefiles" >&5 |
|
10266 |
+echo $ECHO_N "checking whether to enable maintainer-specific portions of Makefiles... $ECHO_C" >&6 |
|
10267 |
+ # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given. |
|
10268 |
+if test "${enable_maintainer_mode+set}" = set; then |
|
10269 |
+ enableval="$enable_maintainer_mode" |
|
10270 |
+ USE_MAINTAINER_MODE=$enableval |
|
10271 |
+else |
|
10272 |
+ USE_MAINTAINER_MODE=no |
|
10273 |
+fi; |
|
10274 |
+ echo "$as_me:$LINENO: result: $USE_MAINTAINER_MODE" >&5 |
|
10275 |
+echo "${ECHO_T}$USE_MAINTAINER_MODE" >&6 |
|
10276 |
+ |
|
10277 |
+ |
|
10278 |
+if test $USE_MAINTAINER_MODE = yes; then |
|
10279 |
+ MAINTAINER_MODE_TRUE= |
|
10280 |
+ MAINTAINER_MODE_FALSE='#' |
|
10281 |
+else |
|
10282 |
+ MAINTAINER_MODE_TRUE='#' |
|
10283 |
+ MAINTAINER_MODE_FALSE= |
|
10284 |
+fi |
|
10285 |
+ |
|
10286 |
+ MAINT=$MAINTAINER_MODE_TRUE |
|
10287 |
+ |
|
10288 |
+ |
|
10265 | 10289 |
echo "$as_me:$LINENO: checking for zlib installation" >&5 |
10266 | 10290 |
echo $ECHO_N "checking for zlib installation... $ECHO_C" >&6 |
10267 | 10291 |
|
... | ... |
@@ -14209,6 +14235,13 @@ echo "$as_me: error: conditional \"am__fastdepCC\" was never defined. |
14209 | 14209 |
Usually this means the macro was only invoked conditionally." >&2;} |
14210 | 14210 |
{ (exit 1); exit 1; }; } |
14211 | 14211 |
fi |
14212 |
+if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then |
|
14213 |
+ { { echo "$as_me:$LINENO: error: conditional \"MAINTAINER_MODE\" was never defined. |
|
14214 |
+Usually this means the macro was only invoked conditionally." >&5 |
|
14215 |
+echo "$as_me: error: conditional \"MAINTAINER_MODE\" was never defined. |
|
14216 |
+Usually this means the macro was only invoked conditionally." >&2;} |
|
14217 |
+ { (exit 1); exit 1; }; } |
|
14218 |
+fi |
|
14212 | 14219 |
if test -z "${BUILD_CLAMD_TRUE}" && test -z "${BUILD_CLAMD_FALSE}"; then |
14213 | 14220 |
{ { echo "$as_me:$LINENO: error: conditional \"BUILD_CLAMD\" was never defined. |
14214 | 14221 |
Usually this means the macro was only invoked conditionally." >&5 |
... | ... |
@@ -14827,6 +14860,9 @@ s,@RANLIB@,$RANLIB,;t t |
14827 | 14827 |
s,@ac_ct_RANLIB@,$ac_ct_RANLIB,;t t |
14828 | 14828 |
s,@CPP@,$CPP,;t t |
14829 | 14829 |
s,@LIBTOOL@,$LIBTOOL,;t t |
14830 |
+s,@MAINTAINER_MODE_TRUE@,$MAINTAINER_MODE_TRUE,;t t |
|
14831 |
+s,@MAINTAINER_MODE_FALSE@,$MAINTAINER_MODE_FALSE,;t t |
|
14832 |
+s,@MAINT@,$MAINT,;t t |
|
14830 | 14833 |
s,@DBDIR@,$DBDIR,;t t |
14831 | 14834 |
s,@CFGDIR@,$CFGDIR,;t t |
14832 | 14835 |
s,@LIBCLAMAV_LIBS@,$LIBCLAMAV_LIBS,;t t |
... | ... |
@@ -22,7 +22,7 @@ AM_INIT_AUTOMAKE(clamav, "devel-`date +%Y%m%d`") |
22 | 22 |
AM_CONFIG_HEADER(clamav-config.h) |
23 | 23 |
|
24 | 24 |
LC_CURRENT=1 |
25 |
-LC_REVISION=7 |
|
25 |
+LC_REVISION=8 |
|
26 | 26 |
LC_AGE=0 |
27 | 27 |
LIBCLAMAV_VERSION="$LC_CURRENT":"$LC_REVISION":"$LC_AGE" |
28 | 28 |
AC_SUBST(LIBCLAMAV_VERSION) |
... | ... |
@@ -74,6 +74,7 @@ fi |
74 | 74 |
have_pthreads=no |
75 | 75 |
AC_CHECK_HEADER(pthread.h,[have_pthreads=yes],) |
76 | 76 |
|
77 |
+AM_MAINTAINER_MODE |
|
77 | 78 |
dnl Check for zlib |
78 | 79 |
AC_MSG_CHECKING(for zlib installation) |
79 | 80 |
AC_ARG_WITH(zlib, |
... | ... |
@@ -115,6 +115,9 @@ LIBS = @LIBS@ |
115 | 115 |
LIBTOOL = @LIBTOOL@ |
116 | 116 |
LN_S = @LN_S@ |
117 | 117 |
LTLIBOBJS = @LTLIBOBJS@ |
118 |
+MAINT = @MAINT@ |
|
119 |
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ |
|
120 |
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ |
|
118 | 121 |
MAKEINFO = @MAKEINFO@ |
119 | 122 |
OBJEXT = @OBJEXT@ |
120 | 123 |
PACKAGE = @PACKAGE@ |
... | ... |
@@ -176,7 +179,7 @@ DBINST = @DBDIR@ |
176 | 176 |
all: all-am |
177 | 177 |
|
178 | 178 |
.SUFFIXES: |
179 |
-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) |
|
179 |
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) |
|
180 | 180 |
@for dep in $?; do \ |
181 | 181 |
case '$(am__configure_deps)' in \ |
182 | 182 |
*$$dep*) \ |
... | ... |
@@ -201,9 +204,9 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status |
201 | 201 |
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) |
202 | 202 |
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh |
203 | 203 |
|
204 |
-$(top_srcdir)/configure: $(am__configure_deps) |
|
204 |
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) |
|
205 | 205 |
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh |
206 |
-$(ACLOCAL_M4): $(am__aclocal_m4_deps) |
|
206 |
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) |
|
207 | 207 |
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh |
208 | 208 |
|
209 | 209 |
mostlyclean-libtool: |
... | ... |
@@ -119,6 +119,9 @@ LIBS = @LIBS@ |
119 | 119 |
LIBTOOL = @LIBTOOL@ |
120 | 120 |
LN_S = @LN_S@ |
121 | 121 |
LTLIBOBJS = @LTLIBOBJS@ |
122 |
+MAINT = @MAINT@ |
|
123 |
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ |
|
124 |
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ |
|
122 | 125 |
MAKEINFO = @MAKEINFO@ |
123 | 126 |
OBJEXT = @OBJEXT@ |
124 | 127 |
PACKAGE = @PACKAGE@ |
... | ... |
@@ -180,7 +183,7 @@ man_MANS = man/clamscan.1 man/freshclam.1 man/sigtool.1 man/clamd.8 man/clamd.co |
180 | 180 |
all: all-am |
181 | 181 |
|
182 | 182 |
.SUFFIXES: |
183 |
-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) |
|
183 |
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) |
|
184 | 184 |
@for dep in $?; do \ |
185 | 185 |
case '$(am__configure_deps)' in \ |
186 | 186 |
*$$dep*) \ |
... | ... |
@@ -205,9 +208,9 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status |
205 | 205 |
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) |
206 | 206 |
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh |
207 | 207 |
|
208 |
-$(top_srcdir)/configure: $(am__configure_deps) |
|
208 |
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) |
|
209 | 209 |
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh |
210 |
-$(ACLOCAL_M4): $(am__aclocal_m4_deps) |
|
210 |
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) |
|
211 | 211 |
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh |
212 | 212 |
|
213 | 213 |
mostlyclean-libtool: |
... | ... |
@@ -1,5 +1,5 @@ |
1 | 1 |
.\" Manual page created by Tomasz Kojm, 20021001. |
2 |
-.TH "clamd.conf" "5" "January 26, 2005" "Tomasz Kojm" "Clam AntiVirus" |
|
2 |
+.TH "clamd.conf" "5" "February 13, 2005" "Tomasz Kojm" "Clam AntiVirus" |
|
3 | 3 |
.SH "NAME" |
4 | 4 |
.LP |
5 | 5 |
\fBclamd.conf\fR \- Configuration file for Clam AntiVirus Daemon |
... | ... |
@@ -187,7 +187,7 @@ Default: 1024 |
187 | 187 |
\fBStreamMaxPort NUMBER\fR |
188 | 188 |
Limit data port range. |
189 | 189 |
.br |
190 |
-Default: 65535 |
|
190 |
+Default: 2048 |
|
191 | 191 |
.TP |
192 | 192 |
\fBDisableDefaultScanOptions\fR |
193 | 193 |
By default clamd uses scan options recommended by libclamav. This option disables recommended options and allows you to enable selected options. DO NOT ENABLE IT unless you know what you are doing. |
... | ... |
@@ -113,6 +113,9 @@ LIBS = @LIBS@ |
113 | 113 |
LIBTOOL = @LIBTOOL@ |
114 | 114 |
LN_S = @LN_S@ |
115 | 115 |
LTLIBOBJS = @LTLIBOBJS@ |
116 |
+MAINT = @MAINT@ |
|
117 |
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ |
|
118 |
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ |
|
116 | 119 |
MAKEINFO = @MAKEINFO@ |
117 | 120 |
OBJEXT = @OBJEXT@ |
118 | 121 |
PACKAGE = @PACKAGE@ |
... | ... |
@@ -174,7 +177,7 @@ CFGINST = @CFGDIR@ |
174 | 174 |
all: all-am |
175 | 175 |
|
176 | 176 |
.SUFFIXES: |
177 |
-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) |
|
177 |
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) |
|
178 | 178 |
@for dep in $?; do \ |
179 | 179 |
case '$(am__configure_deps)' in \ |
180 | 180 |
*$$dep*) \ |
... | ... |
@@ -199,9 +202,9 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status |
199 | 199 |
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) |
200 | 200 |
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh |
201 | 201 |
|
202 |
-$(top_srcdir)/configure: $(am__configure_deps) |
|
202 |
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) |
|
203 | 203 |
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh |
204 |
-$(ACLOCAL_M4): $(am__aclocal_m4_deps) |
|
204 |
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) |
|
205 | 205 |
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh |
206 | 206 |
|
207 | 207 |
mostlyclean-libtool: |
... | ... |
@@ -145,6 +145,9 @@ LIBS = $(top_builddir)/libclamav/libclamav.la @FRESHCLAM_LIBS@ @ADDITIONAL_LIBS@ |
145 | 145 |
LIBTOOL = @LIBTOOL@ |
146 | 146 |
LN_S = @LN_S@ |
147 | 147 |
LTLIBOBJS = @LTLIBOBJS@ |
148 |
+MAINT = @MAINT@ |
|
149 |
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ |
|
150 |
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ |
|
148 | 151 |
MAKEINFO = @MAKEINFO@ |
149 | 152 |
OBJEXT = @OBJEXT@ |
150 | 153 |
PACKAGE = @PACKAGE@ |
... | ... |
@@ -229,7 +232,7 @@ all: all-am |
229 | 229 |
|
230 | 230 |
.SUFFIXES: |
231 | 231 |
.SUFFIXES: .c .lo .o .obj |
232 |
-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) |
|
232 |
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) |
|
233 | 233 |
@for dep in $?; do \ |
234 | 234 |
case '$(am__configure_deps)' in \ |
235 | 235 |
*$$dep*) \ |
... | ... |
@@ -254,9 +257,9 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status |
254 | 254 |
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) |
255 | 255 |
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh |
256 | 256 |
|
257 |
-$(top_srcdir)/configure: $(am__configure_deps) |
|
257 |
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) |
|
258 | 258 |
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh |
259 |
-$(ACLOCAL_M4): $(am__aclocal_m4_deps) |
|
259 |
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) |
|
260 | 260 |
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh |
261 | 261 |
install-binPROGRAMS: $(bin_PROGRAMS) |
262 | 262 |
@$(NORMAL_INSTALL) |
... | ... |
@@ -172,6 +172,9 @@ LIBS = @LIBS@ |
172 | 172 |
LIBTOOL = @LIBTOOL@ |
173 | 173 |
LN_S = @LN_S@ |
174 | 174 |
LTLIBOBJS = @LTLIBOBJS@ |
175 |
+MAINT = @MAINT@ |
|
176 |
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ |
|
177 |
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ |
|
175 | 178 |
MAKEINFO = @MAKEINFO@ |
176 | 179 |
OBJEXT = @OBJEXT@ |
177 | 180 |
PACKAGE = @PACKAGE@ |
... | ... |
@@ -335,7 +338,7 @@ all: all-am |
335 | 335 |
|
336 | 336 |
.SUFFIXES: |
337 | 337 |
.SUFFIXES: .c .lo .o .obj |
338 |
-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) |
|
338 |
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) |
|
339 | 339 |
@for dep in $?; do \ |
340 | 340 |
case '$(am__configure_deps)' in \ |
341 | 341 |
*$$dep*) \ |
... | ... |
@@ -360,9 +363,9 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status |
360 | 360 |
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) |
361 | 361 |
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh |
362 | 362 |
|
363 |
-$(top_srcdir)/configure: $(am__configure_deps) |
|
363 |
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) |
|
364 | 364 |
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh |
365 |
-$(ACLOCAL_M4): $(am__aclocal_m4_deps) |
|
365 |
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) |
|
366 | 366 |
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh |
367 | 367 |
install-libLTLIBRARIES: $(lib_LTLIBRARIES) |
368 | 368 |
@$(NORMAL_INSTALL) |
... | ... |
@@ -142,6 +142,9 @@ LIBS = $(top_builddir)/libclamav/libclamav.la @FRESHCLAM_LIBS@ @ADDITIONAL_LIBS@ |
142 | 142 |
LIBTOOL = @LIBTOOL@ |
143 | 143 |
LN_S = @LN_S@ |
144 | 144 |
LTLIBOBJS = @LTLIBOBJS@ |
145 |
+MAINT = @MAINT@ |
|
146 |
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ |
|
147 |
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ |
|
145 | 148 |
MAKEINFO = @MAKEINFO@ |
146 | 149 |
OBJEXT = @OBJEXT@ |
147 | 150 |
PACKAGE = @PACKAGE@ |
... | ... |
@@ -221,7 +224,7 @@ all: all-am |
221 | 221 |
|
222 | 222 |
.SUFFIXES: |
223 | 223 |
.SUFFIXES: .c .lo .o .obj |
224 |
-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) |
|
224 |
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) |
|
225 | 225 |
@for dep in $?; do \ |
226 | 226 |
case '$(am__configure_deps)' in \ |
227 | 227 |
*$$dep*) \ |
... | ... |
@@ -246,9 +249,9 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status |
246 | 246 |
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) |
247 | 247 |
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh |
248 | 248 |
|
249 |
-$(top_srcdir)/configure: $(am__configure_deps) |
|
249 |
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) |
|
250 | 250 |
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh |
251 |
-$(ACLOCAL_M4): $(am__aclocal_m4_deps) |
|
251 |
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) |
|
252 | 252 |
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh |
253 | 253 |
install-binPROGRAMS: $(bin_PROGRAMS) |
254 | 254 |
@$(NORMAL_INSTALL) |