entrouvert
/
lasso
16
0
Fork 0
Code Issues Pull Requests Releases Activity

[java] try to make test works under Mac Os X

This commit is contained in:
Benjamin Dauvergne 2011-05-30 22:24:39 +02:00
parent 9cedec628e
commit 8aadadef4d
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
bindings/java/Makefile.am
View File

@ -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

7
configure.ac
View File

@ -322,6 +322,12 @@ else
JAVA_VERSION=""
fi
dnl Support JNI under MacOsX
case $host_os in
*-darwin*)
JNI_EXTRA_LDFLAGS="-shrext .jnilib" ;;
esac
dnl Conditional java sub dir test.
AM_CONDITIONAL([JAVA_ENABLED],[test "x$enable_java" = "xyes"])
AM_CONDITIONAL([JUNIT_ENABLED],[test "x$JUNIT" != "x"])
@ -332,6 +338,7 @@ AC_SUBST(JAVA_INCLUDE)
AC_SUBST(CLASSPATH_OPT)
JDK_INCLUDE=$JAVA_INCLUDE
AC_SUBST(JDK_INCLUDE)
AC_SUBST(JNI_EXTRA_LDFLAGS)
# --------------