From 8aadadef4d74937ee05e3d61c646ae148d3fad40 Mon Sep 17 00:00:00 2001 From: Benjamin Dauvergne Date: Mon, 30 May 2011 22:24:39 +0200 Subject: [java] try to make test works under Mac Os X --- bindings/java/Makefile.am | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'bindings') diff --git a/bindings/java/Makefile.am b/bindings/java/Makefile.am index b3a28d09..f48f1189 100644 --- a/bindings/java/Makefile.am +++ b/bindings/java/Makefile.am @@ -55,7 +55,7 @@ com_entrouvert_lasso_LassoJNI.h: com/entrouvert/lasso/LassoJNI.class $(java_las libjnilasso_la_CFLAGS = -fno-strict-aliasing $(LASSO_CORE_CFLAGS) -I$(top_srcdir) -I$(top_builddir) $(AM_CFLAGS) @JAVA_INCLUDE@ libjnilasso_la_CFLAGS += -Wno-unused-parameter -libjnilasso_la_LDFLAGS = -export-dynamic -prefer-pic -module -avoid-version +libjnilasso_la_LDFLAGS = -export-dynamic -prefer-pic -module -avoid-version $(JNI_EXTRA_LDFLAGS) libjnilasso_la_LIBADD = $(top_builddir)/lasso/liblasso.la $(LASSO_LIBS) nodist_libjnilasso_la_SOURCES = com_entrouvert_lasso_LassoJNI.c @@ -105,8 +105,8 @@ AllJunitTests: JAVAFLAGS +="-Dsrcdir=$(srcdir)" AllJunitTests: $(test_source_files:.java=.class) echo "#! /bin/sh" > $@ echo "OBJDIR=`libtool --config | grep ^objdir | sed s/.*=//`" >> $@ - echo 'LD_LIBRARY_PATH=$$OBJDIR @JUNIT@ BindingTests' >> $@ - echo 'LD_LIBRARY_PATH=$$OBJDIR @JUNIT@ LoginTest' >> $@ + echo 'LD_LIBRARY_PATH=$$OBJDIR DYLD_LIBRARY_PATH=$$OBJDIR @JUNIT@ -Djava.library.path=$$OBJDIR BindingTests' >> $@ + echo 'LD_LIBRARY_PATH=$$OBJDIR DYLD_LIBRARY_PATH=$$OBJDIR @JUNIT@ -Djava.library.path=$$OBJDIR LoginTest' >> $@ chmod +x $@ endif -- cgit