@@ -1,3 +1,7 @@

+Tue Nov 18 18:40:32 CET 2008 (acab)

+-----------------------------------

+ * configure: enable mempool by default (where available)

+

 Tue Nov 18 14:06:04 EET 2008 (edwin)

 ------------------------------------

  * libclamav/libclamav.map, libclamav/mpool.c: remove nonexistent

@@ -317,7 +317,7 @@ DISTCLEANFILES = target.h

 @DISTCHECK_ENABLE_FLAGS_TRUE@	-Waggregate-return \

 @DISTCHECK_ENABLE_FLAGS_TRUE@	-Wmissing-format-attribute \

 @DISTCHECK_ENABLE_FLAGS_TRUE@	-Wno-error=missing-format-attribute \

-@DISTCHECK_ENABLE_FLAGS_TRUE@	-Wpadded -Wno-error=type-limits \

+@DISTCHECK_ENABLE_FLAGS_TRUE@	-Wno-error=type-limits \

 @DISTCHECK_ENABLE_FLAGS_TRUE@	-Wno-error=unused-value \

 @DISTCHECK_ENABLE_FLAGS_TRUE@	-Wno-error=unused-variable \

 @DISTCHECK_ENABLE_FLAGS_TRUE@	-Wcast-qual -Wno-error=cast-qual \

@@ -333,7 +333,6 @@ DISTCLEANFILES = target.h

 @DISTCHECK_ENABLE_FLAGS_TRUE@	-D_FORTIFY_SOURCE=2 \

 @DISTCHECK_ENABLE_FLAGS_TRUE@	-fstack-protector-all \

 @DISTCHECK_ENABLE_FLAGS_TRUE@	-Wstack-protector \

-@DISTCHECK_ENABLE_FLAGS_TRUE@	-Wno-error=padded \

 @DISTCHECK_ENABLE_FLAGS_TRUE@	-Wno-error=aggregate-return"

 all: clamav-config.h

 	$(MAKE) $(AM_MAKEFLAGS) all-recursive

@@ -1539,7 +1539,7 @@ Optional Features:

   --enable-ltdl-install   install libltdl

   --disable-gcc-vcheck	  do not check for buggy gcc version

   --enable-experimental	enable experimental code

-  --enable-mempool	enable memory pools

+  --disable-mempool       disable memory pools

   --enable-check           Enable 'check' unit tests (default=auto)

   --disable-rpath         do not hardcode runtime library paths

   --enable-coverage       turn on test coverage [default=no]

@@ -16078,13 +16078,13 @@ fi

 if test "${enable_mempool+set}" = set; then

   enableval=$enable_mempool; enable_mempool=$enableval

 else

-  enable_mempool="no"

+  enable_mempool="yes"

 fi

 if test "$enable_mempool" = "yes"; then

 	if test "$ac_cv_c_mmap_private" != "yes"; then

-		{ echo "$as_me:$LINENO: WARNING: ****** mempool support disabled (mmap not available or not usable)" >&5

-echo "$as_me: WARNING: ****** mempool support disabled (mmap not available or not usable)" >&2;}

+		{ echo "$as_me:$LINENO: ****** mempool support disabled (mmap not available or not usable)" >&5

+echo "$as_me: ****** mempool support disabled (mmap not available or not usable)" >&6;}

 	else

 		{ echo "$as_me:$LINENO: checking for getpagesize" >&5

 echo $ECHO_N "checking for getpagesize... $ECHO_C" >&6; }

@@ -16277,8 +16277,8 @@ _ACEOF

 	fi

 			if test "$ac_cv_c_mmap_anonymous" = "no"; then

-				{ echo "$as_me:$LINENO: WARNING: ****** mempool support disabled (anonymous mmap not available)" >&5

-echo "$as_me: WARNING: ****** mempool support disabled (anonymous mmap not available)" >&2;}

+				{ echo "$as_me:$LINENO: ****** mempool support disabled (anonymous mmap not available)" >&5

+echo "$as_me: ****** mempool support disabled (anonymous mmap not available)" >&6;}

 			else

 cat >>confdefs.h <<\_ACEOF

@@ -16288,8 +16288,8 @@ _ACEOF

 			fi

 else

-  { echo "$as_me:$LINENO: WARNING: ****** mempool support disabled (getpagesize not available)" >&5

-echo "$as_me: WARNING: ****** mempool support disabled (getpagesize not available)" >&2;}

+  { echo "$as_me:$LINENO: ****** mempool support disabled (getpagesize not available)" >&5

+echo "$as_me: ****** mempool support disabled (getpagesize not available)" >&6;}

 fi

 	fi

@@ -421,19 +421,19 @@ AC_CHECK_FUNCS([poll setsid memcpy snprintf vsnprintf strerror_r strlcpy strlcat

 AC_C_FUNC_MMAP_PRIVATE

 AC_FUNC_FSEEKO

-AC_ARG_ENABLE([mempool],[  --enable-mempool	enable memory pools], enable_mempool=$enableval, enable_mempool="no")

+AC_ARG_ENABLE([mempool],[  --disable-mempool       disable memory pools], enable_mempool=$enableval, enable_mempool="yes")

 if test "$enable_mempool" = "yes"; then

 	if test "$ac_cv_c_mmap_private" != "yes"; then

-		AC_MSG_WARN([****** mempool support disabled (mmap not available or not usable)])

+		AC_MSG_NOTICE([****** mempool support disabled (mmap not available or not usable)])

 	else

 		AC_CHECK_FUNC([getpagesize], [

 			AC_C_FUNC_MMAP_ANONYMOUS

 			if test "$ac_cv_c_mmap_anonymous" = "no"; then

-				AC_MSG_WARN([****** mempool support disabled (anonymous mmap not available)])

+				AC_MSG_NOTICE([****** mempool support disabled (anonymous mmap not available)])

 			else

 				AC_DEFINE([USE_MPOOL],1,[enable memory pools])

 			fi

-		], [AC_MSG_WARN([****** mempool support disabled (getpagesize not available)])])

+		], [AC_MSG_NOTICE([****** mempool support disabled (getpagesize not available)])])

 	fi

 fi