diff --git a/httperf/ChangeLog b/httperf/ChangeLog
index 743f06b..6ada95a 100755
--- a/httperf/ChangeLog
+++ b/httperf/ChangeLog
@@ -1,6 +1,10 @@
 2007-06-03  Ted Bullock <tbullock@canada.com>
 
-	* configure.ac: Remove uneccessary configuration cruft and configure httperf
+	* configure.ac: Add configuration to use libevent
+
+2007-06-03  Ted Bullock <tbullock@canada.com>
+
+	* configure.ac: Remove unnecessary  configuration cruft and configure httperf
 	to be built in c99 mode
 
 2007-05-27  Ted Bullock <tbullock@canada.com>
diff --git a/httperf/configure.ac b/httperf/configure.ac
index 1aa6886..e21cac3 100755
--- a/httperf/configure.ac
+++ b/httperf/configure.ac
@@ -27,14 +27,15 @@ AC_PROG_INSTALL
 AC_PROG_LIBTOOL
 
 # Checks for libraries.
-AC_CHECK_LIB(event, event_init) 
+AC_CHECK_LIB(event, event_init, , AC_MSG_ERROR([libevent is required to build httperf]) ) 
 AC_CHECK_LIB(m, sqrt)
 AC_CHECK_LIB(crypto, main)
-AC_CHECK_LIB(ssl, SSL_version)
+AC_CHECK_LIB(ssl, SSL_version, , AC_MSG_WARN([SSL Disabled]), [-lcrypto -ldl -lz] )
 # The following checks are for solaris and its ilk
-AC_CHECK_LIB(socket, getsockopt)
-AC_CHECK_LIB(nsl, socket)
-AC_CHECK_LIB(resolv, inet_aton)
+AC_SEARCH_LIBS([getsockopt], [socket])
+AC_SEARCH_LIBS([socket], [socket nsl])
+AC_SEARCH_LIBS([gethostbyname], [socket nsl])
+AC_SEARCH_LIBS([inet_aton], [resolv])
 
 # Checks for header files.
 AC_FUNC_ALLOCA