From: des <des@d4fa192b-c00b-0410-8231-f00ffab90ce4>
Date: Mon, 3 Apr 2006 14:20:41 +0000 (+0000)
Subject: Hook up libevent to the build.  Note that this should be made conditional at
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dea21f29017ad5c3aa490ccc38512b0e3c1d6070;p=varnish

Hook up libevent to the build.  Note that this should be made conditional at
some later date.

git-svn-id: svn+ssh://projects.linpro.no/svn/varnish/trunk@101 d4fa192b-c00b-0410-8231-f00ffab90ce4
---

diff --git a/varnish-cache/Makefile.am b/varnish-cache/Makefile.am
index 0d79a4d6..b67cd489 100644
--- a/varnish-cache/Makefile.am
+++ b/varnish-cache/Makefile.am
@@ -1,3 +1,3 @@
 # $Id$
 
-SUBDIRS = include lib bin
+SUBDIRS = contrib include lib bin
diff --git a/varnish-cache/autogen.sh b/varnish-cache/autogen.sh
index b5c0ee34..d8330d31 100755
--- a/varnish-cache/autogen.sh
+++ b/varnish-cache/autogen.sh
@@ -8,8 +8,13 @@ if [ -d /usr/local/gnu-autotools/bin ] ; then
 	export PATH
 fi
 
-aclocal
-libtoolize --copy --force
-autoheader
-automake --add-missing --copy --force --foreign
-autoconf
+base=$(cd $(dirname $0) && pwd)
+for dir in $base $base/contrib/libevent ; do
+	echo $dir
+	cd $dir
+	aclocal
+	libtoolize --copy --force
+	autoheader
+	automake --add-missing --copy --force --foreign
+	autoconf
+done
diff --git a/varnish-cache/configure.ac b/varnish-cache/configure.ac
index 0d06cf80..231ea1d3 100644
--- a/varnish-cache/configure.ac
+++ b/varnish-cache/configure.ac
@@ -63,14 +63,16 @@ AC_CHECK_FUNCS([socket])
 
 AC_CONFIG_FILES([
     Makefile
+    bin/Makefile
+    bin/varnishd/Makefile
+    bin/varnishlog/Makefile
+    contrib/Makefile
     include/Makefile
     lib/Makefile
     lib/libsbuf/Makefile
     lib/libvarnish/Makefile
     lib/libvarnishapi/Makefile
     lib/libvcl/Makefile
-    bin/Makefile
-    bin/varnishd/Makefile
-    bin/varnishlog/Makefile
 ])
+AC_CONFIG_SUBDIRS(contrib/libevent)
 AC_OUTPUT
diff --git a/varnish-cache/contrib/Makefile.am b/varnish-cache/contrib/Makefile.am
new file mode 100644
index 00000000..ac5264ad
--- /dev/null
+++ b/varnish-cache/contrib/Makefile.am
@@ -0,0 +1,3 @@
+# $Id$
+
+SUBDIRS = libevent