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 0d79a4d6b91ab47401bf3972981a90f63d5fe698..b67cd4892c2267b06a125657be042b859fb6afc2 100644 (file)
--- 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 b5c0ee3487708b899854ffb92741c5ef713a2e86..d8330d3173464270d74b72cc8c4b90e1af692281 100755 (executable)
--- 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 0d06cf806870fe81c298f630c3ef4ae9c0d35727..231ea1d36166d1f634790418763352150ed4f9d9 100644 (file)
--- 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 (file)
index 0000000..ac5264a
--- /dev/null
+++ b/varnish-cache/contrib/Makefile.am
@@ -0,0 +1,3 @@
+# $Id$
+
+SUBDIRS = libevent