From: des <des@d4fa192b-c00b-0410-8231-f00ffab90ce4>
Date: Tue, 5 Dec 2006 11:42:39 +0000 (+0000)
Subject: Better workaround for FreeBSD autotools brokenness.
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f8387979ca4aac6cb2b9102be2e2a3d7ab173bd0;p=varnish

Better workaround for FreeBSD autotools brokenness.

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


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

diff --git a/varnish-cache/autogen.sh b/varnish-cache/autogen.sh
index 3c2df78d..7f1707c6 100755
--- a/varnish-cache/autogen.sh
+++ b/varnish-cache/autogen.sh
@@ -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 @@ fi
 
 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