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

+Fri Jul  4 18:04:40 CEST 2008 (tk)

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

+  * configure, clamd: fix compilation error on systems without

+		      pthread_yield() (bb#1058)

+

 Fri Jul  4 14:21:12 CEST 2008 (tk)

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

   * libclamav/dlp.c: improve detection of credit card numbers (bb#941)

@@ -210,6 +210,9 @@

 /* "pragma pack hppa/hp-ux style" */

 #undef HAVE_PRAGMA_PACK_HPPA

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

+#undef HAVE_PTHREAD_YIELD

+

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

 #undef HAVE_PWD_H

@@ -228,6 +231,9 @@

 /* Define signed right shift implementation */

 #undef HAVE_SAR

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

+#undef HAVE_SCHED_YIELD

+

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

 #undef HAVE_SENDMSG

@@ -344,8 +344,12 @@ static void *thrmgr_worker(void *arg)

 		if (job_data) threadpool->handler(job_data);

 		if (threadpool->state == POOL_STOP) break;

 	}

-	

+

+#ifdef HAVE_PTHREAD_YIELD

 	pthread_yield(); /* do not remove on premptive kernel e.g linux 2.6 */

+#elif HAVE_SCHED_YIELD

+	sched_yield();

+#endif

 	pthread_cleanup_pop(1);

 	return NULL;

 }

@@ -17210,6 +17210,104 @@ fi

 if test "$have_pthreads" = "yes"

 then

+    save_LIBS="$LIBS"

+    LIBS="$THREAD_LIBS $LIBS"

+

+

+for ac_func in sched_yield pthread_yield

+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 { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then

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

+else

+  cat >conftest.$ac_ext <<_ACEOF

+/* confdefs.h.  */

+_ACEOF

+cat confdefs.h >>conftest.$ac_ext

+cat >>conftest.$ac_ext <<_ACEOF

+/* end confdefs.h.  */

+/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.

+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */

+#define $ac_func innocuous_$ac_func

+

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

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

+    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since

+    <limits.h> exists even on freestanding compilers.  */

+

+#ifdef __STDC__

+# include <limits.h>

+#else

+# include <assert.h>

+#endif

+

+#undef $ac_func

+

+/* 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 $ac_func ();

+/* 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

+#endif

+

+int

+main ()

+{

+return $ac_func ();

+  ;

+  return 0;

+}

+_ACEOF

+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 "echo \"\$as_me:$LINENO: $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

+  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 &&

+       $as_test_x conftest$ac_exeext; then

+  eval "$as_ac_var=yes"

+else

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

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

+

+	eval "$as_ac_var=no"

+fi

+

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

+      conftest$ac_exeext conftest.$ac_ext

+fi

+ac_res=`eval echo '${'$as_ac_var'}'`

+	       { echo "$as_me:$LINENO: result: $ac_res" >&5

+echo "${ECHO_T}$ac_res" >&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

+

+    LIBS="$save_LIBS"

 cat >>confdefs.h <<\_ACEOF

 #define BUILD_CLAMD 1

@@ -962,6 +962,10 @@ AM_CONDITIONAL([ENABLE_UNRAR],[test "$want_unrar" = "yes"])

 if test "$have_pthreads" = "yes"

 then

+    save_LIBS="$LIBS"

+    LIBS="$THREAD_LIBS $LIBS"

+    AC_CHECK_FUNCS([sched_yield pthread_yield])

+    LIBS="$save_LIBS"

     AC_DEFINE([BUILD_CLAMD], 1, "build clamd")

 fi