X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=autogen.sh;h=b7641413eca8b9aa79c73f30439ac3774d304ce2;hb=HEAD;hp=4e40330587f71ce685b901e9dbb1980a3316d3a3;hpb=c547f69e7c62a49368da12b6717e2569efb4cc8a;p=sigrok-firmware-fx2lafw.git diff --git a/autogen.sh b/autogen.sh index 4e403305..b7641413 100755 --- a/autogen.sh +++ b/autogen.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/sh -e ## ## This file is part of the sigrok-firmware-fx2lafw project. ## @@ -15,32 +15,10 @@ ## GNU General Public License for more details. ## ## You should have received a copy of the GNU General Public License -## along with this program; if not, write to the Free Software -## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA +## along with this program; if not, see . ## -OS=`uname` - -if [ "x$OS" = "xDarwin" ]; then - 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..." -mkdir -p autostuff -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"