Mailing List Archive

Author: des
Date: 2006-04-03 16:20:41 +0200 (Mon, 03 Apr 2006)
New Revision: 101

Added:
trunk/varnish-cache/contrib/Makefile.am
Modified:
trunk/varnish-cache/Makefile.am
trunk/varnish-cache/autogen.sh
trunk/varnish-cache/configure.ac
Log:
Hook up libevent to the build. Note that this should be made conditional at
some later date.

Modified: trunk/varnish-cache/Makefile.am
===================================================================
--- trunk/varnish-cache/Makefile.am 2006-04-03 14:04:16 UTC (rev 100)
+++ trunk/varnish-cache/Makefile.am 2006-04-03 14:20:41 UTC (rev 101)
@@ -1,3 +1,3 @@
# $Id$

-SUBDIRS = include lib bin
+SUBDIRS = contrib include lib bin

Modified: trunk/varnish-cache/autogen.sh
===================================================================
--- trunk/varnish-cache/autogen.sh 2006-04-03 14:04:16 UTC (rev 100)
+++ trunk/varnish-cache/autogen.sh 2006-04-03 14:20:41 UTC (rev 101)
@@ -8,8 +8,13 @@
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

Modified: trunk/varnish-cache/configure.ac
===================================================================
--- trunk/varnish-cache/configure.ac 2006-04-03 14:04:16 UTC (rev 100)
+++ trunk/varnish-cache/configure.ac 2006-04-03 14:20:41 UTC (rev 101)
@@ -63,14 +63,16 @@

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

Added: trunk/varnish-cache/contrib/Makefile.am
===================================================================
--- trunk/varnish-cache/contrib/Makefile.am 2006-04-03 14:04:16 UTC (rev 100)
+++ trunk/varnish-cache/contrib/Makefile.am 2006-04-03 14:20:41 UTC (rev 101)
@@ -0,0 +1,3 @@
+# $Id$
+
+SUBDIRS = libevent