From d0bf561e05b085ba218aed2f8201d748111341ec Mon Sep 17 00:00:00 2001 From: Klaus Reimer Date: Thu, 27 Jan 2011 17:17:31 +0100 Subject: [PATCH] Improved build system. --- src/main/c/acinclude.m4 | 3 +-- src/main/c/configure.ac | 3 ++- src/main/c/src/Makefile.am | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main/c/acinclude.m4 b/src/main/c/acinclude.m4 index 01f2fff..63b2708 100644 --- a/src/main/c/acinclude.m4 +++ b/src/main/c/acinclude.m4 @@ -6,7 +6,6 @@ AC_DEFUN([AC_CHECK_JAVA],[ JAVA_HOME=`echo $withval` ] ) - CFLAGS="$CFLAGS -I$JAVA_HOME/include -I$JAVA_HOME/include/linux -I$JAVA_HOME/include/win32" - CPPFLAGS="$CPPFLAGS -I$JAVA_HOME/include -I$JAVA_HOME/include/linux -I$JAVA_HOME/include/win32" + CFLAGS="$CFLAGS -I$JAVA_HOME/include -I$JAVA_HOME/include/linux -I$JAVA_HOME/include/win32 -I/System/Library/Frameworks/JavaVM.framework/Headers" AC_CHECK_HEADERS(jni.h,,echo "ERROR: jni.h not found. JAVA_HOME is $JAVA_HOME. Use --with-java-home option to specify an other Java home directory."; exit 1;) ]) diff --git a/src/main/c/configure.ac b/src/main/c/configure.ac index 7c6a84e..2924a80 100644 --- a/src/main/c/configure.ac +++ b/src/main/c/configure.ac @@ -1,5 +1,5 @@ AC_INIT(configure.ac) -AM_INIT_AUTOMAKE(libusb4java, 1.0.0) +AM_INIT_AUTOMAKE(libusb4java, 0.1.12-1) AM_CONFIG_HEADER(config.h) AC_CONFIG_MACRO_DIR([m4]) @@ -8,6 +8,7 @@ AC_PROG_CC AM_PROG_LIBTOOL AC_CHECK_JAVA AC_CHECK_HEADERS(usb.h,,echo "ERROR: usb.h not found. Please install libusb"; exit 1;) +AC_SEARCH_LIBS(usb_init,usb usb0,,echo "ERROR: libusb not found. Please install libusb"; exit 1;) AC_CONFIG_FILES( Makefile diff --git a/src/main/c/src/Makefile.am b/src/main/c/src/Makefile.am index 6e8fc54..e1076a3 100644 --- a/src/main/c/src/Makefile.am +++ b/src/main/c/src/Makefile.am @@ -1,7 +1,8 @@ lib_LTLIBRARIES = libusb4java.la libusb4java_la_CFLAGS = -Wall -Werror -O2 -ansi -libusb4java_la_LIBADD = -lusb -libusb4java_la_LDFLAGS = -version-info 0:0:0 -no-undefined -lusb +libusb4java_la_LIBADD = +libusb4java_la_LDFLAGS = -version-info 0:0:0 -no-undefined +EXTRA_DIST = *.h libusb4java_la_SOURCES = \ USB.c \ USB_Bus.c \ @@ -13,4 +14,3 @@ libusb4java_la_SOURCES = \ USB_Interface_Descriptor.c \ USB_Endpoint_Descriptor.c \ USB_Descriptor_Header.c - \ No newline at end of file