summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWilliam A. Kennington III <wak@google.com>2018-06-19 18:32:09 -0700
committerWilliam A. Kennington III <wak@google.com>2018-06-27 10:11:38 -0700
commitc65d74eda8c30548635e7ba69914299efa132b28 (patch)
treefd4c243eae2ab445f229f7601b711ad18781a714
parentdd051e2768fa571abea41d2839c0bc0ebc97b944 (diff)
downloadsdbusplus-c65d74eda8c30548635e7ba69914299efa132b28.tar.gz
sdbusplus-c65d74eda8c30548635e7ba69914299efa132b28.zip
autotools: Simple changes for uniformity
Add build-aux and m4 directories so libtool can be vendored correctly when doing a dist. Also reference the m4 directory from the automake script to silence any warnings by autoreconf. Add verbose and force flags to autoreconf to make sure it regenerates everything and gives us useful feedback about where it is in the process. Change-Id: I8ea5184d1ae4098c2122d3e4043128b6731f7e87 Signed-off-by: William A. Kennington III <wak@google.com>
-rw-r--r--Makefile.am2
-rwxr-xr-xbootstrap.sh2
-rw-r--r--configure.ac2
3 files changed, 5 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am
index 9bcba6d..0129c2b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,3 +1,5 @@
+ACLOCAL_AMFLAGS = -Im4
+
if WANT_LIBSDBUSPLUS
nobase_include_HEADERS = \
diff --git a/bootstrap.sh b/bootstrap.sh
index 50b75b7..313001a 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -14,5 +14,5 @@ case $1 in
;;
esac
-autoreconf -i
+autoreconf -vfi
echo 'Run "./configure ${CONFIGURE_FLAGS} && make"'
diff --git a/configure.ac b/configure.ac
index 9ca9f77..6ef46d9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,6 +2,8 @@
AC_PREREQ([2.69])
AC_INIT([sdbusplus], [1.0], [https://github.com/openbmc/sdbusplus/issues])
AC_CONFIG_HEADERS([config.h])
+AC_CONFIG_MACRO_DIRS([m4])
+AC_CONFIG_AUX_DIR([build-aux])
AM_INIT_AUTOMAKE([subdir-objects -Wall -Werror foreign dist-xz])
AM_SILENT_RULES([yes])
OpenPOWER on IntegriCloud