diff options
| author | Pekka Nikander <pekka.nikander@senseg.com> | 2012-05-11 19:23:21 +0300 |
|---|---|---|
| committer | Uwe Hermann <uwe@hermann-uwe.de> | 2012-05-15 20:58:20 +0200 |
| commit | bdd820e3c0c2681b171fc7cc0198244f40a64b34 (patch) | |
| tree | a54b48fa6044216bddb9d21cd819084f5fc5df0a | |
| parent | 1cc590f73673ce209ae41d6aa42ffa9a60649415 (diff) | |
| download | libsigrokdecode-bdd820e3c0c2681b171fc7cc0198244f40a64b34.tar.gz libsigrokdecode-bdd820e3c0c2681b171fc7cc0198244f40a64b34.zip | |
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.
| -rwxr-xr-x | autogen.sh | 3 | ||||
| -rw-r--r-- | configure.ac | 1 |
2 files changed, 4 insertions, 0 deletions
@@ -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 0d7f710..f42f0f4 100644 --- a/configure.ac +++ b/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. */]) |