X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=configure.ac;h=24ef9d35c6a498abda1e556c3d14ce5ef99c5810;hb=68571fb524160fd3a0a0c9a7ab8d99cb38153135;hp=00da3e8c6ac78bd3985a0a2846141347c8466ffe;hpb=67107619135ff344f0de2783ec2d48e558deaf9a;p=lttng-ust.git diff --git a/configure.ac b/configure.ac index 00da3e8c..24ef9d35 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],[2.0.0-rc1],[mathieu dot desnoyers at efficios dot com]) +AC_INIT([lttng-ust],[2.0.3],[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 @@ -13,7 +13,7 @@ AC_CONFIG_AUX_DIR([config]) AC_CANONICAL_TARGET AC_CANONICAL_HOST AC_CONFIG_MACRO_DIR([config]) -AM_INIT_AUTOMAKE([foreign]) +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]) @@ -34,6 +34,10 @@ 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]) # Checks for programs. AC_PROG_CC @@ -46,25 +50,9 @@ AC_CHECK_LIB([dl], [dlopen]) AC_CHECK_LIB([pthread], [pthread_create]) # Check for libuuid -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 its location.]) - ]) -] +AC_CHECK_LIB([uuid], [uuid_generate], [], + [AC_MSG_ERROR([Cannot find libuuid. Use [LDFLAGS]=-Ldir to specify its 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]) @@ -100,7 +88,7 @@ AS_IF([test "x$TEXINFO" != "xyes"],[ # 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. +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()]) @@ -201,30 +189,14 @@ 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+=" " + 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) ]) ]) -# 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"]) - # sdt.h integration AC_ARG_WITH([sdt], [AS_HELP_STRING([--with-sdt],[provide SystemTap integration via sdt.h [default=no]])], @@ -246,7 +218,7 @@ AS_IF([test "x$with_sdt" = "xyes"],[ 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 CFLAGS=-I/path/ to specify a non-standard path to sys/sdt.h]) + 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]) ]) ]) @@ -267,6 +239,8 @@ AS_IF([test "x$with_sdt" = "xyes"],[ #tests/exit-fast/Makefile #tests/basic_long/Makefile +# liblttng-ust-java/Makefile + AC_CONFIG_FILES([ Makefile doc/Makefile @@ -279,7 +253,6 @@ AC_CONFIG_FILES([ liblttng-ust/Makefile liblttng-ust-ctl/Makefile liblttng-ust-fork/Makefile - liblttng-ust-java/Makefile liblttng-ust-libc-wrapper/Makefile tools/Makefile tests/Makefile @@ -295,15 +268,16 @@ AC_CONFIG_FILES([ 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("Java support (JNI): ") -AS_IF([test "x$jni_interface" = "xyes"], [AS_ECHO("Enabled")], [AS_ECHO("Disabled")]) - AS_ECHO_N("sdt.h integration: ") AS_IF([test "x$with_sdt" = "xyes"], [AS_ECHO("Enabled")], [AS_ECHO("Disabled")])