@@ -1,3 +1,11 @@

+Wed Apr  1 20:51:37 EEST 2009 (edwin)

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

+ * Makefile.in, aclocal.m4, clamav-config.h.in, clamav-milter/,

+ clamconf/, clamd/, clamdscan/, clamdtop/, clamscan/, configure,

+ configure.in, database/, docs/, etc/, freshclam/, libclamav/,

+ libltdl/, sigtool/, test/, unit_tests/: check for mallinfo

+ availability (bb #1445).

+

 Wed Apr  1 20:19:00 EEST 2009 (edwin)

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

  * clamd/server-th.c, clamd/thrmgr.c: Automatically fix MaxQueue

@@ -73,10 +73,11 @@ DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \

 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4

 am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \

 	$(top_srcdir)/m4/argz.m4 $(top_srcdir)/m4/fdpassing.m4 \

-	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \

-	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltdl.m4 \

-	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \

-	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \

+	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \

+	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libtool.m4 \

+	$(top_srcdir)/m4/ltdl.m4 $(top_srcdir)/m4/ltoptions.m4 \

+	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \

+	$(top_srcdir)/m4/lt~obsolete.m4 \

 	$(top_srcdir)/m4/mmap_private.m4 $(top_srcdir)/m4/resolv.m4 \

 	$(top_srcdir)/configure.in

 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \

@@ -19,117 +19,6 @@ You have another version of autoconf.  It may work, but is not guaranteed to.

 If you have problems, you may need to regenerate the build system entirely.

 To do so, use the procedure documented by the package, typically `autoreconf'.])])

-# lib-ld.m4 serial 3 (gettext-0.13)

-dnl Copyright (C) 1996-2003 Free Software Foundation, Inc.

-dnl This file is free software; the Free Software Foundation

-dnl gives unlimited permission to copy and/or distribute it,

-dnl with or without modifications, as long as this notice is preserved.

-

-dnl Subroutines of libtool.m4,

-dnl with replacements s/AC_/AC_LIB/ and s/lt_cv/acl_cv/ to avoid collision

-dnl with libtool.m4.

-

-dnl From libtool-1.4. Sets the variable with_gnu_ld to yes or no.

-AC_DEFUN([AC_LIB_PROG_LD_GNU],

-[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], acl_cv_prog_gnu_ld,

-[# I'd rather use --version here, but apparently some GNU ld's only accept -v.

-case `$LD -v 2>&1 </dev/null` in

-*GNU* | *'with BFD'*)

-  acl_cv_prog_gnu_ld=yes ;;

-*)

-  acl_cv_prog_gnu_ld=no ;;

-esac])

-with_gnu_ld=$acl_cv_prog_gnu_ld

-])

-

-dnl From libtool-1.4. Sets the variable LD.

-AC_DEFUN([AC_LIB_PROG_LD],

-[AC_ARG_WITH(gnu-ld,

-[  --with-gnu-ld           assume the C compiler uses GNU ld [default=no]],

-test "$withval" = no || with_gnu_ld=yes, with_gnu_ld=no)

-AC_REQUIRE([AC_PROG_CC])dnl

-AC_REQUIRE([AC_CANONICAL_HOST])dnl

-# Prepare PATH_SEPARATOR.

-# The user is always right.

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

-  echo "#! /bin/sh" >conf$$.sh

-  echo  "exit 0"   >>conf$$.sh

-  chmod +x conf$$.sh

-  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then

-    PATH_SEPARATOR=';'

-  else

-    PATH_SEPARATOR=:

-  fi

-  rm -f conf$$.sh

-fi

-ac_prog=ld

-if test "$GCC" = yes; then

-  # Check if gcc -print-prog-name=ld gives a path.

-  AC_MSG_CHECKING([for ld used by GCC])

-  case $host in

-  *-*-mingw*)

-    # gcc leaves a trailing carriage return which upsets mingw

-    ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;

-  *)

-    ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;

-  esac

-  case $ac_prog in

-    # Accept absolute paths.

-    [[\\/]* | [A-Za-z]:[\\/]*)]

-      [re_direlt='/[^/][^/]*/\.\./']

-      # Canonicalize the path of ld

-      ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'`

-      while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do

-	ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"`

-      done

-      test -z "$LD" && LD="$ac_prog"

-      ;;

-  "")

-    # If it fails, then pretend we aren't using GCC.

-    ac_prog=ld

-    ;;

-  *)

-    # If it is relative, then search for the first ld in PATH.

-    with_gnu_ld=unknown

-    ;;

-  esac

-elif test "$with_gnu_ld" = yes; then

-  AC_MSG_CHECKING([for GNU ld])

-else

-  AC_MSG_CHECKING([for non-GNU ld])

-fi

-AC_CACHE_VAL(acl_cv_path_LD,

-[if test -z "$LD"; then

-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"

-  for ac_dir in $PATH; do

-    test -z "$ac_dir" && ac_dir=.

-    if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then

-      acl_cv_path_LD="$ac_dir/$ac_prog"

-      # Check to see if the program is GNU ld.  I'd rather use --version,

-      # but apparently some GNU ld's only accept -v.

-      # Break only if it was the GNU/non-GNU ld that we prefer.

-      case `"$acl_cv_path_LD" -v 2>&1 < /dev/null` in

-      *GNU* | *'with BFD'*)

-	test "$with_gnu_ld" != no && break ;;

-      *)

-	test "$with_gnu_ld" != yes && break ;;

-      esac

-    fi

-  done

-  IFS="$ac_save_ifs"

-else

-  acl_cv_path_LD="$LD" # Let the user override the test with a path.

-fi])

-LD="$acl_cv_path_LD"

-if test -n "$LD"; then

-  AC_MSG_RESULT($LD)

-else

-  AC_MSG_RESULT(no)

-fi

-test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH])

-AC_LIB_PROG_LD_GNU

-])

-

 # Copyright (C) 2002, 2003, 2005, 2006, 2007  Free Software Foundation, Inc.

 #

 # This file is free software; the Free Software Foundation

@@ -980,6 +869,7 @@ AC_SUBST([am__untar])

 m4_include([m4/acinclude.m4])

 m4_include([m4/argz.m4])

 m4_include([m4/fdpassing.m4])

+m4_include([m4/lib-ld.m4])

 m4_include([m4/lib-link.m4])

 m4_include([m4/lib-prefix.m4])

 m4_include([m4/libtool.m4])

@@ -247,6 +247,9 @@

 /* Define to 1 if you have the <mach-o/dyld.h> header file. */

 #undef HAVE_MACH_O_DYLD_H

+/* have mallinfo */

+#undef HAVE_MALLINFO

+

 /* Define to 1 if you have the <malloc.h> header file. */

 #undef HAVE_MALLOC_H

@@ -58,10 +58,11 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in

 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4

 am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \

 	$(top_srcdir)/m4/argz.m4 $(top_srcdir)/m4/fdpassing.m4 \

-	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \

-	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltdl.m4 \

-	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \

-	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \

+	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \

+	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libtool.m4 \

+	$(top_srcdir)/m4/ltdl.m4 $(top_srcdir)/m4/ltoptions.m4 \

+	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \

+	$(top_srcdir)/m4/lt~obsolete.m4 \

 	$(top_srcdir)/m4/mmap_private.m4 $(top_srcdir)/m4/resolv.m4 \

 	$(top_srcdir)/configure.in

 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \

@@ -57,10 +57,11 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in

 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4

 am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \

 	$(top_srcdir)/m4/argz.m4 $(top_srcdir)/m4/fdpassing.m4 \

-	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \

-	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltdl.m4 \

-	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \

-	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \

+	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \

+	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libtool.m4 \

+	$(top_srcdir)/m4/ltdl.m4 $(top_srcdir)/m4/ltoptions.m4 \

+	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \

+	$(top_srcdir)/m4/lt~obsolete.m4 \

 	$(top_srcdir)/m4/mmap_private.m4 $(top_srcdir)/m4/resolv.m4 \

 	$(top_srcdir)/configure.in

 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \

@@ -57,10 +57,11 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in

 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4

 am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \

 	$(top_srcdir)/m4/argz.m4 $(top_srcdir)/m4/fdpassing.m4 \

-	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \

-	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltdl.m4 \

-	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \

-	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \

+	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \

+	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libtool.m4 \

+	$(top_srcdir)/m4/ltdl.m4 $(top_srcdir)/m4/ltoptions.m4 \

+	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \

+	$(top_srcdir)/m4/lt~obsolete.m4 \

 	$(top_srcdir)/m4/mmap_private.m4 $(top_srcdir)/m4/resolv.m4 \

 	$(top_srcdir)/configure.in

 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \

@@ -36,7 +36,7 @@

 #include "mpool.h"

 #include "server.h"

-#if defined(C_LINUX)

+#ifdef HAVE_MALLINFO

 #include <malloc.h>

 #endif

@@ -282,16 +282,15 @@ int thrmgr_printstats(int f)

 		mdprintf(f,"\n");

 	}

 	free(seen);

-#if defined(C_LINUX)

+#ifdef HAVE_MALLINFO

 	{

 		struct mallinfo inf = mallinfo();

 		mem_heap = inf.arena/(1024*1024.0);

 		mem_mmap = inf.hblkhd/(1024*1024.0);

-		mem_used = inf.uordblks/(1024*1024.0);

-		mem_free = inf.fordblks/(1024*1024.0);

+		mem_used = (inf.usmblks + inf.uordblks)/(1024*1024.0);

+		mem_free = (inf.fsmblks + inf.fordblks)/(1024*1024.0);

 		mem_releasable = inf.keepcost/(1024*1024.0);

 		has_libc_memstats=1;

-		/* TODO: figure out how to print these statistics on other OSes */

 	}

 #endif

 	if (error_flag) {

@@ -57,10 +57,11 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in

 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4

 am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \

 	$(top_srcdir)/m4/argz.m4 $(top_srcdir)/m4/fdpassing.m4 \

-	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \

-	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltdl.m4 \

-	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \

-	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \

+	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \

+	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libtool.m4 \

+	$(top_srcdir)/m4/ltdl.m4 $(top_srcdir)/m4/ltoptions.m4 \

+	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \

+	$(top_srcdir)/m4/lt~obsolete.m4 \

 	$(top_srcdir)/m4/mmap_private.m4 $(top_srcdir)/m4/resolv.m4 \

 	$(top_srcdir)/configure.in

 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \

@@ -39,10 +39,11 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in

 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4

 am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \

 	$(top_srcdir)/m4/argz.m4 $(top_srcdir)/m4/fdpassing.m4 \

-	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \

-	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltdl.m4 \

-	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \

-	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \

+	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \

+	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libtool.m4 \

+	$(top_srcdir)/m4/ltdl.m4 $(top_srcdir)/m4/ltoptions.m4 \

+	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \

+	$(top_srcdir)/m4/lt~obsolete.m4 \

 	$(top_srcdir)/m4/mmap_private.m4 $(top_srcdir)/m4/resolv.m4 \

 	$(top_srcdir)/configure.in

 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \

@@ -58,10 +58,11 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in

 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4

 am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \

 	$(top_srcdir)/m4/argz.m4 $(top_srcdir)/m4/fdpassing.m4 \

-	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \

-	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltdl.m4 \

-	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \

-	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \

+	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \

+	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libtool.m4 \

+	$(top_srcdir)/m4/ltdl.m4 $(top_srcdir)/m4/ltoptions.m4 \

+	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \

+	$(top_srcdir)/m4/lt~obsolete.m4 \

 	$(top_srcdir)/m4/mmap_private.m4 $(top_srcdir)/m4/resolv.m4 \

 	$(top_srcdir)/configure.in

 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \

@@ -25381,6 +25381,100 @@ 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

@@ -1568,6 +1568,11 @@ 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

@@ -56,10 +56,11 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in

 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4

 am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \

 	$(top_srcdir)/m4/argz.m4 $(top_srcdir)/m4/fdpassing.m4 \

-	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \

-	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltdl.m4 \

-	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \

-	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \

+	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \

+	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libtool.m4 \

+	$(top_srcdir)/m4/ltdl.m4 $(top_srcdir)/m4/ltoptions.m4 \

+	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \

+	$(top_srcdir)/m4/lt~obsolete.m4 \

 	$(top_srcdir)/m4/mmap_private.m4 $(top_srcdir)/m4/resolv.m4 \

 	$(top_srcdir)/configure.in

 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \

@@ -55,10 +55,11 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in

 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4

 am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \

 	$(top_srcdir)/m4/argz.m4 $(top_srcdir)/m4/fdpassing.m4 \

-	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \

-	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltdl.m4 \

-	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \

-	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \

+	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \

+	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libtool.m4 \

+	$(top_srcdir)/m4/ltdl.m4 $(top_srcdir)/m4/ltoptions.m4 \

+	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \

+	$(top_srcdir)/m4/lt~obsolete.m4 \

 	$(top_srcdir)/m4/mmap_private.m4 $(top_srcdir)/m4/resolv.m4 \

 	$(top_srcdir)/configure.in

 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \

@@ -55,10 +55,11 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in

 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4

 am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \

 	$(top_srcdir)/m4/argz.m4 $(top_srcdir)/m4/fdpassing.m4 \

-	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \

-	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltdl.m4 \

-	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \

-	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \

+	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \

+	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libtool.m4 \

+	$(top_srcdir)/m4/ltdl.m4 $(top_srcdir)/m4/ltoptions.m4 \

+	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \

+	$(top_srcdir)/m4/lt~obsolete.m4 \

 	$(top_srcdir)/m4/mmap_private.m4 $(top_srcdir)/m4/resolv.m4 \

 	$(top_srcdir)/configure.in

 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \

@@ -58,10 +58,11 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in

 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4

 am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \

 	$(top_srcdir)/m4/argz.m4 $(top_srcdir)/m4/fdpassing.m4 \

-	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \

-	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltdl.m4 \

-	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \

-	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \

+	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \

+	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libtool.m4 \

+	$(top_srcdir)/m4/ltdl.m4 $(top_srcdir)/m4/ltoptions.m4 \

+	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \

+	$(top_srcdir)/m4/lt~obsolete.m4 \

 	$(top_srcdir)/m4/mmap_private.m4 $(top_srcdir)/m4/resolv.m4 \

 	$(top_srcdir)/configure.in

 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \

@@ -70,10 +70,11 @@ DIST_COMMON = $(include_HEADERS) $(srcdir)/Makefile.am \

 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4

 am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \

 	$(top_srcdir)/m4/argz.m4 $(top_srcdir)/m4/fdpassing.m4 \

-	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \

-	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltdl.m4 \

-	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \

-	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \

+	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \

+	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libtool.m4 \

+	$(top_srcdir)/m4/ltdl.m4 $(top_srcdir)/m4/ltoptions.m4 \

+	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \

+	$(top_srcdir)/m4/lt~obsolete.m4 \

 	$(top_srcdir)/m4/mmap_private.m4 $(top_srcdir)/m4/resolv.m4 \

 	$(top_srcdir)/configure.in

 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \

@@ -57,10 +57,11 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in

 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4

 am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \

 	$(top_srcdir)/m4/argz.m4 $(top_srcdir)/m4/fdpassing.m4 \

-	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \

-	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltdl.m4 \

-	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \

-	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \

+	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \

+	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libtool.m4 \

+	$(top_srcdir)/m4/ltdl.m4 $(top_srcdir)/m4/ltoptions.m4 \

+	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \

+	$(top_srcdir)/m4/lt~obsolete.m4 \

 	$(top_srcdir)/m4/mmap_private.m4 $(top_srcdir)/m4/resolv.m4 \

 	$(top_srcdir)/configure.in

 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \

@@ -46,10 +46,11 @@ DIST_COMMON = README $(am__include_HEADERS_DIST) \

 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4

 am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \

 	$(top_srcdir)/m4/argz.m4 $(top_srcdir)/m4/fdpassing.m4 \

-	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \

-	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltdl.m4 \

-	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \

-	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \

+	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \

+	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libtool.m4 \

+	$(top_srcdir)/m4/ltdl.m4 $(top_srcdir)/m4/ltoptions.m4 \

+	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \

+	$(top_srcdir)/m4/lt~obsolete.m4 \

 	$(top_srcdir)/m4/mmap_private.m4 $(top_srcdir)/m4/resolv.m4 \

 	$(top_srcdir)/configure.in

 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \

@@ -57,10 +57,11 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in

 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4

 am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \

 	$(top_srcdir)/m4/argz.m4 $(top_srcdir)/m4/fdpassing.m4 \

-	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \

-	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltdl.m4 \

-	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \

-	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \

+	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \

+	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libtool.m4 \

+	$(top_srcdir)/m4/ltdl.m4 $(top_srcdir)/m4/ltoptions.m4 \

+	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \

+	$(top_srcdir)/m4/lt~obsolete.m4 \

 	$(top_srcdir)/m4/mmap_private.m4 $(top_srcdir)/m4/resolv.m4 \

 	$(top_srcdir)/configure.in

 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \

@@ -37,10 +37,11 @@ DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in

 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4

 am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \

 	$(top_srcdir)/m4/argz.m4 $(top_srcdir)/m4/fdpassing.m4 \

-	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \

-	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltdl.m4 \

-	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \

-	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \

+	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \

+	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libtool.m4 \

+	$(top_srcdir)/m4/ltdl.m4 $(top_srcdir)/m4/ltoptions.m4 \

+	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \

+	$(top_srcdir)/m4/lt~obsolete.m4 \

 	$(top_srcdir)/m4/mmap_private.m4 $(top_srcdir)/m4/resolv.m4 \

 	$(top_srcdir)/configure.in

 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \

@@ -40,10 +40,11 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in

 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4

 am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \

 	$(top_srcdir)/m4/argz.m4 $(top_srcdir)/m4/fdpassing.m4 \

-	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \

-	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltdl.m4 \

-	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \

-	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \

+	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \

+	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libtool.m4 \

+	$(top_srcdir)/m4/ltdl.m4 $(top_srcdir)/m4/ltoptions.m4 \

+	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \

+	$(top_srcdir)/m4/lt~obsolete.m4 \

 	$(top_srcdir)/m4/mmap_private.m4 $(top_srcdir)/m4/resolv.m4 \

 	$(top_srcdir)/configure.in

 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \