Mailing List Archive

Author: des
Date: 2007-02-20 09:46:48 +0100 (Tue, 20 Feb 2007)
New Revision: 1250

Modified:
branches/1.0/
branches/1.0/autogen.sh
Log:
r34125 at cat (orig r1229): des | 2006-12-05 12:42:39 +0100
Better workaround for FreeBSD autotools brokenness.

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




Property changes on: branches/1.0
___________________________________________________________________
Name: svk:merge
- d4fa192b-c00b-0410-8231-f00ffab90ce4:/trunk/varnish-cache:1228
+ d4fa192b-c00b-0410-8231-f00ffab90ce4:/trunk/varnish-cache:1229

Modified: branches/1.0/autogen.sh
===================================================================
--- branches/1.0/autogen.sh 2007-02-20 08:46:47 UTC (rev 1249)
+++ branches/1.0/autogen.sh 2007-02-20 08:46:48 UTC (rev 1250)
@@ -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