@@ -1,3 +1,8 @@

+Fri Mar  5 14:25:52 CET 2004 (tk)

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

+  * configure: check for a safe value of FD_SETSIZE for select() and check for

+	       poll() (patch from Trog)

+

 Thu Mar  4 15:54:25 CET 2004 (tk)

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

   * clamdscan: do not overwrite s_addr (thanks to Adam Stein

@@ -81,7 +81,7 @@ dnl there is now a CREATE_PREFIX_TARGET_H in this file as a shorthand for

 dnl PREFIX_CONFIG_H from a target.h file, however w/o the target.h ever created

 dnl (the prefix is a bit different, since we add an extra -target- and -host-)

 dnl 

-dnl @version: $Id: aclocal.m4,v 1.25 2004/02/29 17:29:09 kojm Exp $

+dnl @version: $Id: aclocal.m4,v 1.26 2004/03/05 13:26:22 kojm Exp $

 dnl @author Guido Draheim <guidod@gmx.de>                 STATUS: used often

 AC_DEFUN([AC_CREATE_TARGET_H],

@@ -4041,7 +4041,7 @@ dnl      AC_COMPILE_CHECK_SIZEOF(ptrdiff_t, $headers)

 dnl      AC_COMPILE_CHECK_SIZEOF(off_t, $headers)

 dnl

 dnl @author Kaveh Ghazi <ghazi@caip.rutgers.edu>

-dnl @version $Id: aclocal.m4,v 1.25 2004/02/29 17:29:09 kojm Exp $

+dnl @version $Id: aclocal.m4,v 1.26 2004/03/05 13:26:22 kojm Exp $

 dnl

 AC_DEFUN([AC_COMPILE_CHECK_SIZEOF],

 [changequote(<<, >>)dnl

@@ -66,6 +66,9 @@

 /* Name of the daily database */

 #undef DB2NAME

+/* "default FD_SETSIZE value" */

+#undef DEFAULT_FD_SETSIZE

+

 /* file i/o buffer size */

 #undef FILEBUFF

@@ -99,6 +102,12 @@

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

 #undef HAVE_NDIR_H

+/* Define to 1 if you have the `poll' function. */

+#undef HAVE_POLL

+

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

+#undef HAVE_POLL_H

+

 /* "pragma pack" */

 #undef HAVE_PRAGMA_PACK

@@ -7865,7 +7865,8 @@ fi

-for ac_header in stdint.h unistd.h sys/int_types.h dlfcn.h inttypes.h sys/inttypes.h memory.h ndir.h stdlib.h strings.h string.h sys/mman.h sys/param.h sys/stat.h sys/types.h malloc.h

+

+for ac_header in stdint.h unistd.h sys/int_types.h dlfcn.h inttypes.h sys/inttypes.h memory.h ndir.h stdlib.h strings.h string.h sys/mman.h sys/param.h sys/stat.h sys/types.h malloc.h poll.h

 do

 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`

 if eval "test \"\${$as_ac_Header+set}\" = set"; then

@@ -8226,6 +8227,82 @@ _ACEOF

+for ac_func in poll

+do

+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`

+echo "$as_me:$LINENO: checking for $ac_func" >&5

+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6

+if eval "test \"\${$as_ac_var+set}\" = set"; then

+  echo $ECHO_N "(cached) $ECHO_C" >&6

+else

+  cat >conftest.$ac_ext <<_ACEOF

+#line $LINENO "configure"

+#include "confdefs.h"

+/* System header to define __stub macros and hopefully few prototypes,

+    which can conflict with char $ac_func (); below.  */

+#include <assert.h>

+/* Override any gcc2 internal prototype to avoid an error.  */

+#ifdef __cplusplus

+extern "C"

+#endif

+/* We use char because int might match the return type of a gcc2

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

+char $ac_func ();

+char (*f) ();

+

+#ifdef F77_DUMMY_MAIN

+#  ifdef __cplusplus

+     extern "C"

+#  endif

+   int F77_DUMMY_MAIN() { return 1; }

+#endif

+int

+main ()

+{

+/* The GNU C library defines this for functions which it implements

+    to always fail with ENOSYS.  Some functions are actually named

+    something starting with __ and the normal name is an alias.  */

+#if defined (__stub_$ac_func) || defined (__stub___$ac_func)

+choke me

+#else

+f = $ac_func;

+#endif

+

+  ;

+  return 0;

+}

+_ACEOF

+rm -f conftest.$ac_objext conftest$ac_exeext

+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5

+  (eval $ac_link) 2>&5

+  ac_status=$?

+  echo "$as_me:$LINENO: \$? = $ac_status" >&5

+  (exit $ac_status); } &&

+         { ac_try='test -s conftest$ac_exeext'

+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

+  (eval $ac_try) 2>&5

+  ac_status=$?

+  echo "$as_me:$LINENO: \$? = $ac_status" >&5

+  (exit $ac_status); }; }; then

+  eval "$as_ac_var=yes"

+else

+  echo "$as_me: failed program was:" >&5

+cat conftest.$ac_ext >&5

+eval "$as_ac_var=no"

+fi

+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext

+fi

+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5

+echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6

+if test `eval echo '${'$as_ac_var'}'` = yes; then

+  cat >>confdefs.h <<_ACEOF

+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1

+_ACEOF

+

+fi

+done

+

+

 have_pthreads=no

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

   echo "$as_me:$LINENO: checking for pthread.h" >&5

@@ -10670,6 +10747,56 @@ echo "${ECHO_T}no" >&6

     fi

 fi

+echo "$as_me:$LINENO: checking Default FD_SETSIZE value" >&5

+echo $ECHO_N "checking Default FD_SETSIZE value... $ECHO_C" >&6

+if test "$cross_compiling" = yes; then

+  DEFAULT_FD_SETSIZE=256

+else

+  cat >conftest.$ac_ext <<_ACEOF

+#line $LINENO "configure"

+#include "confdefs.h"

+

+#include <stdio.h>

+#include <unistd.h>

+#include <sys/time.h>

+#include <sys/select.h>

+#include <sys/types.h>

+main() {

+        FILE *fp = fopen("conftestval", "w");

+        fprintf (fp, "%d\n", FD_SETSIZE);

+        exit(0);

+}

+

+_ACEOF

+rm -f conftest$ac_exeext

+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5

+  (eval $ac_link) 2>&5

+  ac_status=$?

+  echo "$as_me:$LINENO: \$? = $ac_status" >&5

+  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'

+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

+  (eval $ac_try) 2>&5

+  ac_status=$?

+  echo "$as_me:$LINENO: \$? = $ac_status" >&5

+  (exit $ac_status); }; }; then

+  DEFAULT_FD_SETSIZE=`cat conftestval`

+else

+  echo "$as_me: program exited with status $ac_status" >&5

+echo "$as_me: failed program was:" >&5

+cat conftest.$ac_ext >&5

+( exit $ac_status )

+DEFAULT_FD_SETSIZE=256

+fi

+rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext

+fi

+echo "$as_me:$LINENO: result: $DEFAULT_FD_SETSIZE" >&5

+echo "${ECHO_T}$DEFAULT_FD_SETSIZE" >&6

+

+cat >>confdefs.h <<_ACEOF

+#define DEFAULT_FD_SETSIZE $DEFAULT_FD_SETSIZE

+_ACEOF

+

+

 ac_config_files="$ac_config_files libclamav/Makefile clamscan/Makefile database/Makefile docs/Makefile clamd/Makefile clamdscan/Makefile clamav-milter/Makefile freshclam/Makefile sigtool/Makefile etc/Makefile Makefile"

 cat >confcache <<\_ACEOF

 # This file is a shell script that caches the results of configure

@@ -52,11 +52,12 @@ AC_DEFINE(SCANBUFF, 131072, [scan buffer size])

 AC_DEFINE(FILEBUFF, 8192,   [file i/o buffer size])

 AC_HEADER_STDC

-AC_CHECK_HEADERS(stdint.h unistd.h sys/int_types.h dlfcn.h inttypes.h sys/inttypes.h memory.h ndir.h stdlib.h strings.h string.h sys/mman.h sys/param.h sys/stat.h sys/types.h malloc.h)

+AC_CHECK_HEADERS(stdint.h unistd.h sys/int_types.h dlfcn.h inttypes.h sys/inttypes.h memory.h ndir.h stdlib.h strings.h string.h sys/mman.h sys/param.h sys/stat.h sys/types.h malloc.h poll.h)

 AC_TYPE_OFF_T

 AC_COMPILE_CHECK_SIZEOF(short)

 AC_COMPILE_CHECK_SIZEOF(int)

 AC_COMPILE_CHECK_SIZEOF(long)

+AC_CHECK_FUNCS(poll)

 have_pthreads=no

 AC_CHECK_HEADER(pthread.h,[have_pthreads=yes],)

@@ -533,6 +534,25 @@ else

     fi

 fi

+AC_MSG_CHECKING(Default FD_SETSIZE value)

+AC_TRY_RUN([

+#include <stdio.h>

+#include <unistd.h>

+#include <sys/time.h>

+#include <sys/select.h>

+#include <sys/types.h>

+main() {

+        FILE *fp = fopen("conftestval", "w");

+        fprintf (fp, "%d\n", FD_SETSIZE);

+        exit(0);

+}

+],

+DEFAULT_FD_SETSIZE=`cat conftestval`,

+DEFAULT_FD_SETSIZE=256,

+DEFAULT_FD_SETSIZE=256)

+AC_MSG_RESULT($DEFAULT_FD_SETSIZE)

+AC_DEFINE_UNQUOTED(DEFAULT_FD_SETSIZE, $DEFAULT_FD_SETSIZE, "default FD_SETSIZE value")

+

 AC_OUTPUT([

 libclamav/Makefile

 clamscan/Makefile