X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=configure.ac;h=39530db4e0d16ae6213df9fe718c24266f4a455f;hb=29865d1ccafc065d07e0de67b196790ed36ab396;hp=8d4bfbc318e5ecdc27f9b6210949289aef97c658;hpb=e14a34e05f6dd7b5f1133085561313ad90b8f266;p=lttng-ust.git

diff --git a/configure.ac b/configure.ac
index 8d4bfbc3..39530db4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,32 +1,83 @@
 #                                               -*- 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],[2.0.5],[mathieu dot desnoyers at efficios dot com])
+
+# Following the numbering scheme proposed by libtool for the library version
+# http://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html
+AC_SUBST([LTTNG_UST_LIBRARY_VERSION], [0:0:0])
+# note: remember to update tracepoint.h dlopen() to match this version
+# number. TODO: eventually automate by exporting the major number.
+
 AC_CONFIG_AUX_DIR([config])
-AC_CONFIG_MACRO_DIR([m4])
-AM_INIT_AUTOMAKE([0.0 foreign dist-bzip2 no-dist-gzip])
-AC_CONFIG_SRCDIR([ust/ust.c])
-AC_CONFIG_HEADERS([config.h])
+AC_CANONICAL_TARGET
+AC_CANONICAL_HOST
+AC_CONFIG_MACRO_DIR([config])
+AM_INIT_AUTOMAKE([foreign dist-bzip2 no-dist-gzip])
+m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
+AC_CONFIG_SRCDIR([include/lttng/tracepoint.h])
+
+# Configuration options, which will be installed in the config.h
+AC_CONFIG_HEADERS([config.h include/lttng/ust-config.h])
+AH_TEMPLATE([LTTNG_UST_HAVE_EFFICIENT_UNALIGNED_ACCESS], [Use efficient unaligned access.])
+AH_TEMPLATE([LTTNG_UST_HAVE_SDT_INTEGRATION], [SystemTap integration via sdt.h])
+
+# 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])
+
+version_name="Annedd'ale"
+version_description="New type of beer, 100% from Quebec, flavored with sapin beaumier needles, with a touch of hops."
+AC_DEFINE_UNQUOTED([VERSION_NAME], [$version_name], [UST version name])
+AC_DEFINE_UNQUOTED([VERSION_DESCRIPTION], [$version_description], [UST version description])
+
+AC_PROG_GREP
+# libtool link_all_deplibs fixup. See http://bugs.lttng.org/issues/321.
+AC_ARG_ENABLE(libtool-linkdep-fixup,
+	AS_HELP_STRING([--disable-libtool-linkdep-fixup],
+			[disable the libtool fixup for linking all dependent libraries (link_all_deplibs)]),
+	libtool_fixup=$enableval,
+	libtool_fixup=yes)
+
+AS_IF([test "x$libtool_fixup" = "xyes"],
+	    [
+	    libtool_m4="$srcdir/config/libtool.m4"
+	    libtool_flag_pattern=".*link_all_deplibs\s*,\s*\$1\s*)"
+	    AC_MSG_CHECKING([for occurence(s) of link_all_deplibs = no in $libtool_m4])
+	    libtool_flag_pattern_count=$(grep -c "$libtool_flag_pattern\s*=\s*no" $libtool_m4)
+	    AS_IF([test $libtool_flag_pattern_count -ne 0],
+	    [
+		  AC_MSG_RESULT([$libtool_flag_pattern_count])
+		  AC_MSG_WARN([the detected libtool will not link all dependencies, forcing link_all_deplibs = unknown])
+		  sed -i "s/\($libtool_flag_pattern\)\s*=\s*no/\1=unknown/g" $libtool_m4
+		  ],
+		  [
+		  AC_MSG_RESULT([none])
+		  ])
+	    ])
 
 # 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])
@@ -48,39 +99,206 @@ AC_C_INLINE
 
 # Checks for library functions.
 AC_FUNC_MALLOC
-AC_CHECK_FUNCS([gettimeofday munmap socket strerror strtol])
-
-AC_ARG_WITH(urcu, [  --with-urcu path	Path to userspace RCU source], [
-	AC_CHECK_FILE(["$withval/urcu.h"], [
-		URCU_CFLAGS="-I$withval"
-		URCU_LIBS="-L$withval -lurcu" ],
-		AC_MSG_ERROR([Cannot find urcu.h in urcu directory]))
-], [
-	PKG_CHECK_MODULES(URCU, [liburcu], , [
-		AC_MSG_ERROR([Must specify urcu path.])])
+AC_CHECK_FUNCS([gettimeofday munmap socket strerror strtol sched_getcpu sysconf])
+
+CFLAGS="-Wall $CFLAGS"
+
+# 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 [CPPFLAGS]=-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_SOURCE([[
+#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])
+
 ])
-AC_SUBST(URCU_CFLAGS)
-AC_SUBST(URCU_LIBS)
-
-AC_ARG_WITH(kcompat, [  --with-kcompat path     Path to userspace kcompat source
-], [
-        AC_CHECK_FILE("$withval/kcompat.h", [
-                KCOMPAT_CFLAGS="-I$withval $URCU_CFLAGS"
-                KCOMPAT_LIBS=
-                ], AC_MSG_ERROR([Cannot find kcompat.h in kcompat directory]))
-], [
-        PKG_CHECK_MODULES(KCOMPAT, [libkcompat], , [
-		AC_MSG_ERROR([Must specify kcompat path.])])
+
+# 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.])])
+
+# 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.])])
+
+
+# Check for various supplementary host information (beyond the
+# triplet) which might affect the library format choices.  E.g., we
+# can be building with `i686-unknown-linux-gnu-gcc -m64'
+
+case "${host}" in
+changequote(,)dnl
+  i[34567]86-*-linux*)
+changequote([,])dnl
+    AC_CACHE_CHECK([if building for x86-64], [ust_cv_i386_is_x86_64],
+                    [save_CPPFLAGS="$CPPFLAGS"
+                    CPPFLAGS="$CPPFLAGS $CFLAGS"
+                    AC_EGREP_CPP([got it], [
+#if __x86_64__
+got it
+#endif
+                 ], [ust_cv_i386_is_x86_64=yes],
+                    [ust_cv_i386_is_x86_64=no])
+                    CPPFLAGS="$save_CPPFLAGS"])
+    ;;
+esac
+
+AC_MSG_CHECKING([library format for the host system])
+case $host_cpu in
+changequote(,)dnl
+	i[3456]86)
+changequote([,])dnl
+	  if test "$ust_cv_i386_is_x86_64" = yes ; then
+	     LIBFORMAT="elf64-x86-64"
+	  else
+	     LIBFORMAT="elf32-i386"
+	  fi
+	  ;;
+	x86_64) LIBFORMAT="elf64-x86-64" ;;
+	powerpc) LIBFORMAT="elf32-powerpc" ;;
+	ppc64) LIBFORMAT="elf64-powerpc" ;;
+	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_SOURCE([[
+#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([LTTNG_UST_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`
+		CPPFLAGS+=" "
+                CPPFLAGS+=`for x in $SUBDIRS; do echo -n "-I$x "; done`
+		CPPFLAGS+=" "
+        ],[
+                AC_MSG_ERROR(Unable to find Java include files in $JAVA_JDK)
+        ])
+])
+
+# sdt.h integration
+AC_ARG_WITH([sdt],
+	[AS_HELP_STRING([--with-sdt],[provide SystemTap integration via sdt.h [default=no]])],
+	[with_sdt=$withval],
+	[with_sdt="no"]
+)
+
+AS_IF([test "x$with_sdt" = "xyes"],[
+	AC_MSG_CHECKING([STAP_PROBEV()])
+	AC_COMPILE_IFELSE([AC_LANG_SOURCE([[
+	#define SDT_USE_VARIADIC
+	#include <sys/sdt.h>
+	void fct(void)
+	{
+		STAP_PROBEV(provider,name,1,2,3,4,5,6,7,8,9,10);
+	}
+	]])],[
+		AC_MSG_RESULT([yes])
+		AC_DEFINE([LTTNG_UST_HAVE_SDT_INTEGRATION], [1])
+	],[
+		AC_MSG_RESULT([no])
+		AC_MSG_ERROR([The sdt.h integration was requested but the STAP_PROBEV define cannot be used. Make sure it is installed, and up to date, or use CPPFLAGS=-I/path/ to specify a non-standard path to sys/sdt.h])
+	])
 ])
-AC_SUBST(KCOMPAT_CFLAGS)
-AC_SUBST(KCOMPAT_LIBS)
+
+#currently disabled.
+	#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
+
+#	liblttng-ust-java/Makefile
 
 AC_CONFIG_FILES([
 	Makefile
-	libust/Makefile
-	hello/Makefile
-	libmallocwrap/Makefile
-	ustd/Makefile
-	ust/Makefile
+	doc/Makefile
+	doc/examples/Makefile
+	include/Makefile
+	include/lttng/ust-version.h
+	snprintf/Makefile
+	libringbuffer/Makefile
+	liblttng-ust-comm/Makefile
+	liblttng-ust/Makefile
+	liblttng-ust-ctl/Makefile
+	liblttng-ust-fork/Makefile
+	liblttng-ust-libc-wrapper/Makefile
+	tools/Makefile
+	tests/Makefile
+	tests/hello/Makefile
+	tests/hello-static-lib/Makefile
+	tests/hello.cxx/Makefile
+	tests/demo/Makefile
+	tests/fork/Makefile
+	tests/ust-basic-tracing/Makefile
+	tests/ust-multi-test/Makefile
+	lttng-ust.pc
 ])
+
 AC_OUTPUT
+
+AS_ECHO()
+AS_ECHO("Version name: $version_name")
+AS_ECHO("$version_description")
+
+# Report on the configuration options
+AS_ECHO()
+AS_ECHO("LTTng-UST will be built with the following options:")
+AS_ECHO("Library format: $LIBFORMAT")
+
+AS_ECHO()
+AS_ECHO_N("sdt.h integration:  ")
+AS_IF([test "x$with_sdt" = "xyes"], [AS_ECHO("Enabled")], [AS_ECHO("Disabled")])
+
+AS_ECHO()
+AS_ECHO("Type 'make' to compile.")
+