From: Daniel Elstner Date: Wed, 26 Aug 2015 17:46:43 +0000 (+0200) Subject: Build: Reduce autogen.sh to trivial stub X-Git-Tag: libserialport-0.1.1~17 X-Git-Url: https://sigrok.org/gitaction?a=commitdiff_plain;h=ef08a6d52bf273e832691ff8121c5e5da37554af;p=libserialport.git 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 libserialport. 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. --- diff --git a/autogen.sh b/autogen.sh index 6d31db1..d40ec3d 100755 --- a/autogen.sh +++ b/autogen.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/sh -e ## ## This file is part of the libserialport project. ## @@ -19,31 +19,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"