r1811 - trunk/varnish-cache

[des at projects.linpro.no]

Author: des
Date: 2007-08-08 12:01:50 +0200 (Wed, 08 Aug 2007)
New Revision: 1811

Modified:
   trunk/varnish-cache/autogen.sh
Log:
Remove FreeBSD workaround; the FreeBSD ports tree has had working autotools
for two weeks now.  Also fix inconsistent indentation.


Modified: trunk/varnish-cache/autogen.sh
===================================================================
--- trunk/varnish-cache/autogen.sh	2007-08-08 08:49:11 UTC (rev 1810)
+++ trunk/varnish-cache/autogen.sh	2007-08-08 10:01:50 UTC (rev 1811)
@@ -9,19 +9,17 @@
 
 case `uname -s` in
 Darwin)
-	LIBTOOLIZE=glibtoolize
-	;;
+    LIBTOOLIZE=glibtoolize
+    ;;
 FreeBSD)
-	LIBTOOLIZE=libtoolize
-	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
-	;;
+    LIBTOOLIZE=libtoolize
+    ;;
 Linux)
-	LIBTOOLIZE=libtoolize
-	;;
+    LIBTOOLIZE=libtoolize
+    ;;
+*)
+    warn "unrecognized platform:" `uname -s`
+    LIBTOOLIZE=libtoolize
 esac
 
 automake_version=$(automake --version | tr ' ' '\n' | egrep '^[0-9]\.[0-9a-z.-]+')
@@ -39,7 +37,7 @@
 
 set -ex
 
-aclocal ${FIX_BROKEN_FREEBSD_PORTS}
+aclocal
 $LIBTOOLIZE --copy --force
 autoheader
 automake --add-missing --copy --foreign