X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=configure.ac;h=be93880c987813122ffef888d9eb00a293af05d4;hb=4318ae1be57eb7983ab4857a7a8eeb4a030a8216;hp=8594a4707c1a9f053b1950e877285dab6438465e;hpb=e26c8207a69086160542d1cdfedf9578d6385748;p=lttng-ust.git

diff --git a/configure.ac b/configure.ac
index 8594a470..be93880c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8,8 +8,8 @@ AC_CANONICAL_HOST
 AC_CONFIG_MACRO_DIR([config])
 AM_INIT_AUTOMAKE([foreign])
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
-AC_CONFIG_SRCDIR([ustctl/ustctl.c])
-AC_CONFIG_HEADERS([config.h include/ust/config.h])
+AC_CONFIG_SRCDIR([include/lttng/tracepoint.h])
+AC_CONFIG_HEADERS([config.h include/lttng/config.h])
 AH_TEMPLATE([HAVE_EFFICIENT_UNALIGNED_ACCESS], [Use efficient unaligned access.])
 # Compute minor/major version numbers
 major_version=`echo AC_PACKAGE_VERSION | sed 's/\..*//'`
@@ -59,6 +59,27 @@ CFLAGS="-Wall $CFLAGS"
 AC_CHECK_HEADERS([urcu-bp.h], [], [AC_MSG_ERROR([Cannot find [URCU] headers (urcu-bp.h). Use [CFLAGS]=-Idir to specify their location.
 This error can also occur when the liburcu package's configure script has not been run.])])
 
+AC_MSG_CHECKING([caa_likely()])
+AC_TRY_COMPILE(
+[
+#include <urcu/compiler.h>
+],
+[
+void fct(void)
+{
+	if (caa_likely(1)) {
+	}
+}
+],
+[
+	AC_MSG_RESULT([yes])
+],
+[
+	AC_MSG_RESULT([no])
+	AC_MSG_ERROR([Please upgrade your version of liburcu to 0.6.6 or better])
+]
+)
+
 # urcu - check that URCU lib is available to compilation
 AC_CHECK_LIB([urcu-bp], [synchronize_rcu_bp], [], [AC_MSG_ERROR([Cannot find liburcu-bp lib. Use [LDFLAGS]=-Ldir to specify its location.])])
 
@@ -101,11 +122,12 @@ changequote([,])dnl
 	x86_64) LIBFORMAT="elf64-x86-64" ;;
 	powerpc) LIBFORMAT="elf32-powerpc" ;;
 	ppc64) LIBFORMAT="elf64-powerpc" ;;
-	s390) LIBFORMAT="elf32-s390" ;;
-	s390x) LIBFORMAT="elf64-s390" ;;
+	powerpc64) LIBFORMAT="elf64-powerpc" ;;
+	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)
@@ -135,15 +157,50 @@ if test x$NO_UNALIGNED_ACCESS = x ; then
 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
+	libustctl/Makefile
 	tests/Makefile
 	tests/hello/Makefile
+	tests/ust-basic-tracing/Makefile
+	tests/ust-multi-test/Makefile
 	tests/hello2/Makefile
 	tests/basic/Makefile
 	tests/basic_long/Makefile
@@ -164,6 +221,7 @@ AC_CONFIG_FILES([
 	libustfork/Makefile
 	snprintf/Makefile
 	ust.pc
-	include/ust/version.h
+	include/lttng/version.h
+	libustjava/Makefile
 ])
 AC_OUTPUT