BLAHAJ
/
libsigrok
10
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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.
This commit is contained in:
Pekka Nikander 2012-05-11 19:23:21 +03:00 committed by Uwe Hermann
parent 40cd2b545d
commit 432e5e95f5
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
autogen.sh
View File

@ -32,6 +32,9 @@ if [ "x$OS" = "xDarwin" ]; then
elif [ -d /opt/local/share/aclocal ]; then elif [ -d /opt/local/share/aclocal ]; then
# Macports installs aclocal macros here # Macports installs aclocal macros here
ACLOCAL_DIR="-I /opt/local/share/aclocal" 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 elif [ -d /usr/share/aclocal ]; then
# Xcode installs aclocal macros here # Xcode installs aclocal macros here
ACLOCAL_DIR="-I /usr/share/aclocal" ACLOCAL_DIR="-I /usr/share/aclocal"

1
configure.ac
View File

@ -35,6 +35,7 @@ AC_CONFIG_AUX_DIR([autostuff])
# We require at least automake 1.11 (needed for 'silent rules'). # We require at least automake 1.11 (needed for 'silent rules').
AM_INIT_AUTOMAKE([1.11 -Wall -Werror foreign std-options]) AM_INIT_AUTOMAKE([1.11 -Wall -Werror foreign std-options])
m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
m4_ifdef([AM_PROG_AR], [AM_PROG_AR])
AH_TOP([#ifndef SR_CONFIG_H AH_TOP([#ifndef SR_CONFIG_H
#define SR_CONFIG_H /* To stop multiple inclusions. */]) #define SR_CONFIG_H /* To stop multiple inclusions. */])