X-Git-Url: https://sigrok.org/gitweb/?p=libsigrokdecode.git;a=blobdiff_plain;f=autogen.sh;h=7cdf22f8708605b92c1eea5181df8eb8749b80ba;hp=a49d17b63fcde65964ba465882b7d1f1c5a1229d;hb=04ff49263b0a462250d2301e6d4d17db5904a8d3;hpb=63d62a5c6aa3c66b6b3c0662155752ccb123ee23 diff --git a/autogen.sh b/autogen.sh index a49d17b..7cdf22f 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 libsigrokdecode 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