X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=configure.ac;h=8b79f9a9566b3809eced77d07ac392a1ab5b35c6;hb=90cefaa31af0a85593a155fba8570e04c653225a;hp=e0ed0b79d380087710cb48058f32944f577cebbc;hpb=1f9eff07ad19cfd5e1ac935c8711894e4b499e10;p=lttng-ust.git diff --git a/configure.ac b/configure.ac index e0ed0b79..8b79f9a9 100644 --- a/configure.ac +++ b/configure.ac @@ -1,7 +1,7 @@ # -*- Autoconf -*- # Process this file with autoconf to produce a configure script. -AC_INIT([lttng-ust],[1.9.6],[mathieu dot desnoyers at efficios dot com]) +AC_INIT([lttng-ust],[2.0.0-rc1],[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 @@ -18,15 +18,15 @@ 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/config.h]) -AH_TEMPLATE([HAVE_EFFICIENT_UNALIGNED_ACCESS], [Use efficient unaligned access.]) -AH_TEMPLATE([HAVE_SDT_INTEGRATION], [DTrace/GDB/SystemTap integration via sdt.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/') +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]) @@ -42,13 +42,45 @@ AC_PROG_MAKE_SET LT_INIT ## Checks for libraries. -AC_CHECK_LIB([dl], [dlopen]) +AC_CHECK_LIB([dl], [dlopen], +[ + have_libdl=yes +], +[ + #libdl not found, check for dlopen in libc. + AC_CHECK_LIB([c], [dlopen], + [ + have_libc_dl=yes + ], + [ + AC_MSG_ERROR([Cannot find dlopen in libdl nor libc. Use [LDFLAGS]=-Ldir to specify their location.]) + ]) +]) +AM_CONDITIONAL([LTTNG_UST_BUILD_WITH_LIBDL], [test "x$have_libdl" = "xyes"]) +AM_CONDITIONAL([LTTNG_UST_BUILD_WITH_LIBC_DL], [test "x$have_libc_dl" = "xyes"]) + 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.])] +AC_CHECK_LIB([uuid], [uuid_generate], +[ + AC_DEFINE_UNQUOTED([LTTNG_UST_HAVE_LIBUUID], 1, [Has libuuid support.]) + have_libuuid=yes +], +[ + # libuuid not found, check for uuid_create in libc. + AC_CHECK_LIB([c], [uuid_create], + [ + AC_DEFINE_UNQUOTED([LTTNG_UST_HAVE_LIBC_UUID], 1, [Has libc uuid support.]) + have_libc_uuid=yes + ], + [ + AC_MSG_ERROR([Cannot find libuuid uuid_generate nor libc uuid_create. Use [LDFLAGS]=-Ldir to specify their location.]) + ]) +] ) +AM_CONDITIONAL([LTTNG_UST_BUILD_WITH_LIBUUID], [test "x$have_libuuid" = "xyes"]) +AM_CONDITIONAL([LTTNG_UST_BUILD_WITH_LIBC_UUID], [test "x$have_libc_uuid" = "xyes"]) # Checks for header files. #AC_CHECK_HEADERS([fcntl.h stdint.h stdlib.h string.h sys/socket.h sys/time.h unistd.h]) @@ -70,7 +102,7 @@ AC_C_INLINE # Checks for library functions. AC_FUNC_MALLOC -AC_CHECK_FUNCS([gettimeofday munmap socket strerror strtol]) +AC_CHECK_FUNCS([gettimeofday munmap socket strerror strtol sched_getcpu sysconf]) CFLAGS="-Wall $CFLAGS" @@ -172,7 +204,7 @@ AC_COMPILE_IFELSE([AC_LANG_SOURCE([[ ]) fi if test x$NO_UNALIGNED_ACCESS = x ; then -AC_DEFINE([HAVE_EFFICIENT_UNALIGNED_ACCESS], [1]) +AC_DEFINE([LTTNG_UST_HAVE_EFFICIENT_UNALIGNED_ACCESS], [1]) fi # Set compile flags to java include files if given @@ -211,18 +243,26 @@ AM_CONDITIONAL([BUILD_JNI_INTERFACE], [test "x$jni_interface" = "xyes"]) # sdt.h integration AC_ARG_WITH([sdt], - [AS_HELP_STRING([--with-sdt],[provide DTrace, GDB and SystemTap integration via sdt.h [default=no]])], + [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_CHECK_HEADERS([sys/sdt.h], [ - AC_DEFINE([HAVE_SDT_INTEGRATION], [1]) + AC_MSG_CHECKING([STAP_PROBEV()]) + AC_COMPILE_IFELSE([AC_LANG_SOURCE([[ + #define SDT_USE_VARIADIC + #include + 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_ERROR([The sdt.h integration was requested -but this header file cannot be found. Make sure it is installed -or use CFLAGS=-I/path/ to specify a non-standard path to sys/sdt.h]) + 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 CFLAGS=-I/path/ to specify a non-standard path to sys/sdt.h]) ]) ]) @@ -245,6 +285,8 @@ or use CFLAGS=-I/path/ to specify a non-standard path to sys/sdt.h]) AC_CONFIG_FILES([ Makefile + doc/Makefile + doc/examples/Makefile include/Makefile include/lttng/ust-version.h snprintf/Makefile @@ -255,6 +297,7 @@ AC_CONFIG_FILES([ liblttng-ust-fork/Makefile liblttng-ust-java/Makefile liblttng-ust-libc-wrapper/Makefile + tools/Makefile tests/Makefile tests/hello/Makefile tests/hello-static-lib/Makefile