diff --git a/configure.in b/configure.in
index 2268a327..3f43b1b1 100644
--- a/configure.in
+++ b/configure.in
@@ -54,11 +54,18 @@ dnl Checks for library functions.
 AC_CHECK_FUNCS(gettimeofday)
 
 AC_SUBST(LIBOBJS)
+haveselect=no
 AC_CHECK_FUNCS(select, [haveselect=yes], )
 if test "x$haveselect" = "xyes" ; then
 	LIBOBJS="$LIBOBJS select.o"
 fi
 
+neederr=no
+AC_CHECK_FUNCS(warnx, , [neederr=yes])
+if test $neederr = yes; then
+   LIBOBJS="$LIBOBJS err.o"
+fi
+
 havekqueue=no
 if test "x$ac_cv_header_sys_event_h" = "xyes"; then
 	AC_CHECK_FUNCS(kqueue, [havekqueue=yes], )
diff --git a/sample/Makefile.am b/sample/Makefile.am
index f66bda38..c195d032 100644
--- a/sample/Makefile.am
+++ b/sample/Makefile.am
@@ -3,7 +3,7 @@ AUTOMAKE_OPTIONS = foreign no-dependencies
 LDADD = -L.. -levent
 CPPFPLAGS = -I..
 
-bin_PROGRAMS = event-test time-test
+noinst_PROGRAMS = event-test time-test
 
 event_test_sources = event-test.c
 time_test_sources = time-test.c