x86_64) LIBFORMAT="elf64-x86-64" ;;
powerpc) LIBFORMAT="elf32-powerpc" ;;
ppc64) LIBFORMAT="elf64-powerpc" ;;
- s390) LIBFORMAT="elf32-s390" ;;
- s390x) LIBFORMAT="elf64-s390" ;;
+ s390) LIBFORMAT="elf32-s390"; NO_UNALIGNED_ACCESS=1 ;;
+ s390x) LIBFORMAT="elf64-s390"; NO_UNALIGNED_ACCESS=1 ;;
armv5) LIBFORMAT="elf32-littlearm"; NO_UNALIGNED_ACCESS=1 ;;
- arm) LIBFORMAT="elf32-littlearm" ;;
- mips*) LIBFORMAT="" ;;
+ arm) LIBFORMAT="elf32-littlearm"; NO_UNALIGNED_ACCESS=1 ;;
+ mips*) LIBFORMAT=""; NO_UNALIGNED_ACCESS=1;;
*) AC_MSG_ERROR([unable to detect library format (unsupported architecture ($host_cpu)?)]) ;;
esac
AC_SUBST(LIBFORMAT)
AC_DEFINE([HAVE_EFFICIENT_UNALIGNED_ACCESS], [1])
fi
+# Set compile flags to java include files if given
+AC_ARG_WITH(java_jdk, [ --with-java-jdk=DIR use java jdk from DIR. Ex : $JAVA_HOME.], JAVA_SDK=$withval,)
+if test $JAVA_SDK; then
+ if test -d $JAVA_SDK; then
+ AC_MSG_RESULT([using java include in $JAVA_SDK])
+ SUBDIRS=`find $JAVA_SDK/include -type d`
+ CFLAGS+=" "
+ CFLAGS+=`for x in $SUBDIRS; do echo -n "-I$x "; done`
+ CFLAGS+=" "
+ else
+ AC_MSG_ERROR(Unable to find java include file in $JAVA_JDK)
+ fi
+fi
+
+# Check for JNI header files if requested
+AC_ARG_WITH(jni-interface, [ --with-jni-interface build JNI interface between C and java. Need java include files.
+ [[default=no]]])
+
+if test -z "$with_jni_interface"; then
+ with_jni_interface=${with_jni_interface_default-no}
+fi
+
+if test "$with_jni_interface" = "yes"; then
+ AC_CHECK_HEADERS([jni.h],,AC_MSG_ERROR([
+missing jni.h
+Make sure Sun Java or OpenJDK or GCJ is installed and that this header file exists in the system path.
+Use --with-java-jdk=DIR flag to point to your java include files or desactivate the JNI interface.]))
+fi
+AM_CONDITIONAL(BUILD_JNI_INTERFACE, test "$with_jni_interface" = "yes")
+
AC_CONFIG_FILES([
Makefile
doc/Makefile
doc/man/Makefile
doc/info/Makefile
include/Makefile
+ liblttng-ust-comm/Makefile
libringbuffer/Makefile
libust/Makefile
tests/Makefile
snprintf/Makefile
ust.pc
include/ust/version.h
+ libustjava/Makefile
])
AC_OUTPUT