X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=autogen.sh;h=f683d318efbcf14d074abebd7ece39820a77ab57;hb=f0554946600a7db68f9ef33d25646f17562bf284;hp=a49d17b63fcde65964ba465882b7d1f1c5a1229d;hpb=dff75c0df1be07db2e63ef242e843c925779bddb;p=libsigrok.git diff --git a/autogen.sh b/autogen.sh index a49d17b6..f683d318 100755 --- a/autogen.sh +++ b/autogen.sh @@ -1,8 +1,8 @@ #!/bin/sh ## -## This file is part of the sigrok project. +## This file is part of the libsigrok 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 @@ -32,6 +32,9 @@ if [ "x$OS" = "xDarwin" ]; then 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" @@ -52,6 +55,6 @@ echo "Generating build system..." ${LIBTOOLIZE} --install --copy --quiet || exit 1 aclocal ${ACLOCAL_DIR} || exit 1 autoheader || exit 1 -automake --add-missing --copy --foreign || exit 1 +automake --add-missing --copy || exit 1 autoconf || exit 1