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.
---
libsigrok/autogen.sh | 3 +++
libsigrok/configure.ac | 1 +
libsigrokdecode/autogen.sh | 3 +++
libsigrokdecode/configure.ac | 1 +
sigrok-cli/autogen.sh | 3 +++
sigrok-cli/configure.ac | 1 +
6 files changed, 12 insertions(+)
diff --git a/libsigrok/autogen.sh b/libsigrok/autogen.sh
index 0177bd3..9ee4cd4 100755
--- a/libsigrok/autogen.sh
+++ b/libsigrok/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/libsigrok/configure.ac b/libsigrok/configure.ac
index 88149d8..d123c02 100644
--- a/libsigrok/configure.ac
+++ b/libsigrok/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. */])
diff --git a/libsigrokdecode/autogen.sh b/libsigrokdecode/autogen.sh
index a49d17b..8185af0 100755
--- a/libsigrokdecode/autogen.sh
+++ b/libsigrokdecode/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/libsigrokdecode/configure.ac b/libsigrokdecode/configure.ac
index 0d7f710..f42f0f4 100644
--- a/libsigrokdecode/configure.ac
+++ b/libsigrokdecode/configure.ac
@@ -36,6 +36,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 SRD_CONFIG_H
#define SRD_CONFIG_H /* To stop multiple inclusions. */])
diff --git a/sigrok-cli/autogen.sh b/sigrok-cli/autogen.sh
index a49d17b..8185af0 100755
--- a/sigrok-cli/autogen.sh
+++ b/sigrok-cli/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/sigrok-cli/configure.ac b/sigrok-cli/configure.ac
index bfa4536..412ac26 100644
--- a/sigrok-cli/configure.ac
+++ b/sigrok-cli/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. */])
--
1.7.9.4
------------------------------------------------------------------------------
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and
threat landscape has changed and how IT managers can respond. Discussions
will include endpoint security, mobile security and the latest in malware
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
_______________________________________________
sigrok-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/sigrok-devel
