X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=configure.ac;h=8fb84787f8cf73a4483fbe432cd134468fde11ab;hb=07b588658c677615fab1d116bcf0ecd644315c2d;hp=549d91a5829eae59ec4639b52f8b51a119f09ede;hpb=5744bf89f560d9b84515ccb2d12aef42877b4b1d;p=lttng-tools.git diff --git a/configure.ac b/configure.ac index 549d91a58..8fb84787f 100644 --- a/configure.ac +++ b/configure.ac @@ -24,20 +24,67 @@ AC_PROG_CC_STDC # Checks for programs. AC_PROG_GREP -AC_PROG_LEX AC_PROG_MAKE_SET AC_PROG_SED -AC_PROG_YACC -AC_PATH_PROG(report_fold, fold) +AC_PATH_PROG([report_fold], [fold]) LT_INIT # Check for objcopy, required by the base address statedump and dynamic linker tests -AC_CHECK_TOOL([OBJCOPY], objcopy, no) -AS_IF([test "x$OBJCOPY" = xno], - [AC_MSG_WARN([Cannont find objcopy. The base address statedump and dynamic linker tests will be disabled. Install the binutils package to remediate this.])] +AC_CHECK_TOOL([OBJCOPY], [objcopy], [no]) +AS_IF([test "x$OBJCOPY" = "xno"], + [AC_MSG_WARN([Cannot find objcopy. The base address statedump and dynamic linker tests will be disabled. Install the binutils package to remediate this.])] ) AM_CONDITIONAL([HAVE_OBJCOPY], [test "x$OBJCOPY" != xno]) +# check for pgrep +AC_PATH_PROG([PGREP], [pgrep], [no]) +AM_CONDITIONAL([HAVE_PGREP], [test "x$PGREP" != "xno"]) + +# check for bison +AC_PROG_YACC +BISON=$YACC +AX_PROG_BISON_VERSION([2.4], [have_bison=yes]) + +AS_IF([test "x$have_bison" != "xyes"], [ + AS_IF([test "x$in_git_repo" = "xyes"], [ + AC_MSG_FAILURE([ +Bison >= 2.4 is required when building from the Git repository. You can +set the YACC variable to override automatic detection. + ]) + ], [ + AC_MSG_WARN([ +Missing Bison >= 2.4. Note that the parser files are already built in +this distribution tarball, so Bison is only needed if you intend to +modify their sources. You can set the YACC variable to override automatic +detection. + ]) + ]) +]) +AM_CONDITIONAL([HAVE_BISON], [test "x$have_bison" = "xyes"]) + +# check for flex +AC_PROG_LEX +FLEX=$LEX +AX_PROG_FLEX_VERSION([2.5.35], [have_flex=yes]) + +AS_IF([test "x$have_flex" != "xyes"], [ + AS_IF([test "x$in_git_repo" = "xyes"], [ + AC_MSG_FAILURE([ +Flex >= 2.5.35 is required when building from the Git repository. You can +set the LEX variable to override automatic detection. + ]) + ], [ + AC_MSG_WARN([ +Missing Flex >= 2.5.35. Note that the lexer files are already built in +this distribution tarball, so Flex is only needed if you intend to +modify their sources. You can set the LEX variable to override automatic +detection. + ]) + ]) +]) +AM_CONDITIONAL([HAVE_FLEX], [test "x$have_flex" = "xyes"]) + + # Checks for typedefs, structures, and compiler characteristics. AC_C_INLINE AC_TYPE_INT32_T @@ -67,6 +114,16 @@ AS_CASE([$host_os], [cygwin*], [ LT_NO_UNDEFINED="-no-undefined" + ], + [cygwin*|darwin*|mingw*|solaris*], + [ + # On platforms where we only support the relayd, disable the other binaries by default + AS_IF([test "x$enable_bin_lttng" = "x" ], [enable_bin_lttng=no]) + AS_IF([test "x$enable_bin_lttng_consumerd" = "x" ], [enable_bin_lttng_consumerd=no]) + AS_IF([test "x$enable_bin_lttng_crash" = "x" ], [enable_bin_lttng_crash=no]) + AS_IF([test "x$enable_bin_lttng_sessiond" = "x" ], [enable_bin_lttng_sessiond=no]) + AS_IF([test "x$enable_extras" = "x" ], [enable_extras=no]) + AS_IF([test "x$with_lttng_ust" = "x" ], [with_lttng_ust=no]) ] ) @@ -132,6 +189,7 @@ AC_CHECK_FUNCS([ \ mkdir munmap putenv realpath rmdir socket strchr strcspn strdup \ strncasecmp strndup strnlen strpbrk strrchr strstr strtol strtoul \ strtoull dirfd gethostbyname2 getipnodebyname epoll_create1 \ + sched_getcpu sysconf sync_file_range ]) # Check if clock_gettime, timer_create, timer_settime, and timer_delete are available in lib rt, and if so, @@ -312,27 +370,24 @@ AC_DEFINE_UNQUOTED([CONFIG_LTTNG_SYSTEM_CONFIGDIR],"$CONFDIR", [LTTng system con AC_DEFINE_DIR([CONFIG_LTTNG_SYSTEM_DATADIR],[datadir], [LTTng system data directory.]) -# -# Check for pthread -AC_CHECK_LIB([pthread], [pthread_create], [], - [AC_MSG_ERROR([Cannot find libpthread. Use LDFLAGS=-Ldir to specify its location.])] -) - # Check libpopt PKG_CHECK_MODULES([POPT], [popt], - [LIBS="$LIBS $POPT_LIBS"], - [ - AC_MSG_WARN([pkg-config was unable to find a valid .pc for libpopt. Set PKG_CONFIG_PATH to specify the pkgconfig configuration file location]) - AC_MSG_WARN([Finding libpopt without pkg-config.]) - AC_CHECK_LIB([popt], - [poptGetContext], - [], - [ - AC_MSG_ERROR([Cannot find libpopt. Either set PKG_CONFIG_PATH to the configuration file location or use LDFLAGS=-Ldir to specify the library location]) - ] - ) - ] + [ + dnl PKG_CHECK_MODULES defines POPT_LIBS + ], + [ + AC_MSG_WARN([pkg-config was unable to find a valid .pc for libpopt. Set PKG_CONFIG_PATH to specify the pkgconfig configuration file location]) + AC_MSG_WARN([Finding libpopt without pkg-config.]) + AC_CHECK_LIB([popt], + [poptGetContext], + [POPT_LIBS="-lpopt"], + [ + AC_MSG_FAILURE([Cannot find libpopt. Either set PKG_CONFIG_PATH to the configuration file location or use LDFLAGS=-Ldir to specify the library location]) + ] + ) + ] ) +AC_SUBST(POPT_LIBS) PKG_CHECK_MODULES([libxml2], [libxml-2.0 >= 2.7.6]) @@ -464,7 +519,6 @@ AS_IF([test "x$with_lttng_ust" = "xyes"], AM_CONDITIONAL([HAVE_LIBLTTNG_UST_CTL], [test "x$with_lttng_ust" = "xyes"]) -AC_CHECK_FUNCS([sched_getcpu sysconf sync_file_range]) # check for dlopen AC_CHECK_LIB([dl], [dlopen], @@ -920,54 +974,6 @@ AM_CONDITIONAL([BUILD_LIB_SESSIOND_COMM], [test x$build_lib_sessiond_comm = xyes AM_CONDITIONAL([BUILD_LIB_TESTPOINT], [test x$build_lib_testpoint = xyes]) AM_CONDITIONAL([BUILD_LIB_UST_CONSUMER], [test x$build_lib_ust_consumer = xyes]) -# check for pgrep -AC_PATH_PROG([PGREP], [pgrep], [no]) -AM_CONDITIONAL([HAS_PGREP], [test "x$PGREP" != "xno"]) - -# check for bison -have_bison=yes - -AS_IF([test "x$(basename "$YACC")" != "xbison -y"], [have_bison=no]) -AC_PATH_PROG([BISON], [bison]) -AX_PROG_BISON_VERSION([2.4], [], [have_bison=no]) - -AS_IF([test "x$have_bison" = "xno"], [ - AS_IF([test "x$in_git_repo" = "xyes"], [ - AC_MSG_ERROR([Bison >= 2.4 is required when building from the Git repository.]) - ], [ - AC_MSG_WARN([ -Missing Bison >= 2.4. Note that the parser files are already built in -this distribution tarball, so Bison is only needed if you intend to -modify their sources. - ]) - ]) -]) - -# export bison condition -AM_CONDITIONAL([HAVE_BISON], [test "x$have_bison" = "xyes"]) - -# check for flex -have_flex=yes - -AS_IF([test "x$LEX" != "xflex"], [have_flex=no]) -AC_PATH_PROG([FLEX], [flex]) -AX_PROG_FLEX_VERSION([2.5.35], [], [have_flex=no]) - -AS_IF([test "x$have_flex" = "xno"], [ - AS_IF([test "x$in_git_repo" = "xyes"], [ - AC_MSG_ERROR([Flex >= 2.5.35 is required when building from the Git repository.]) - ], [ - AC_MSG_WARN([ -Missing Flex >= 2.5.35. Note that the lexer files are already built in -this distribution tarball, so Flex is only needed if you intend to -modify their sources. - ]) - ]) -]) - -# export flex condition -AM_CONDITIONAL([HAVE_FLEX], [test "x$have_flex" = "xyes"]) - AM_CFLAGS="-Wall -fno-strict-aliasing $PTHREAD_CFLAGS" AC_SUBST(AM_CFLAGS)