From 33b580b5f66dbe6fb1cfebfc00b41beec6da8e60 Mon Sep 17 00:00:00 2001 From: Luca Longinotti Date: Mon, 8 Jul 2013 12:19:59 +0200 Subject: [PATCH] Commit fixes for Mac OS X build. --- src/main/c/build/osx-x86.sh | 1 - src/main/c/build/osx-x86_64.sh | 1 - src/main/c/configure.ac | 2 +- 3 files changed, 1 insertion(+), 3 deletions(-) diff --git a/src/main/c/build/osx-x86.sh b/src/main/c/build/osx-x86.sh index d265188..4636bf6 100755 --- a/src/main/c/build/osx-x86.sh +++ b/src/main/c/build/osx-x86.sh @@ -12,6 +12,5 @@ ARCH="x86" CFLAGS="-arch i686" LIBUSB_CONFIG="--disable-shared" USB4JAVA_LIBS="-lobjc -Wl,-framework,IOKit -Wl,-framework,CoreFoundation" -LIBUSB="libusb" build diff --git a/src/main/c/build/osx-x86_64.sh b/src/main/c/build/osx-x86_64.sh index b1278aa..b98186a 100755 --- a/src/main/c/build/osx-x86_64.sh +++ b/src/main/c/build/osx-x86_64.sh @@ -12,6 +12,5 @@ ARCH="x86_64" CFLAGS="-arch x86_64" LIBUSB_CONFIG="--disable-shared" USB4JAVA_LIBS="-lobjc -Wl,-framework,IOKit -Wl,-framework,CoreFoundation" -LIBUSB="libusb" build diff --git a/src/main/c/configure.ac b/src/main/c/configure.ac index ef3377d..8818253 100644 --- a/src/main/c/configure.ac +++ b/src/main/c/configure.ac @@ -1,7 +1,7 @@ AC_PREREQ([2.61]) AC_INIT([libusb4java], [1.0.0], [k@ailis.de]) AM_INIT_AUTOMAKE([foreign -Wall -Werror]) -AM_SILENT_RULES(yes) +m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES(yes)]) AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_HEADERS([config.h]) AC_CONFIG_SRCDIR([src/usb4java.h])