Cleanup the JNI interface options in configure.ac
[lttng-ust.git] / configure.ac
index ff2fbee906d6217239ef3d9e57795b63bdd34a9d..454664f9c32811e80c7ea178029b338063a9b7b1 100644 (file)
@@ -1,34 +1,44 @@
 #                                               -*- Autoconf -*-
 # Process this file with autoconf to produce a configure script.
 
-#AC_PREREQ([2.63])
-AC_INIT([ust], [0.0], [pierre-marc dot fournier at polymtl dot ca])
+AC_INIT([lttng-ust],[1.9.0],[mathieu dot desnoyers at efficios dot com])
 AC_CONFIG_AUX_DIR([config])
 AC_CANONICAL_TARGET
 AC_CANONICAL_HOST
-AC_CONFIG_MACRO_DIR([m4])
+AC_CONFIG_MACRO_DIR([config])
 AM_INIT_AUTOMAKE([foreign])
-AC_CONFIG_SRCDIR([ustctl/ustctl.c])
-AC_CONFIG_HEADERS([config.h])
+m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
+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/patchlevel version numbers
+AC_PROG_SED
+major_version=$(echo AC_PACKAGE_VERSION | sed 's/^\([[0-9]]\)*\.[[0-9]]*\.[[0-9]]*$/\1/')
+minor_version=$(echo AC_PACKAGE_VERSION | sed 's/^[[0-9]]*\.\([[0-9]]*\)\.[[0-9]]*$/\1/')
+patchlevel_version=$(echo AC_PACKAGE_VERSION | sed 's/^[[0-9]]*\.[[0-9]]*\.\([[0-9]]*\)$/\1/')
+AC_SUBST([MAJOR_VERSION], [$major_version])
+AC_SUBST([MINOR_VERSION], [$minor_version])
+AC_SUBST([PATCHLEVEL_VERSION], [$patchlevel_version])
+AC_DEFINE_UNQUOTED([VERSION_MAJOR], $major_version, [UST major version number])
+AC_DEFINE_UNQUOTED([VERSION_MINOR], $minor_version, [UST minor version number])
+AC_DEFINE_UNQUOTED([VERSION_PATCHLEVEL], $patchlevel_version, [UST patchlevel version number])
+
 
 # Checks for programs.
 AC_PROG_CC
+AC_PROG_CXX
 AC_PROG_MAKE_SET
-AC_PROG_LIBTOOL
+LT_INIT
 
 ## Checks for libraries.
-## FIXME: Replace `main' with a function in `-ldl':
-#AC_CHECK_LIB([dl], [main])
-## FIXME: Replace `main' with a function in `-lmarkers':
-#AC_CHECK_LIB([markers], [main])
-## FIXME: Replace `main' with a function in `-lpthread':
-#AC_CHECK_LIB([pthread], [main])
-## FIXME: Replace `main' with a function in `-ltracectl':
-#AC_CHECK_LIB([tracectl], [main])
-## FIXME: Replace `main' with a function in `-ltracing':
-#AC_CHECK_LIB([tracing], [main])
-## FIXME: Replace `main' with a function in `-lurcu':
-#AC_CHECK_LIB([urcu], [main])
+AC_CHECK_LIB([dl], [dlopen])
+AC_CHECK_LIB([pthread], [pthread_create])
+
+# Check for libuuid
+AC_CHECK_LIB([uuid], [uuid_generate], [],
+       [AC_MSG_ERROR([Cannot find libuuid. Use [LDFLAGS]=-Ldir to specify its location.])]
+)
 
 # Checks for header files.
 #AC_CHECK_HEADERS([fcntl.h stdint.h stdlib.h string.h sys/socket.h sys/time.h unistd.h])
@@ -52,18 +62,44 @@ AC_C_INLINE
 AC_FUNC_MALLOC
 AC_CHECK_FUNCS([gettimeofday munmap socket strerror strtol])
 
+CFLAGS="-Wall $CFLAGS"
+
+# Check for texinfo, required for building the documentation
+# TODO: make this (and building the documentation) optional
+AC_CHECK_PROG([TEXINFO], [makeinfo], [yes])
+AS_IF([test "x$TEXINFO" != "xyes"],[
+       AC_MSG_ERROR([Please install the 'texinfo' program and make sure 'makeinfo' is in the PATH.])
+])
+
 # URCU
 
 # urcu - check if we just find the headers it out of the box.
 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_COMPILE_IFELSE([AC_LANG_PROGRAM([[
+#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], [], [AC_MSG_ERROR([Cannot find liburcu-bp lib. Use [LDFLAGS]=-Ldir to specify its location.])])
+AC_CHECK_LIB([urcu-bp], [synchronize_rcu_bp], [], [AC_MSG_ERROR([Cannot find liburcu-bp lib. Use [LDFLAGS]=-Ldir to specify its location.])])
 
-# kcompat
+# urcu - check that URCU lib is at least version 0.6
+AC_CHECK_LIB([urcu-bp], [call_rcu_bp], [], [AC_MSG_ERROR([liburcu 0.6 or newer is needed, please update your version or use [LDFLAGS]=-Ldir to specify the right location.])])
 
-AC_CHECK_HEADERS([kcompat.h], [], [AC_MSG_ERROR([Cannot find kcompat headers (kcompat.h). Use [CFLAGS]=-Idir to specify their location.])])
 
 # Check for various supplementary host information (beyond the
 # triplet) which might affect the library format choices.  E.g., we
@@ -98,29 +134,112 @@ changequote([,])dnl
          fi
          ;;
        x86_64) LIBFORMAT="elf64-x86-64" ;;
-       ppc) LIBFORMAT="elf32-powerpc" ;;
+       powerpc) LIBFORMAT="elf32-powerpc" ;;
        ppc64) LIBFORMAT="elf64-powerpc" ;;
-       s390) LIBFORMAT="elf32-s390" ;;
-       s390x) LIBFORMAT="elf64-s390" ;;
-       *) AC_MSG_ERROR([unable to detect library format (unsupported architecture?)]) ;;
+       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"; 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_MSG_RESULT($LIBFORMAT)
 
+if test "x$host_cpu" = "xarm" ; then
+AC_MSG_CHECKING([checking for armv5])
+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
+]], [[
+#ifndef __ARM_ARCH_5TEJ__
+#error "no arm5 here"
+#endif
+]])],[
+       AC_MSG_RESULT([yes])
+       NO_UNALIGNED_ACCESS=1
+
+],[
+       AC_MSG_RESULT([no])
+
+])
+fi
+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],
+       [AS_HELP_STRING([--with-java-jdk=DIR],[use the Java JDK in DIR. Ex : $JAVA_HOME.])],
+       [JAVA_JDK=$withval],
+       [JAVA_JDK=""]
+)
+AS_IF([test $JAVA_JDK],[
+       AS_IF([test -d $JAVA_JDK],[
+                AC_MSG_RESULT([using Java includes in $JAVA_SDK])
+                SUBDIRS=`find $JAVA_JDK/include -type d`
+               CFLAGS+=" "
+                CFLAGS+=`for x in $SUBDIRS; do echo -n "-I$x "; done`
+               CFLAGS+=" "
+        ],[
+                AC_MSG_ERROR(Unable to find Java include files in $JAVA_JDK)
+        ])
+])
+
+# Check for JNI header files if requested
+AC_ARG_WITH([jni-interface],
+       [AS_HELP_STRING([--with-jni-interface],[build JNI interface between C and Java. Needs Java include files [default=no]])],
+       [jni_interface=$withval],
+       [jni_interface=no]
+)
+
+AS_IF([test "x$jni_interface" = "xyes"],[
+        AC_CHECK_HEADERS([jni.h],[],[
+        AC_MSG_ERROR([missing jni.h
+Make sure Sun Java, OpenJDK or GCJ is installed and that this header file exists in the system path.
+Use the --with-java-jdk=DIR flag to point to your Java include files, or disable the JNI interface.])
+       ])
+])
+AM_CONDITIONAL([BUILD_JNI_INTERFACE], [test "x$jni_interface" = "xyes"])
+
+#currently disabled.
+       #liblttng-ust-malloc/Makefile
+       #tests/hello2/Makefile
+       #tests/basic/Makefile
+       #tests/simple_include/Makefile
+       #tests/snprintf/Makefile
+       #tests/test-nevents/Makefile
+       #tests/test-libustinstr-malloc/Makefile
+       #tests/dlopen/Makefile
+       #tests/same_line_marker/Makefile
+       #tests/trace_event/Makefile
+       #tests/tracepoint/Makefile
+       #tests/tracepoint/benchmark/Makefile
+       #tests/register_test/Makefile
+       #tests/libustctl_function_#tests/Makefile
+       #tests/exit-fast/Makefile
+       #tests/basic_long/Makefile
+
 AC_CONFIG_FILES([
        Makefile
        include/Makefile
-       libust/Makefile
+       include/lttng/ust-version.h
+       doc/Makefile
+       doc/man/Makefile
+       doc/info/Makefile
+       snprintf/Makefile
+       libringbuffer/Makefile
+       liblttng-ust-comm/Makefile
+       liblttng-ust/Makefile
+       liblttng-ust-ctl/Makefile
+       liblttng-ust-fork/Makefile
+       liblttng-ust-java/Makefile
        tests/Makefile
        tests/hello/Makefile
-       tests/hello2/Makefile
-       tests/basic/Makefile
-       tests/basic_long/Makefile
+       tests/hello.cxx/Makefile
+       tests/demo/Makefile
        tests/fork/Makefile
-       tests/simple_include/Makefile
-       libmallocwrap/Makefile
-       libinterfork/Makefile
-       ustd/Makefile
-       ustctl/Makefile
+       tests/ust-basic-tracing/Makefile
+       tests/ust-multi-test/Makefile
+       lttng-ust.pc
 ])
 AC_OUTPUT
This page took 0.025411 seconds and 4 git commands to generate.