X-Git-Url: https://sigrok.org/gitweb/?p=sigrok-cli.git;a=blobdiff_plain;f=autogen.sh;h=9c29256169152c3c9fecbaa3f25cd59ab10e9711;hp=a49d17b63fcde65964ba465882b7d1f1c5a1229d;hb=2be182e6437fb082aedca653fdc106d702518db0;hpb=948eb829cc0a446afd2b2f5599a7ab903a1f3955 diff --git a/autogen.sh b/autogen.sh index a49d17b..9c29256 100755 --- a/autogen.sh +++ b/autogen.sh @@ -1,6 +1,6 @@ #!/bin/sh ## -## This file is part of the sigrok project. +## This file is part of the sigrok-cli project. ## ## Copyright (C) 2010 Bert Vermeulen ## @@ -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