r1229 - trunk/varnish-cache

[des at projects.linpro.no]

Author: des
Date: 2006-12-05 12:42:39 +0100 (Tue, 05 Dec 2006)
New Revision: 1229

Modified:
   trunk/varnish-cache/autogen.sh
Log:
Better workaround for FreeBSD autotools brokenness.

Pointy hat to:	{ade,portsmgr}@freebsd.org


Modified: trunk/varnish-cache/autogen.sh
===================================================================
--- trunk/varnish-cache/autogen.sh	2006-12-05 09:41:16 UTC (rev 1228)
+++ trunk/varnish-cache/autogen.sh	2006-12-05 11:42:39 UTC (rev 1229)
@@ -6,6 +6,7 @@
 if [ -d /usr/local/gnu-autotools/bin ] ; then
 	PATH=/usr/local/gnu-autotools/bin:${PATH}
 	export PATH
+	FIX_BROKEN_FREEBSD_PORTS="-I /usr/local/share/aclocal"
 fi
 
 automake_version=$(automake --version | tr ' ' '\n' | egrep '^[0-9]\.[0-9a-z.-]+')
@@ -26,12 +27,7 @@
 
 set -ex
 
-if [ "x`uname -s`" = "xFreeBSD" ] ; then
-	# Ask DES
-	aclocal -I /usr/local/share/aclocal
-else
-	aclocal 
-fi
+aclocal ${FIX_BROKEN_FREEBSD_PORTS}
 libtoolize --copy --force
 autoheader
 automake --add-missing --copy --foreign