sr/srd/cli: Fix compiling with Homebrew.

Add ACLOCAL_DIR setting and AM_PROG_AR macro for compiling with Homebrew
under Mac OS X.

Applies essentially the same change to
{libsigrok,libsigrokdecode,sigrok-cli}/{autogen.sh,configure.ac}

It may be that the same fix is needed for the other autogen.sh and/or
configure.ac files, but that hasn't been tested and therefore not in
this commit.

diff --git a/autogen.sh b/autogen.sh
index a49d17b63fcde65964ba465882b7d1f1c5a1229d..8185af0ff59805251307db641375ef434859b667 100755 (executable)
--- a/autogen.sh
+++ b/autogen.sh
@@ -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"

diff --git a/configure.ac b/configure.ac
index bfa4536020fe4c904718680f871670fae6bc73bf..412ac2603e99109c25b50734f9b036c2168355c7 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -32,6 +32,7 @@ AC_CONFIG_AUX_DIR([autostuff])
 # We require at least automake 1.11 (needed for 'silent rules').
 AM_INIT_AUTOMAKE([1.11 -Wall -Werror foreign std-options])
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
+m4_ifdef([AM_PROG_AR], [AM_PROG_AR])
 
 AH_TOP([#ifndef SIGROK_CLI_CONFIG_H
 #define SIGROK_CLI_CONFIG_H    /* To stop multiple inclusions. */])