From d0a3416241d1b06c77397004fc685cab4f8ddd02 Mon Sep 17 00:00:00 2001 From: "Christopher J. Morrone" Date: Thu, 24 Aug 2017 18:41:30 -0700 Subject: [PATCH] build: Exit on error in autogen.sh plus other cleanup Make autogen.sh exit after any of the commands fail. Remove the "-I config" option from the autoreconf command which appears to be redundant with either AC_CONFIG_AUX_DIR([config]) or AC_CONFIG_MACRO_DIR([config]) in the configure.ac file. Stop removing autom4te.cache. We can't remember why we did that. Resolves #1162 --- autogen.sh | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/autogen.sh b/autogen.sh index 1b50737c3b36..7a7cbcaa34b8 100755 --- a/autogen.sh +++ b/autogen.sh @@ -5,11 +5,9 @@ # macros are not in default aclocal search path. # echo "Running libtoolize --automake --copy ... " -libtoolize --automake --copy -echo "Running autoreconf --verbose --install -I config" -autoreconf --verbose --install -I config -echo "Cleaning up ..." -mv aclocal.m4 config/ -rm -rf autom4te.cache +libtoolize --automake --copy || exit +echo "Running autoreconf --verbose --install" +autoreconf --verbose --install || exit +echo "Moving aclocal.m4 to config/ ..." +mv aclocal.m4 config/ || exit echo "Now run ./configure." -