From 10e2037396ae6bc7add2abb14322d78248e72fbe Mon Sep 17 00:00:00 2001 From: Michael Jeanson Date: Tue, 9 May 2017 14:46:38 -0400 Subject: [PATCH] Move m4 scripts to m4 dir Harmonize build system configuration across our projects. Signed-off-by: Michael Jeanson Signed-off-by: Mathieu Desnoyers --- .gitignore | 22 ++++++++++++++++++---- Makefile.am | 2 +- configure.ac | 7 ++++--- {config => m4}/ax_check_class.m4 | 0 {config => m4}/ax_check_classpath.m4 | 0 {config => m4}/ax_check_rqrd_class.m4 | 0 {config => m4}/ax_java_options.m4 | 0 {config => m4}/ax_jni_include_dir.m4 | 0 {config => m4}/ax_prog_jar.m4 | 0 {config => m4}/ax_prog_java.m4 | 0 {config => m4}/ax_prog_java_works.m4 | 0 {config => m4}/ax_prog_javac.m4 | 0 {config => m4}/ax_prog_javac_works.m4 | 0 {config => m4}/ax_prog_javah.m4 | 0 {config => m4}/ax_sys_weak_alias.m4 | 0 {config => m4}/ax_try_compile_java.m4 | 0 {config => m4}/ax_try_run_java.m4 | 0 17 files changed, 23 insertions(+), 8 deletions(-) rename {config => m4}/ax_check_class.m4 (100%) rename {config => m4}/ax_check_classpath.m4 (100%) rename {config => m4}/ax_check_rqrd_class.m4 (100%) rename {config => m4}/ax_java_options.m4 (100%) rename {config => m4}/ax_jni_include_dir.m4 (100%) rename {config => m4}/ax_prog_jar.m4 (100%) rename {config => m4}/ax_prog_java.m4 (100%) rename {config => m4}/ax_prog_java_works.m4 (100%) rename {config => m4}/ax_prog_javac.m4 (100%) rename {config => m4}/ax_prog_javac_works.m4 (100%) rename {config => m4}/ax_prog_javah.m4 (100%) rename {config => m4}/ax_sys_weak_alias.m4 (100%) rename {config => m4}/ax_try_compile_java.m4 (100%) rename {config => m4}/ax_try_run_java.m4 (100%) diff --git a/.gitignore b/.gitignore index e35e5d52..11cf3343 100644 --- a/.gitignore +++ b/.gitignore @@ -16,7 +16,7 @@ Makefile.in *.info cscope.* configure -aclocal.m4 +/aclocal.m4 autom4te.cache/ /config.h /include/lttng/config.h @@ -24,11 +24,25 @@ autom4te.cache/ /include/lttng/ust-version.h /include/lttng/ust-config.h /config.h.in -config/ +/config/compile +/config/config.guess +/config/config.sub +/config/config.sub +/config/depcomp +/config/depcomp +/config/install-sh +/config/ltmain.sh +/config/missing +/config/test-driver +/m4/libtool.m4 +/m4/lt~obsolete.m4 +/m4/ltoptions.m4 +/m4/ltsugar.m4 +/m4/ltversion.m4 config.log config.status -stamp-h1 -libtool +/stamp-h1 +/libtool lttng-ust.pc ustctl/ustctl diff --git a/Makefile.am b/Makefile.am index 232acd11..810761ca 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,4 +1,4 @@ -ACLOCAL_AMFLAGS = -I config +ACLOCAL_AMFLAGS = -I m4 SUBDIRS = . include snprintf libringbuffer liblttng-ust-comm \ liblttng-ust \ diff --git a/configure.ac b/configure.ac index 77b5db40..99868a62 100644 --- a/configure.ac +++ b/configure.ac @@ -11,7 +11,8 @@ m4_ifdef([V_EXTRA], [m4_append([V_STRING], [-V_EXTRA])]) 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) diff --git a/config/ax_check_class.m4 b/m4/ax_check_class.m4 similarity index 100% rename from config/ax_check_class.m4 rename to m4/ax_check_class.m4 diff --git a/config/ax_check_classpath.m4 b/m4/ax_check_classpath.m4 similarity index 100% rename from config/ax_check_classpath.m4 rename to m4/ax_check_classpath.m4 diff --git a/config/ax_check_rqrd_class.m4 b/m4/ax_check_rqrd_class.m4 similarity index 100% rename from config/ax_check_rqrd_class.m4 rename to m4/ax_check_rqrd_class.m4 diff --git a/config/ax_java_options.m4 b/m4/ax_java_options.m4 similarity index 100% rename from config/ax_java_options.m4 rename to m4/ax_java_options.m4 diff --git a/config/ax_jni_include_dir.m4 b/m4/ax_jni_include_dir.m4 similarity index 100% rename from config/ax_jni_include_dir.m4 rename to m4/ax_jni_include_dir.m4 diff --git a/config/ax_prog_jar.m4 b/m4/ax_prog_jar.m4 similarity index 100% rename from config/ax_prog_jar.m4 rename to m4/ax_prog_jar.m4 diff --git a/config/ax_prog_java.m4 b/m4/ax_prog_java.m4 similarity index 100% rename from config/ax_prog_java.m4 rename to m4/ax_prog_java.m4 diff --git a/config/ax_prog_java_works.m4 b/m4/ax_prog_java_works.m4 similarity index 100% rename from config/ax_prog_java_works.m4 rename to m4/ax_prog_java_works.m4 diff --git a/config/ax_prog_javac.m4 b/m4/ax_prog_javac.m4 similarity index 100% rename from config/ax_prog_javac.m4 rename to m4/ax_prog_javac.m4 diff --git a/config/ax_prog_javac_works.m4 b/m4/ax_prog_javac_works.m4 similarity index 100% rename from config/ax_prog_javac_works.m4 rename to m4/ax_prog_javac_works.m4 diff --git a/config/ax_prog_javah.m4 b/m4/ax_prog_javah.m4 similarity index 100% rename from config/ax_prog_javah.m4 rename to m4/ax_prog_javah.m4 diff --git a/config/ax_sys_weak_alias.m4 b/m4/ax_sys_weak_alias.m4 similarity index 100% rename from config/ax_sys_weak_alias.m4 rename to m4/ax_sys_weak_alias.m4 diff --git a/config/ax_try_compile_java.m4 b/m4/ax_try_compile_java.m4 similarity index 100% rename from config/ax_try_compile_java.m4 rename to m4/ax_try_compile_java.m4 diff --git a/config/ax_try_run_java.m4 b/m4/ax_try_run_java.m4 similarity index 100% rename from config/ax_try_run_java.m4 rename to m4/ax_try_run_java.m4 -- 2.39.5