@@ -14534,6 +14534,7 @@ fi

 		ac_cv_findlib_CHECK_libs=

+		ac_cv_findlib_CHECK_ltlibs=

 		ac_cv_findlib_CHECK_inc=

 		if test "$have_header" = "yes"; then

@@ -14575,6 +14576,7 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

        $as_test_x conftest$ac_exeext; then

 					ac_cv_findlib_CHECK_libs="$LIBCHECK"

+					ac_cv_findlib_CHECK_ltlibs="$LTLIBCHECK"

 					ac_cv_findlib_CHECK_inc="$INCCHECK"

 else

@@ -14612,6 +14614,9 @@ cat >>confdefs.h <<\_ACEOF

 _ACEOF

 			HAVE_LIBCHECK=yes

+			LIBCHECK="$ac_cv_findlib_CHECK_libs"

+			LTLIBCHECK="$ac_cv_findlib_CHECK_ltlibs"

+			INCCHECK="$ac_cv_findlib_CHECK_libs"

 			CHECK_CPPFLAGS="$INCCHECK"; CHECK_LIBS="$LTLIBCHECK"

 fi

new file mode 100755

@@ -0,0 +1,30 @@

+#!/bin/sh

+CC=`which gcc`

+CFLAGS="-fstack-protector-all -D_FORTIFY_SOURCE=2 -O2 -Wformat -Wformat-security"

+LDFLAGS="-Wl,-z,relro"

+MAKEFLAGS="-j4"

+# disable valgrind & friends, we are testing with mudflap

+VALGRIND=

+LIBEFENCE=no

+LIBDUMA=no

+test -x "$CC" || { echo "these checks need gcc"; exit 1; }

+if test "X$NOMUDFLAP" != "X1"; then

+	# You can disable mudflap by setting NOMUDFLAP=1

+	CFLAGS="$CFLAGS -fmudflapth -pthread"

+	LDFLAGS="$LDFLAGS -lmudflapth"

+fi

+if test "X$NOPIE" != "X1"; then

+	# You can disable PIE by NOPIE = 1

+	CFLAGS="$CFLAGS -fPIE"

+	LDFLAGS="$LDFLAGS -pie"

+	CONF_FLAGS="ac_cv_findlib_CHECK_libs=-lcheck_pic ac_cv_findlib_CHECK_ltlibs=-lcheck_pic"

+fi

+

+rm -rf _build

+mkdir _build

+export CC CFLAGS LDFLAGS MAKEFLAGS VALGRIND LIBEFENCE LIBDUMA

+(cd _build &&

+../../../configure --disable-static --disable-clamav --enable-check $CONF_FLAGS &&

+make &&

+make check) &&

+rm -rf _build

@@ -711,12 +711,14 @@ AC_DEFUN([AC_LIB_FIND],

 		CPPFLAGS="$CPPFLAGS $INC[]NAME"

 		AC_CHECK_HEADER([$2], [have_header=yes],[have_header=no])

 		ac_cv_findlib_[]NAME[]_libs=

+		ac_cv_findlib_[]NAME[]_ltlibs=

 		ac_cv_findlib_[]NAME[]_inc=

 		AS_IF([test "$have_header" = "yes"],[

 				LIBS="$LIBS $LIB[]NAME"

 				AC_MSG_CHECKING([linking with $1])

 				AC_LINK_IFELSE([$3],[

 					ac_cv_findlib_[]NAME[]_libs="$LIB[]NAME"

+					ac_cv_findlib_[]NAME[]_ltlibs="$LTLIB[]NAME"

 					ac_cv_findlib_[]NAME[]_inc="$INC[]NAME"

 				])

 		])

@@ -731,6 +733,9 @@ AC_DEFUN([AC_LIB_FIND],

 			AC_MSG_NOTICE([Compiling and linking with $1 by using $ac_cv_findlib_[]NAME[]_inc $ac_cv_findlib_[]NAME[]_libs])

 			AC_DEFINE([HAVE_LIB]NAME,1,[Define to '1' if you have the $2 library])

 			HAVE_LIB[]NAME=yes

+			LIB[]NAME="$ac_cv_findlib_[]NAME[]_libs"

+			LTLIB[]NAME="$ac_cv_findlib_[]NAME[]_ltlibs"

+			INC[]NAME="$ac_cv_findlib_[]NAME[]_libs"

 			$4

 	])

 	undefine([NAME])	

@@ -13,7 +13,7 @@ killclamd() {

 	timeout=10

 	(sleep $timeout && kill -0 $pid 2>/dev/null && kill -KILL $pid) &

 	sleeperpid=$!

-	wait $pid

+	kill -0 $pid 2>/dev/null && wait $pid

 	kill $sleeperpid 2>/dev/null

 	rm -f /tmp/clamd-test.pid

 }

@@ -1,11 +1,13 @@

 #!/bin/sh

 # Run under duma

-for i in $LIBDUMA /usr/lib/libduma.so /usr/local/lib/libduma.so; do

-	if test -f "$i"; then

-		LIBDUMA="$i"

-		break;

-	fi

-done

+if test -z "$LIBDUMA"; then

+	for i in /usr/lib/libduma.so /usr/local/lib/libduma.so; do

+		if test -f "$i"; then

+			LIBDUMA="$i"

+			break;

+		fi

+	done

+fi

 test -f "$LIBDUMA" || { echo "*** duma not found, skipping test"; exit 77;}

 DUMA_FILL=90

 DUMA_MALLOC_0_STRATEGY=1

@@ -1,16 +1,19 @@

 #!/bin/sh

 # Run under electric-fence

-for i in $LIBEFENCE /usr/lib/libefence.so /usr/local/lib/libefence.so /opt/csw/lib/libefence.so; do

-	if test -f "$i"; then

-		LIBEFENCE="$i"

-		break;

-	fi

-done

+if test -z "$LIBEFENCE"; then

+	for i in /usr/lib/libefence.so /usr/local/lib/libefence.so /opt/csw/lib/libefence.so; do

+		if test -f "$i"; then

+			LIBEFENCE="$i"

+			break;

+		fi

+	done

+fi

 test -f "$LIBEFENCE" || { echo "*** electric-fence not found, skipping test"; exit 77;}

+EF_DISABLE_BANNER=1

 EF_FREE_WIPES=1

 LIBPRELOAD="$LIBEFENCE"

-export EF_FREE_WIPES LIBPRELOAD

+export EF_FREE_WIPES LIBPRELOAD EF_DISABLE_BANNER

 VALGRIND=`which ${VALGRIND-valgrind}`

 if test ! -n "$VALGRIND" -o ! -x "$VALGRIND"; then

 	# run check_clamav under efence only if we don't have valgrind installed