From 0c6be1896f9ac3ad0659f3ccc60920642c104ace Mon Sep 17 00:00:00 2001 From: des Date: Wed, 8 Aug 2007 10:01:50 +0000 Subject: [PATCH] Remove FreeBSD workaround; the FreeBSD ports tree has had working autotools for two weeks now. Also fix inconsistent indentation. git-svn-id: svn+ssh://projects.linpro.no/svn/varnish/trunk@1811 d4fa192b-c00b-0410-8231-f00ffab90ce4 --- varnish-cache/autogen.sh | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/varnish-cache/autogen.sh b/varnish-cache/autogen.sh index 457a7d00..3800db0e 100755 --- a/varnish-cache/autogen.sh +++ b/varnish-cache/autogen.sh @@ -9,19 +9,17 @@ warn() { 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 @@ fi set -ex -aclocal ${FIX_BROKEN_FREEBSD_PORTS} +aclocal $LIBTOOLIZE --copy --force autoheader automake --add-missing --copy --foreign -- 2.39.5