From bcd4e47e8cc688d2a04c6fbfde1e0a354405f769 Mon Sep 17 00:00:00 2001 From: Daniel Elstner Date: Mon, 24 Aug 2015 21:09:47 +0200 Subject: [PATCH] Build: Reduce autogen.sh to trivial stub Use autoreconf instead of invoking the various Auto tools separately. Get rid of the Darwin-specific guesswork -- it does not make sense to handle this at the level of libsigrokdecode. People should set up their ACLOCAL_PATH themselves as appropriate for their own system; just as they already need to set up various other paths. --- autogen.sh | 34 +++++----------------------------- 1 file changed, 5 insertions(+), 29 deletions(-) diff --git a/autogen.sh b/autogen.sh index 93441ed..f55f4ef 100755 --- a/autogen.sh +++ b/autogen.sh @@ -1,8 +1,8 @@ -#!/bin/sh +#!/bin/sh -e ## ## This file is part of the libsigrokdecode project. ## -## Copyright (C) 2010 Bert Vermeulen +## Copyright (C) 2010-2012 Bert Vermeulen ## ## This program is free software: you can redistribute it and/or modify ## it under the terms of the GNU General Public License as published by @@ -18,31 +18,7 @@ ## along with this program. If not, see . ## -OS=`uname` - -LIBTOOLIZE=libtoolize - -if [ "x$OS" = "xDarwin" ]; then - LIBTOOLIZE=glibtoolize - if [ -d /sw/share/aclocal ]; then - # fink installs aclocal macros here - ACLOCAL_DIR="-I /sw/share/aclocal" - elif [ -d /opt/local/share/aclocal ]; then - # Macports installs aclocal macros here - ACLOCAL_DIR="-I /opt/local/share/aclocal" - elif [ -d /usr/local/share/aclocal ]; then - # Homebrew installs aclocal macros here - ACLOCAL_DIR="-I /usr/local/share/aclocal" - elif [ -d /usr/share/aclocal ]; then - # Xcode installs aclocal macros here - ACLOCAL_DIR="-I /usr/share/aclocal" - fi -fi - -echo "Generating build system..." -${LIBTOOLIZE} --install --copy --quiet || exit 1 -aclocal ${ACLOCAL_DIR} || exit 1 -autoheader || exit 1 -automake --add-missing --copy || exit 1 -autoconf || exit 1 +test -n "$srcdir" || srcdir=`dirname "$0"` +test -n "$srcdir" || srcdir=. +autoreconf --force --install --verbose "$srcdir" -- 2.30.2