From: Philippe Proulx Date: Mon, 29 Feb 2016 18:08:53 +0000 (-0500) Subject: configure.ac: standardize indentation to tabs X-Git-Tag: v2.8.0-rc1~15 X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=86adb855ec08ae28bc29ee5dac70b759b4022816;p=lttng-ust.git configure.ac: standardize indentation to tabs Signed-off-by: Philippe Proulx Signed-off-by: Mathieu Desnoyers --- diff --git a/configure.ac b/configure.ac index 0642b201..312a1432 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -dnl -*- Autoconf -*- +dnl -*- Autoconf -*- dnl Process this file with autoconf to produce a configure script. dnl Version infos @@ -11,7 +11,7 @@ m4_ifdef([V_EXTRA], [m4_append([V_STRING], [-V_EXTRA])]) m4_define([V_NAME], [[Herbe à Détourne]]) m4_define([V_DESC], [[Brewed with unrestrained amounts of Citra hop, the Herbe à Détourne is a fantastic New World Tripel brewed by "Dieu du Ciel!". Aromas of mango, cantaloupe melon and passion fruit, combined with a controlled bitter finish, unite in making this smooth golden-orange beer stand apart.]]) -AC_INIT([lttng-ust],V_STRING,[mathieu dot desnoyers at efficios dot com]) +AC_INIT([lttng-ust], V_STRING, [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 @@ -49,28 +49,28 @@ AC_PROG_GREP AC_PROG_LN_S # 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]) - ]) - ]) +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"]) @@ -82,26 +82,31 @@ LT_INIT # rw_PROG_CXX_WORKS # Check whether the C++ compiler works. -AC_CACHE_CHECK([whether the C++ compiler works], - [rw_cv_prog_cxx_works], - [AC_LANG_PUSH([C++]) - AC_LINK_IFELSE([AC_LANG_PROGRAM([], [])], - [check_cxx_designated_initializers=yes], - [rw_cv_prog_cxx_works=no]) - AS_IF([test "x$check_cxx_designated_initializers" = "xyes"], [ - AC_COMPILE_IFELSE([AC_LANG_SOURCE([[ - struct foo { int a; int b; }; - void fct(void) - { - struct foo f = { .a = 0, .b = 1 }; - } - ]])],[ - rw_cv_prog_cxx_works=yes - ],[ - rw_cv_prog_cxx_works=no - ]) +AC_CACHE_CHECK([whether the C++ compiler works], [rw_cv_prog_cxx_works], [ + AC_LANG_PUSH([C++]) + + AC_LINK_IFELSE([AC_LANG_PROGRAM([], [])], [ + check_cxx_designated_initializers=yes + ], [ + rw_cv_prog_cxx_works=no + ]) + + AS_IF([test "x$check_cxx_designated_initializers" = "xyes"], [ + AC_COMPILE_IFELSE([AC_LANG_SOURCE([[ + struct foo { int a; int b; }; + void fct(void) + { + struct foo f = { .a = 0, .b = 1 }; + } + ]])], [ + rw_cv_prog_cxx_works=yes + ], [ + rw_cv_prog_cxx_works=no ]) - AC_LANG_POP([C++])]) + ]) + + AC_LANG_POP([C++]) +]) AM_CONDITIONAL([CXX_WORKS], [test "x$rw_cv_prog_cxx_works" = "xyes"]) @@ -113,20 +118,17 @@ AS_IF([test "x${ax_cv_sys_weak_alias}" = "xno"], [ ]) # 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], - [ + 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"]) @@ -134,12 +136,15 @@ AC_CHECK_LIB([pthread], [pthread_create]) # Check for dlfcn.h AC_CHECK_HEADER([dlfcn.h]) -AS_IF([test "x${ac_cv_header_dlfcn_h}" = "xyes"], - [AC_CHECK_DECLS([RTLD_DI_LINKMAP],,, - [#define _GNU_SOURCE /* Required on Linux to get GNU extensions */ - #include ]) - ], - [ac_cv_have_decl_RTLD_DI_LINKMAP="no"]) +AS_IF([test "x${ac_cv_header_dlfcn_h}" = "xyes"], [ + AC_CHECK_DECLS([RTLD_DI_LINKMAP], [], [], [ + #define _GNU_SOURCE /* Required on Linux to get GNU extensions */ + #include + ]) +], [ + ac_cv_have_decl_RTLD_DI_LINKMAP="no" +]) + AM_CONDITIONAL([HAVE_DLINFO], [test "x${ac_cv_have_decl_RTLD_DI_LINKMAP}" = "xyes"]) # Checks for header files. @@ -179,18 +184,17 @@ liburcu-cds lib, part of Userspace RCU 0.7 or better. Use [LDFLAGS]=-Ldir to spe AC_MSG_CHECKING([caa_likely()]) AC_COMPILE_IFELSE([AC_LANG_SOURCE([[ -#include -void fct(void) -{ - if (caa_likely(1)) { + #include + 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]) - ]) # urcu - check that URCU lib is available to compilation @@ -244,34 +248,39 @@ AS_IF([test "x$NO_UNALIGNED_ACCESS" = "x"], [ ]) # Check for JNI header files if requested -AC_ARG_ENABLE([jni-interface], - [AS_HELP_STRING([--enable-jni-interface],[build JNI interface between C and Java. Needs Java include files [default=no]])], - [jni_interface=$enableval], - [jni_interface=no] -) +AC_ARG_ENABLE([jni-interface], [ + AS_HELP_STRING([--enable-jni-interface], [build JNI interface between C and Java. Needs Java include files [default=no]]) +], [ + jni_interface=$enableval +], [ + jni_interface=no +]) AM_CONDITIONAL([BUILD_JNI_INTERFACE], [test "x$jni_interface" = "xyes"]) -AC_ARG_ENABLE([java-agent-jul], - [AS_HELP_STRING([--enable-java-agent-jul],[build the LTTng UST Java agent with JUL support [default=no]])], - [java_agent_jul=$enableval], - [java_agent_jul=no] -) - -AC_ARG_ENABLE([java-agent-log4j], - [AS_HELP_STRING([--enable-java-agent-log4j],[build the LTTng UST Java agent with Log4j support [default=no]])], - [java_agent_log4j=$enableval], - [java_agent_log4j=no] -) +AC_ARG_ENABLE([java-agent-jul], [ + AS_HELP_STRING([--enable-java-agent-jul], [build the LTTng UST Java agent with JUL support [default=no]]) +], [ + java_agent_jul=$enableval +], [ + java_agent_jul=no +]) -AC_ARG_ENABLE([java-agent-all], - [AS_HELP_STRING([--enable-java-agent-all],[build the LTTng UST Java agent with all supported backends [default=no]])], - [java_agent_jul=$enableval - java_agent_log4j=$enableval], - [:] -) +AC_ARG_ENABLE([java-agent-log4j], [ + AS_HELP_STRING([--enable-java-agent-log4j], [build the LTTng UST Java agent with Log4j support [default=no]]) +], [ + java_agent_log4j=$enableval +], [ + java_agent_log4j=no +]) +AC_ARG_ENABLE([java-agent-all], [ + AS_HELP_STRING([--enable-java-agent-all], [build the LTTng UST Java agent with all supported backends [default=no]]) +], [ + java_agent_jul=$enableval + java_agent_log4j=$enableval +], [:]) AM_CONDITIONAL([BUILD_JAVA_AGENT], [test "x$java_agent_jul" = "xyes" || test "x$java_agent_log4j" = "xyes"]) AM_CONDITIONAL([BUILD_JAVA_AGENT_WITH_JUL], [test "x$java_agent_jul" = "xyes"]) @@ -294,69 +303,69 @@ AS_IF([test "x$jni_interface" = "xyes" || test "x$java_agent_jul" = "xyes" || te AS_IF([test "x$java_agent_log4j" = "xyes"], [ AX_CHECK_CLASSPATH - AX_CHECK_CLASS([org.apache.log4j.Logger]) - AS_IF([test "x$ac_cv_class_org_apache_log4j_Logger" = "xno"], [ AC_MSG_ERROR([The UST Java agent support for log4j was requested but the Log4j classes were not found. Please specify the location of the Log4j jar via the Java CLASSPATH e.g: export CLASSPATH="/path/to/log4j.jar"]) ]) ]) # Option to build the python agent -AC_ARG_ENABLE([python-agent], - [AS_HELP_STRING([--enable-python-agent],[build the LTTng UST Python agent [default=no]])], - [python_agent=$enableval], - [:] -) +AC_ARG_ENABLE([python-agent], [ + AS_HELP_STRING([--enable-python-agent], [build the LTTng UST Python agent [default=no]]) +], [ + python_agent=$enableval +], [:]) AM_CONDITIONAL([BUILD_PYTHON_AGENT], [test "x$python_agent" = "xyes"]) AS_IF([test "x$python_agent" = "xyes"], [ AM_PATH_PYTHON([2.7]) ]) # 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"] -) +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"],[ +AS_IF([test "x$with_sdt" = "xyes"], [ 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); - } - ]])],[ + #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_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_MSG_CHECKING([whether shared libraries are enabled]) -AS_IF([test "x$enable_shared" = "xyes"], - [ - AC_MSG_RESULT([yes]) - ], - [ - AC_MSG_RESULT([no]) - AC_MSG_ERROR([LTTng-UST requires shared libraries to be enabled]) - ]) +AS_IF([test "x$enable_shared" = "xyes"], [ + AC_MSG_RESULT([yes]) +], [ + AC_MSG_RESULT([no]) + AC_MSG_ERROR([LTTng-UST requires shared libraries to be enabled]) +]) -AC_ARG_WITH([lttng-system-rundir], - AS_HELP_STRING([--with-lttng-system-rundir], - [Location of the system directory where LTTng-UST expects the system-wide lttng-sessiond runtime files. The default is "/var/run/lttng".]), - [lttng_system_rundir="$withval"], - [lttng_system_rundir="/var/run/lttng"]) +AC_ARG_WITH([lttng-system-rundir], [ + AS_HELP_STRING([--with-lttng-system-rundir], [Location of the system directory where LTTng-UST expects the system-wide lttng-sessiond runtime files. The default is "/var/run/lttng".]), +], [ + lttng_system_rundir="$withval" +], [ + lttng_system_rundir="/var/run/lttng" +]) AC_DEFINE_UNQUOTED([LTTNG_SYSTEM_RUNDIR], ["$lttng_system_rundir"], - [LTTng system runtime directory]) + [LTTng system runtime directory]) -AC_CHECK_PROG([BUILD_GEN_TP_EXAMPLES],[python],["yes"]) +AC_CHECK_PROG([BUILD_GEN_TP_EXAMPLES], [python], ["yes"]) AM_CONDITIONAL([BUILD_GEN_TP_EXAMPLES], [test "x$BUILD_GEN_TP_EXAMPLES" = "xyes"]) AC_CONFIG_FILES([