@@ -1,3 +1,9 @@

+Wed May  6 10:45:55 EEST 2009 (edwin)

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

+ * configure, configure.in: Fix Solaris memory usage: don't link with

+ -lmalloc on Solaris (bb #1595, thanks to David Schweikert

+ <david*schweikert.ch> for tracking down the problem).

+

 Wed May  6 10:40:19 EEST 2009 (edwin)

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

  * clamd/others.c, clamd/others.h, clamd/server-th.c,

@@ -16277,7 +16277,8 @@ fi

-for ac_func in poll setsid memcpy snprintf vsnprintf strerror_r strlcpy strlcat strcasestr inet_ntop setgroups initgroups ctime_r mkstemp

+

+for ac_func in poll setsid memcpy snprintf vsnprintf strerror_r strlcpy strlcat strcasestr inet_ntop setgroups initgroups ctime_r mkstemp mallinfo

 do

 as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`

 { $as_echo "$as_me:$LINENO: checking for $ac_func" >&5

@@ -25387,100 +25388,6 @@ else

 fi

-{ $as_echo "$as_me:$LINENO: checking for library containing mallinfo" >&5

-$as_echo_n "checking for library containing mallinfo... " >&6; }

-if test "${ac_cv_search_mallinfo+set}" = set; then

-  $as_echo_n "(cached) " >&6

-else

-  ac_func_search_save_LIBS=$LIBS

-cat >conftest.$ac_ext <<_ACEOF

-/* confdefs.h.  */

-_ACEOF

-cat confdefs.h >>conftest.$ac_ext

-cat >>conftest.$ac_ext <<_ACEOF

-/* end confdefs.h.  */

-

-/* Override any GCC internal prototype to avoid an error.

-   Use char because int might match the return type of a GCC

-   builtin and then its argument prototype would still apply.  */

-#ifdef __cplusplus

-extern "C"

-#endif

-char mallinfo ();

-int

-main ()

-{

-return mallinfo ();

-  ;

-  return 0;

-}

-_ACEOF

-for ac_lib in '' malloc; do

-  if test -z "$ac_lib"; then

-    ac_res="none required"

-  else

-    ac_res=-l$ac_lib

-    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"

-  fi

-  rm -f conftest.$ac_objext conftest$ac_exeext

-if { (ac_try="$ac_link"

-case "(($ac_try" in

-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

-  *) ac_try_echo=$ac_try;;

-esac

-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""

-$as_echo "$ac_try_echo") >&5

-  (eval "$ac_link") 2>conftest.er1

-  ac_status=$?

-  grep -v '^ *+' conftest.er1 >conftest.err

-  rm -f conftest.er1

-  cat conftest.err >&5

-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5

-  (exit $ac_status); } && {

-	 test -z "$ac_c_werror_flag" ||

-	 test ! -s conftest.err

-       } && test -s conftest$ac_exeext && {

-	 test "$cross_compiling" = yes ||

-	 $as_test_x conftest$ac_exeext

-       }; then

-  ac_cv_search_mallinfo=$ac_res

-else

-  $as_echo "$as_me: failed program was:" >&5

-sed 's/^/| /' conftest.$ac_ext >&5

-

-

-fi

-

-rm -rf conftest.dSYM

-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

-      conftest$ac_exeext

-  if test "${ac_cv_search_mallinfo+set}" = set; then

-  break

-fi

-done

-if test "${ac_cv_search_mallinfo+set}" = set; then

-  :

-else

-  ac_cv_search_mallinfo=no

-fi

-rm conftest.$ac_ext

-LIBS=$ac_func_search_save_LIBS

-fi

-{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_mallinfo" >&5

-$as_echo "$ac_cv_search_mallinfo" >&6; }

-ac_res=$ac_cv_search_mallinfo

-if test "$ac_res" != no; then

-  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"

-

-cat >>confdefs.h <<\_ACEOF

-#define HAVE_MALLINFO 1

-_ACEOF

-

-	        test "$ac_cv_search_mallinfo" = "none required" ||

-		CLAMD_LIBS="$CLAMD_LIBS $ac_cv_search_mallinfo"

-fi

-

-

 ac_config_files="$ac_config_files libclamav/Makefile libclamav/lzma/Makefile clamscan/Makefile database/Makefile docs/Makefile clamd/Makefile clamdscan/Makefile clamav-milter/Makefile freshclam/Makefile sigtool/Makefile clamconf/Makefile etc/Makefile test/Makefile unit_tests/Makefile clamdtop/Makefile Makefile clamav-config libclamav.pc docs/man/clamav-milter.8 docs/man/clamconf.1 docs/man/clamd.8 docs/man/clamd.conf.5 docs/man/clamdscan.1 docs/man/clamscan.1 docs/man/freshclam.1 docs/man/freshclam.conf.5 docs/man/sigtool.1 docs/man/clamdtop.1"

 cat >confcache <<\_ACEOF

@@ -420,7 +420,7 @@ fi

 AC_CHECK_LIB([socket], [bind], [LIBS="$LIBS -lsocket"; CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -lsocket"; FRESHCLAM_LIBS="$FRESHCLAM_LIBS -lsocket"; CLAMD_LIBS="$CLAMD_LIBS -lsocket"])

 AC_SEARCH_LIBS([gethostent],[nsl], [(LIBS="$LIBS -lnsl"; CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -lnsl"; FRESHCLAM_LIBS="$FRESHCLAM_LIBS -lnsl"; CLAMD_LIBS="$CLAMD_LIBS -lnsl")])

-AC_CHECK_FUNCS([poll setsid memcpy snprintf vsnprintf strerror_r strlcpy strlcat strcasestr inet_ntop setgroups initgroups ctime_r mkstemp])

+AC_CHECK_FUNCS([poll setsid memcpy snprintf vsnprintf strerror_r strlcpy strlcat strcasestr inet_ntop setgroups initgroups ctime_r mkstemp mallinfo])

 AC_C_FUNC_MMAP_PRIVATE

 AC_FUNC_FSEEKO

@@ -1570,11 +1570,6 @@ AC_SUBST([CURSES_LIBS])

 AM_CONDITIONAL([HAVE_CURSES],

 	       [test "X$HAVE_LIBNCURSES" = "Xyes" || test "X$HAVE_LIBPDCURSES" = "Xyes"])

-AC_SEARCH_LIBS([mallinfo],[malloc],

-	       [AC_DEFINE([HAVE_MALLINFO],1,[have mallinfo])

-	        test "$ac_cv_search_mallinfo" = "none required" ||

-		CLAMD_LIBS="$CLAMD_LIBS $ac_cv_search_mallinfo"])

-

 AC_OUTPUT([

 libclamav/Makefile

 libclamav/lzma/Makefile