Move m4 scripts to m4 dir

[lttng-ust.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 77b212cd7091d3c0b805059db0b8d72cd50f2cce..99868a62eee849300af4d7b3421db04c271e58b5 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -3,15 +3,16 @@ dnl Process this file with autoconf to produce a configure script.
 
 dnl Version infos
 m4_define([V_MAJOR], [2])
-m4_define([V_MINOR], [9])
+m4_define([V_MINOR], [10])
 m4_define([V_PATCH], [0])
 m4_define([V_EXTRA], [rc1])
 m4_define([V_STRING], [V_MAJOR.V_MINOR.V_PATCH])
 m4_ifdef([V_EXTRA], [m4_append([V_STRING], [-V_EXTRA])])
-m4_define([V_NAME], [[Joannès]])
-m4_define([V_DESC], [[Berliner Weisse style beer from the Trèfle Noir microbrewery in Rouyn-Noranda.]])
+m4_define([V_NAME], [[KeKriek]])
+m4_define([V_DESC], [[From Brasserie Dunham, a sour mashed golden wheat ale fermented with local sour cherries from Tougas orchards. Fresh sweet cherry notes with some tartness, lively carbonation with a dry finish.]])
 
-AC_INIT([lttng-ust], V_STRING, [mathieu dot desnoyers at efficios dot com])
+AC_PREREQ(2.59)
+AC_INIT([lttng-ust], V_STRING, [mathieu dot desnoyers at efficios dot com], [], [https://lttng.org])
 
 # Following the numbering scheme proposed by libtool for the library version
 # http://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html
@@ -27,7 +28,7 @@ AC_SUBST([LTTNG_UST_CTL_LIBRARY_VERSION], [3:0:1])
 AC_CONFIG_AUX_DIR([config])
 AC_CANONICAL_TARGET
 AC_CANONICAL_HOST
-AC_CONFIG_MACRO_DIR([config])
+AC_CONFIG_MACRO_DIR([m4])
 AM_INIT_AUTOMAKE([1.9 foreign dist-bzip2 no-dist-gzip tar-ustar])
 AM_MAINTAINER_MODE([enable])
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
@@ -61,7 +62,7 @@ AC_ARG_ENABLE([libtool-linkdep-fixup], [
 ])
 
 AS_IF([test "x$libtool_fixup" = "xyes"], [
-       libtool_m4="$srcdir/config/libtool.m4"
+       libtool_m4="$srcdir/m4/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)