configure.ac: move AC_PROG_SED() close to other AC_PROG_*()

[lttng-ust.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index c428cf9d0e681b7e23057dd42cda9944d8ef6a3c..0642b20121370b3cee610eee6309497984a5fb42 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -40,13 +40,14 @@ AH_TEMPLATE([LTTNG_UST_HAVE_SDT_INTEGRATION], [SystemTap integration via sdt.h])
 AH_TEMPLATE([LTTNG_UST_HAVE_PERF_EVENT], [Perf event integration via perf_event.h])
 
 dnl Substitute minor/major/patchlevel version numbers
-AC_PROG_SED
 AC_SUBST([MAJOR_VERSION], [V_MAJOR])
 AC_SUBST([MINOR_VERSION], [V_MINOR])
 AC_SUBST([PATCHLEVEL_VERSION], [V_PATCH])
 
+AC_PROG_SED
 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],
@@ -210,9 +211,9 @@ AS_CASE([$host_cpu],
        [UST_SUPPORT_FOR_ARCH_PERF_EVENT_COUNTERS=no])
 AC_MSG_RESULT([$UST_SUPPORT_FOR_ARCH_PERF_EVENT_COUNTERS])
 
-AM_CONDITIONAL([HAVE_PERF_EVENT], [test "x$have_perf_event" = "xyes" -a "x$UST_SUPPORT_FOR_ARCH_PERF_EVENT_COUNTERS" = "xyes"])
+AM_CONDITIONAL([HAVE_PERF_EVENT], [test "x$have_perf_event" = "xyes" && test "x$UST_SUPPORT_FOR_ARCH_PERF_EVENT_COUNTERS" = "xyes"])
 
-AS_IF([test "x$have_perf_event" = "xyes" -a "x$UST_SUPPORT_FOR_ARCH_PERF_EVENT_COUNTERS" = "xyes"], [
+AS_IF([test "x$have_perf_event" = "xyes" && test "x$UST_SUPPORT_FOR_ARCH_PERF_EVENT_COUNTERS" = "xyes"], [
        AC_DEFINE([LTTNG_UST_HAVE_PERF_EVENT], [1])
 ])
 
@@ -356,7 +357,7 @@ AC_DEFINE_UNQUOTED([LTTNG_SYSTEM_RUNDIR], ["$lttng_system_rundir"],
        [LTTng system runtime directory])
 
 AC_CHECK_PROG([BUILD_GEN_TP_EXAMPLES],[python],["yes"])
-AM_CONDITIONAL([BUILD_GEN_TP_EXAMPLES], [test $BUILD_GEN_TP_EXAMPLES])
+AM_CONDITIONAL([BUILD_GEN_TP_EXAMPLES], [test "x$BUILD_GEN_TP_EXAMPLES" = "xyes"])
 
 AC_CONFIG_FILES([
        Makefile