[Pkg-clamav-commits] [SCM] Debian repository for ClamAV branch, debian/unstable, updated. debian/0.95+dfsg-1-6156-g094ec9b
Török Edvin
edwin at clamav.net
Sun Apr 4 01:17:52 UTC 2010
The following commit has been merged in the debian/unstable branch:
commit fdb7b9e926a7be31bffc4eba3b6073c119a7ec67
Author: Török Edvin <edwin at clamav.net>
Date: Fri Jan 29 14:39:02 2010 +0200
Print feature summary after configure is finished.
diff --git a/configure b/configure
index dc1ed2d..adf0fd6 100755
--- a/configure
+++ b/configure
@@ -12520,16 +12520,19 @@ fi
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_fpu_bigendian" >&5
$as_echo "$ac_cv_c_fpu_bigendian" >&6; }
+have_autoitea06="no"
case $ac_cv_c_fpu_bigendian in
yes)
$as_echo "#define FPU_WORDS_BIGENDIAN 1" >>confdefs.h
+ have_autoitea06="yes"
;;
no)
$as_echo "#define FPU_WORDS_BIGENDIAN 0" >>confdefs.h
+ have_autoitea06="yes"
;;
*)
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to determine FPU endianess, some features may not be available in this build" >&5
@@ -13986,6 +13989,7 @@ else
enable_mempool="yes"
fi
+have_mempool="no"
if test "$enable_mempool" = "yes"; then
if test "$ac_cv_c_mmap_private" != "yes"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: ****** mempool support disabled (mmap not available or not usable)" >&5
@@ -14002,6 +14006,7 @@ $as_echo "$as_me: ****** mempool support disabled (anonymous mmap not available)
$as_echo "#define USE_MPOOL 1" >>confdefs.h
+ have_mempool="yes"
fi
fi
fi
@@ -25057,6 +25062,232 @@ $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
fi
+# Print a summary of what features we enabled
+{ $as_echo "$as_me:${as_lineno-$LINENO}: Summary of detected features follows" >&5
+$as_echo "$as_me: Summary of detected features follows" >&6;}
+
+cat <<EOF
+ OS : $target_os
+ pthreads : $have_pthreads ($THREAD_LIBS)
+EOF
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: Summary of miscellaneous features" >&5
+$as_echo "$as_me: Summary of miscellaneous features" >&6;}
+
+
+ $as_echo_n " check : "
+ if test "x$enable_check_ut" = "xno"; then :
+ $as_echo "$CHECK_LIBS (disabled)"
+elif test "x$enable_check_ut" = "xyes"; then :
+ $as_echo "$CHECK_LIBS"
+elif test "x$enable_check_ut" = "x"; then :
+ $as_echo "$CHECK_LIBS"
+else
+ $as_echo "$CHECK_LIBS ($enable_check_ut)"
+fi
+
+
+
+ $as_echo_n " clamuko : "
+ if test "x$want_clamuko" = "xno"; then :
+ $as_echo "$want_clamuko (disabled)"
+elif test "x$want_clamuko" = "xyes"; then :
+ $as_echo "$want_clamuko"
+elif test "x$want_clamuko" = "x"; then :
+ $as_echo "$want_clamuko"
+else
+ $as_echo "$want_clamuko ($want_clamuko)"
+fi
+
+if test "x$ac_cv_have_control_in_msghdr" = "xyes"; then
+
+
+ $as_echo_n " fdpassing : "
+ if test "x$want_fdpassing" = "xno"; then :
+ $as_echo "$have_fdpass (disabled)"
+elif test "x$want_fdpassing" = "xyes"; then :
+ $as_echo "$have_fdpass"
+elif test "x$want_fdpassing" = "x"; then :
+ $as_echo "$have_fdpass"
+else
+ $as_echo "$have_fdpass ($want_fdpassing)"
+fi
+
+else
+
+
+ $as_echo_n " fdpassing : "
+ if test "x" = "xno"; then :
+ $as_echo "n/a (disabled)"
+elif test "x" = "xyes"; then :
+ $as_echo "n/a"
+elif test "x" = "x"; then :
+ $as_echo "n/a"
+else
+ $as_echo "n/a ()"
+fi
+
+fi
+
+
+ $as_echo_n " IPv6 : "
+ if test "x$want_ipv6" = "xno"; then :
+ $as_echo "$have_cv_ipv6 (disabled)"
+elif test "x$want_ipv6" = "xyes"; then :
+ $as_echo "$have_cv_ipv6"
+elif test "x$want_ipv6" = "x"; then :
+ $as_echo "$have_cv_ipv6"
+else
+ $as_echo "$have_cv_ipv6 ($want_ipv6)"
+fi
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: Summary of optional tools" >&5
+$as_echo "$as_me: Summary of optional tools" >&6;}
+
+
+ $as_echo_n " clamdtop : "
+ if test "x$enable_clamdtop" = "xno"; then :
+ $as_echo "$CURSES_LIBS (disabled)"
+elif test "x$enable_clamdtop" = "xyes"; then :
+ $as_echo "$CURSES_LIBS"
+elif test "x$enable_clamdtop" = "x"; then :
+ $as_echo "$CURSES_LIBS"
+else
+ $as_echo "$CURSES_LIBS ($enable_clamdtop)"
+fi
+
+
+
+ $as_echo_n " milter : "
+ if test "x$have_milter" = "xno"; then :
+ $as_echo "yes (disabled)"
+elif test "x$have_milter" = "xyes"; then :
+ $as_echo "yes"
+elif test "x$have_milter" = "x"; then :
+ $as_echo "yes"
+else
+ $as_echo "yes ($have_milter)"
+fi
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: Summary of engine performance features)" >&5
+$as_echo "$as_me: Summary of engine performance features)" >&6;}
+if test "x$enable_debug" = "xyes"; then
+
+
+ $as_echo_n " release mode: "
+ if test "xyes" = "xno"; then :
+ $as_echo "yes (disabled)"
+elif test "xyes" = "xyes"; then :
+ $as_echo "yes"
+elif test "xyes" = "x"; then :
+ $as_echo "yes"
+else
+ $as_echo "yes (yes)"
+fi
+
+else
+
+
+ $as_echo_n " release mode: "
+ if test "xdebug build" = "xno"; then :
+ $as_echo "no (disabled)"
+elif test "xdebug build" = "xyes"; then :
+ $as_echo "no"
+elif test "xdebug build" = "x"; then :
+ $as_echo "no"
+else
+ $as_echo "no (debug build)"
+fi
+
+fi
+have_jit="yes"
+if test "$subdirfailed" = "no"; then
+ have_jit="no"
+fi
+
+
+ $as_echo_n " jit : "
+ if test "x$enable_llvm" = "xno"; then :
+ $as_echo "$have_jit (disabled)"
+elif test "x$enable_llvm" = "xyes"; then :
+ $as_echo "$have_jit"
+elif test "x$enable_llvm" = "x"; then :
+ $as_echo "$have_jit"
+else
+ $as_echo "$have_jit ($enable_llvm)"
+fi
+
+
+
+ $as_echo_n " mempool : "
+ if test "x$enable_mempool" = "xno"; then :
+ $as_echo "$have_mempool (disabled)"
+elif test "x$enable_mempool" = "xyes"; then :
+ $as_echo "$have_mempool"
+elif test "x$enable_mempool" = "x"; then :
+ $as_echo "$have_mempool"
+else
+ $as_echo "$have_mempool ($enable_mempool)"
+fi
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: Summary of engine detection features" >&5
+$as_echo "$as_me: Summary of engine detection features" >&6;}
+
+
+ $as_echo_n " autoit_ea06 : "
+ if test "x" = "xno"; then :
+ $as_echo "$have_autoitea06 (disabled)"
+elif test "x" = "xyes"; then :
+ $as_echo "$have_autoitea06"
+elif test "x" = "x"; then :
+ $as_echo "$have_autoitea06"
+else
+ $as_echo "$have_autoitea06 ()"
+fi
+
+
+
+ $as_echo_n " bzip2 : "
+ if test "x$want_bzip2" = "xno"; then :
+ $as_echo "$ac_cv_c_cve_2008_1372 (disabled)"
+elif test "x$want_bzip2" = "xyes"; then :
+ $as_echo "$ac_cv_c_cve_2008_1372"
+elif test "x$want_bzip2" = "x"; then :
+ $as_echo "$ac_cv_c_cve_2008_1372"
+else
+ $as_echo "$ac_cv_c_cve_2008_1372 ($want_bzip2)"
+fi
+
+
+
+ $as_echo_n " zlib : "
+ if test "xyes" = "xno"; then :
+ $as_echo "$ZLIB_HOME (disabled)"
+elif test "xyes" = "xyes"; then :
+ $as_echo "$ZLIB_HOME"
+elif test "xyes" = "x"; then :
+ $as_echo "$ZLIB_HOME"
+else
+ $as_echo "$ZLIB_HOME (yes)"
+fi
+
+
+
+ $as_echo_n " unrar : "
+ if test "x$want_unrar" = "xno"; then :
+ $as_echo "$want_unrar (disabled)"
+elif test "x$want_unrar" = "xyes"; then :
+ $as_echo "$want_unrar"
+elif test "x$want_unrar" = "x"; then :
+ $as_echo "$want_unrar"
+else
+ $as_echo "$want_unrar ($want_unrar)"
+fi
+
+
# Yep, downgrading the compiler avoids the bug too:
# 4.0.x, and 4.1.0 are the known buggy versions
# 3.4 doesn't have the bug
diff --git a/configure.in b/configure.in
index 54a4d1e..30c115e 100644
--- a/configure.in
+++ b/configure.in
@@ -441,6 +441,7 @@ AC_C_FUNC_MMAP_PRIVATE
AC_C_FUNC_PAGESIZE
AC_C_FUNC_MMAP_ANONYMOUS
AC_ARG_ENABLE([mempool],[ --disable-mempool disable memory pools], enable_mempool=$enableval, enable_mempool="yes")
+have_mempool="no"
if test "$enable_mempool" = "yes"; then
if test "$ac_cv_c_mmap_private" != "yes"; then
AC_MSG_NOTICE([****** mempool support disabled (mmap not available or not usable)])
@@ -452,6 +453,7 @@ if test "$enable_mempool" = "yes"; then
AC_MSG_NOTICE([****** mempool support disabled (anonymous mmap not available)])
else
AC_DEFINE([USE_MPOOL],1,[enable memory pools])
+ have_mempool="yes"
fi
fi
fi
@@ -1636,6 +1638,47 @@ AM_CONDITIONAL([ENABLE_LLVM],
no_recursion="yes";
AC_OUTPUT([libclamav/Makefile])
+# Print a summary of what features we enabled
+AC_MSG_NOTICE([Summary of detected features follows])
+
+cat <<EOF
+ OS : $target_os
+ pthreads : $have_pthreads ($THREAD_LIBS)
+EOF
+
+AC_MSG_NOTICE([Summary of miscellaneous features])
+CL_MSG_STATUS([check ],[$CHECK_LIBS],[$enable_check_ut])
+CL_MSG_STATUS([clamuko ],[$want_clamuko],[$want_clamuko])
+if test "x$ac_cv_have_control_in_msghdr" = "xyes"; then
+ CL_MSG_STATUS([fdpassing ],[$have_fdpass],[$want_fdpassing])
+else
+ CL_MSG_STATUS([fdpassing ],[n/a],[])
+fi
+CL_MSG_STATUS([IPv6 ],[$have_cv_ipv6],[$want_ipv6])
+
+AC_MSG_NOTICE([Summary of optional tools])
+CL_MSG_STATUS([clamdtop ],[$CURSES_LIBS],[$enable_clamdtop])
+CL_MSG_STATUS([milter ],[yes],[$have_milter])
+
+AC_MSG_NOTICE([Summary of engine performance features)])
+if test "x$enable_debug" = "xyes"; then
+ CL_MSG_STATUS([release mode],[yes],[yes])
+else
+ CL_MSG_STATUS([release mode],[no],[debug build])
+fi
+have_jit="yes"
+if test "$subdirfailed" = "no"; then
+ have_jit="no"
+fi
+CL_MSG_STATUS([jit ],[$have_jit],[$enable_llvm])
+CL_MSG_STATUS([mempool ],[$have_mempool],[$enable_mempool])
+
+AC_MSG_NOTICE([Summary of engine detection features])
+CL_MSG_STATUS([autoit_ea06 ],[$have_autoitea06],[])
+CL_MSG_STATUS([bzip2 ],[$ac_cv_c_cve_2008_1372],[$want_bzip2])
+CL_MSG_STATUS([zlib ],[$ZLIB_HOME],[yes])
+CL_MSG_STATUS([unrar ],[$want_unrar],[$want_unrar])
+
# Yep, downgrading the compiler avoids the bug too:
# 4.0.x, and 4.1.0 are the known buggy versions
# 3.4 doesn't have the bug
diff --git a/m4/acinclude.m4 b/m4/acinclude.m4
index 1166cef..0f6f6a3 100644
--- a/m4/acinclude.m4
+++ b/m4/acinclude.m4
@@ -609,12 +609,15 @@ fi
fi
])
+have_autoitea06="no"
case $ac_cv_c_fpu_bigendian in
yes)
AC_DEFINE([FPU_WORDS_BIGENDIAN], 1, [FPU byte ordering is big endian])
+ have_autoitea06="yes"
;;
no)
AC_DEFINE([FPU_WORDS_BIGENDIAN], 0, [FPU byte ordering is little endian])
+ have_autoitea06="yes"
;;
*)
AC_MSG_WARN([Unable to determine FPU endianess, some features may not be available in this build])
@@ -782,3 +785,13 @@ AC_DEFUN([AC_LIB_MULTILIB_GUESS],
fi
])
+dnl CL_MSG_STATUS([featurename],[have_feature], [enable_feature])
+AC_DEFUN([CL_MSG_STATUS],
+[
+ m4_if($#,3,,[m4_fatal([$0: invalid number of arguments: $#])])
+ AS_ECHO_N([" $1: "])
+ AS_IF([test "x$3" = "xno"], [AS_ECHO(["$2 (disabled)"])],
+ [test "x$3" = "xyes"], [AS_ECHO(["$2"])],
+ [test "x$3" = "x"], [AS_ECHO(["$2"])],
+ [AS_ECHO(["$2 ($3)"])])
+])
--
Debian repository for ClamAV
More information about the Pkg-clamav-commits
mailing list