Skip to content

Commit

Permalink
build: Exit on error in autogen.sh plus other cleanup
Browse files Browse the repository at this point in the history
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
  • Loading branch information
morrone committed Aug 25, 2017
1 parent e2b5e8d commit d0a3416
Showing 1 changed file with 5 additions and 7 deletions.
12 changes: 5 additions & 7 deletions autogen.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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."

0 comments on commit d0a3416

Please sign in to comment.