From: Pekka Nikander <redacted>
Date: Fri, 11 May 2012 16:23:21 +0000 (+0300)
Subject: sr/srd/cli: Fix compiling with Homebrew.
X-Git-Tag: libsigrok-0.1.1~17
X-Git-Url: https://sigrok.org/gitaction?a=commitdiff_plain;h=432e5e95f53cd61160c1013921743267d84a7dd2;p=libsigrok.git

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 0177bd3b..9ee4cd4c 100755
--- 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 88149d8b..d123c028 100644
--- a/configure.ac
+++ b/configure.ac
@@ -35,6 +35,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 SR_CONFIG_H
 #define SR_CONFIG_H    /* To stop multiple inclusions. */])