idleconn is now built optionally with --enable-idleconn

httperf/ChangeLog

@@ -1,3 +1,8 @@
+2008-04-11  Ted Bullock <tbullock@canada.com>
+
+	* configure.ac, src/Makefile.am: Make automake compilation optional,
+	use --enable-idleconn. This will require libevent.
+
 2008-01-31  Ted Bullock <tbullock@canada.com>
 
 	* src/idleconn.c: Complete rewrite to use libevent backend; slight

httperf/NEWS

@@ -1,5 +1,6 @@
 * New in version 1.0.0
 ** Complete re-write of idleconn.c to use libevent notification system
+** idleconn is now optional (--enable-idleconn)
 
 * New in version 0.9.1:
 ** timer re-write to reduce memory and fix memory leaks 

httperf/configure.ac

@@ -18,8 +18,24 @@ AC_PROG_CC_C99
 AC_PROG_INSTALL
 AC_PROG_LIBTOOL
 
+# Are we building the idleconn program?
+AC_ARG_ENABLE([idleconn],
+	AS_HELP_STRING([--enable-idleconn],
+		[Build the idleconn program (default=no), requires libevent]),
+	[enable_idleconn=$enableval],
+	[enable_idleconn=no])
+
+AM_CONDITIONAL(IDLECONN, 
+	[test "x$enable_idleconn" = xyes])
+
+if test "x$enable_idleconn" = xyes; then
+	AC_CHECK_LIB([event],
+		[event_init],
+		,
+		AC_MSG_ERROR([libevent is required to build idleconn]) )
+fi
+
 # Checks for libraries.
-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_MSG_WARN([SSL Disabled]) )

httperf/src/Makefile.am

@@ -3,11 +3,16 @@ SUBDIRS = gen lib stat
 # what flags you want to pass to the C compiler & linker
 AM_CFLAGS = -I$(srcdir) -I$(srcdir)/gen -I$(srcdir)/lib -I$(srcdir)/stat
 
-bin_PROGRAMS = httperf idleconn
+bin_PROGRAMS = httperf
+
+if IDLECONN
+bin_PROGRAMS += idleconn
+idleconn_SOURCES = idleconn.c
+idleconn_LDADD = lib/libutil.a
+endif
+
 httperf_SOURCES = httperf.c httperf.h object.c object.h call.c call.h conn.c \
   conn.h sess.c sess.h core.c core.h localevent.c localevent.h http.c http.h \
   timer.c timer.h
-idleconn_SOURCES = idleconn.c
 
-idleconn_LDADD = lib/libutil.a
 httperf_LDADD = gen/libgen.a lib/libutil.a stat/libstat.a