X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=configure.ac;h=73c7b897e522e169437437bba582ffe90e2f6ca7;hb=167ff4df850ed5c954ee374db66a04b1c9a4ef34;hp=d4f879eb5f6f5d1664348fc728b9571a9555e3c4;hpb=135987a501181a84ffe5f1559a670ca8db57428c;p=lttng-ust.git diff --git a/configure.ac b/configure.ac index d4f879eb..73c7b897 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.6],[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,37 @@ 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]) + ]) + ]) + +AM_CONDITIONAL([NO_SHARED], [test "x$enable_shared" = "xno"]) # Checks for programs. AC_PROG_CC @@ -42,23 +73,7 @@ AC_PROG_MAKE_SET LT_INIT ## Checks for libraries. -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([dl], [dlopen]) AC_CHECK_LIB([pthread], [pthread_create]) # Check for libuuid @@ -75,7 +90,7 @@ AC_CHECK_LIB([uuid], [uuid_generate], have_libc_uuid=yes ], [ - AC_MSG_ERROR([Cannot find libuuid uuid_generate nor libc uuid_create. Use [LDFLAGS]=-Ldir to specify their location.]) + AC_MSG_ERROR([Cannot find libuuid uuid_generate nor libc uuid_create. Use [LDFLAGS]=-Ldir to specify its location.]) ]) ] ) @@ -106,13 +121,6 @@ AC_CHECK_FUNCS([gettimeofday munmap socket strerror strtol sched_getcpu sysconf] 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. @@ -161,6 +169,10 @@ got it [ust_cv_i386_is_x86_64=no]) CPPFLAGS="$save_CPPFLAGS"]) ;; + # All symbols must be resolved at link time on Cygwin/MinGW/Windows, + # else libtool will not be able to build shared libraries. + *-*-cygwin*) + LDFLAGS="-Wl,-no-undefined $LDFLAGS";; esac AC_MSG_CHECKING([library format for the host system]) @@ -175,7 +187,6 @@ changequote([,])dnl fi ;; x86_64) LIBFORMAT="elf64-x86-64" ;; - amd64) LIBFORMAT="elf64-x86-64" ;; powerpc) LIBFORMAT="elf32-powerpc" ;; ppc64) LIBFORMAT="elf64-powerpc" ;; powerpc64) LIBFORMAT="elf64-powerpc" ;; @@ -226,22 +237,6 @@ AS_IF([test $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]])], @@ -284,6 +279,15 @@ AS_IF([test "x$with_sdt" = "xyes"],[ #tests/exit-fast/Makefile #tests/basic_long/Makefile +# liblttng-ust-java/Makefile + +# Disabled for now, because these libraries +# rely on the dlsym(3) RTLD_NEXT GNU extension. +# This is not implemented in Cygwin. +#liblttng-ust-fork/Makefile +#liblttng-ust-libc-wrapper/Makefile +#tests/fork/Makefile + AC_CONFIG_FILES([ Makefile doc/Makefile @@ -295,16 +299,12 @@ AC_CONFIG_FILES([ liblttng-ust-comm/Makefile liblttng-ust/Makefile liblttng-ust-ctl/Makefile - 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 tests/hello.cxx/Makefile tests/demo/Makefile - tests/fork/Makefile tests/ust-basic-tracing/Makefile tests/ust-multi-test/Makefile lttng-ust.pc @@ -312,15 +312,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")])