configure.ac: add missing quotes in macro calls

[lttng-ust.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 9f238774304e550f6afb2d3934135c07aaded32e..e252c8ef82c8fa956a5b2642a19839400a155538 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,12 +1,15 @@
 #                                               -*- Autoconf -*-
 # Process this file with autoconf to produce a configure script.
 
+dnl Version infos
 m4_define([V_MAJOR], [2])
 m4_define([V_MINOR], [8])
 m4_define([V_PATCH], [0])
 m4_define([V_EXTRA], [pre])
 m4_define([V_STRING], [V_MAJOR.V_MINOR.V_PATCH])
 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])
 
@@ -42,21 +45,14 @@ AC_SUBST([MAJOR_VERSION], [V_MAJOR])
 AC_SUBST([MINOR_VERSION], [V_MINOR])
 AC_SUBST([PATCHLEVEL_VERSION], [V_PATCH])
 
-version_name="Herbe à Détourne"
-version_description='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.'
-version_description_c=$(echo $version_description | sed 's/"/\\"/g')
-
-AC_DEFINE_UNQUOTED([VERSION_NAME], ["$version_name"], [UST version name])
-AC_DEFINE_UNQUOTED([VERSION_DESCRIPTION], ["$version_description_c"], [UST version description])
-
 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,
+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)
+       [libtool_fixup=$enableval],
+       [libtool_fixup=yes])
 
 AS_IF([test "x$libtool_fixup" = "xyes"],
            [
@@ -306,7 +302,7 @@ fi
 if test "x$java_agent_log4j" = "xyes"; then
   AX_CHECK_CLASSPATH
 
-  AX_CHECK_CLASS(org.apache.log4j.Logger)
+  AX_CHECK_CLASS([org.apache.log4j.Logger])
 
   if test "x$ac_cv_class_org_apache_log4j_Logger" = "xno"; then
      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"])
@@ -423,36 +419,36 @@ AC_CONFIG_LINKS([
 
 AC_OUTPUT
 
+AS_ECHO(["m4_bpatsubst(V_NAME, ["], [\\"])"])
 AS_ECHO()
-AS_ECHO("Version name: $version_name")
-AS_ECHO("$version_description")
+AS_ECHO(["m4_bpatsubst(V_DESC, ["], [\\"])"])
 
 # Report on the configuration options
 AS_ECHO()
-AS_ECHO("LTTng-UST will be built with the following options:")
+AS_ECHO(["LTTng-UST will be built with the following options:"])
 
 AS_ECHO()
 
-AS_ECHO_N("Java agent (JUL support): ")
-AS_IF([test "x$java_agent_jul" = "xyes"], [AS_ECHO("Enabled")], [AS_ECHO("Disabled")])
+AS_ECHO_N(["Java agent (JUL support): "])
+AS_IF([test "x$java_agent_jul" = "xyes"], [AS_ECHO(["Enabled"])], [AS_ECHO(["Disabled"])])
 
-AS_ECHO_N("Java agent (Log4j support): ")
-AS_IF([test "x$java_agent_log4j" = "xyes"], [AS_ECHO("Enabled")], [AS_ECHO("Disabled")])
+AS_ECHO_N(["Java agent (Log4j support): "])
+AS_IF([test "x$java_agent_log4j" = "xyes"], [AS_ECHO(["Enabled"])], [AS_ECHO(["Disabled"])])
 
-AS_ECHO_N("JNI interface (JNI): ")
-AS_IF([test "x$jni_interface" = "xyes"], [AS_ECHO("Enabled")], [AS_ECHO("Disabled")])
+AS_ECHO_N(["JNI interface (JNI): "])
+AS_IF([test "x$jni_interface" = "xyes"], [AS_ECHO(["Enabled"])], [AS_ECHO(["Disabled"])])
 
-AS_ECHO_N("Python ($PYTHON) agent: ")
-AS_IF([test "x$python_agent" = "xyes"], [AS_ECHO("Enabled")], [AS_ECHO("Disabled")])
+AS_ECHO_N(["Python ($PYTHON) agent: "])
+AS_IF([test "x$python_agent" = "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")])
+AS_ECHO_N(["sdt.h integration: "])
+AS_IF([test "x$with_sdt" = "xyes"], [AS_ECHO(["Enabled"])], [AS_ECHO(["Disabled"])])
 
-AS_ECHO("Architecture: $host_cpu")
-AS_ECHO_N("Efficient unaligned memory access: ")
-AS_IF([test "x$NO_UNALIGNED_ACCESS" != "x1"], [AS_ECHO("yes")], [AS_IF([test "x$UNSUPPORTED_ARCH" != "x1"], [AS_ECHO("no")], [AS_ECHO("unknown")])])
+AS_ECHO(["Architecture: $host_cpu"])
+AS_ECHO_N(["Efficient unaligned memory access: "])
+AS_IF([test "x$NO_UNALIGNED_ACCESS" != "x1"], [AS_ECHO(["yes"])], [AS_IF([test "x$UNSUPPORTED_ARCH" != "x1"], [AS_ECHO(["no"])], [AS_ECHO(["unknown"])])])
 AS_IF([test "x$UNSUPPORTED_ARCH" = "x1"], [AC_MSG_WARN([Your architecture ($host_cpu) is unsupported, using safe default of no unaligned access])])
 AS_ECHO()
 
-AS_ECHO("Type 'make' to compile.")
+AS_ECHO(["Type 'make' to compile."])