From 64c58a33a4816a3db584dacb80d5976894e90df7 Mon Sep 17 00:00:00 2001 From: Allen Wild Date: Sun, 11 Dec 2016 17:42:47 -0500 Subject: [PATCH] Create autogen.sh script Many autotools-based projects have an autogen.sh script which handles creating the configure script properly. The existing build.sh does this but doesn't offer a way to just run autotools without configure/make. Here I split the first part of build.sh into autogen.sh and then call autogen.sh from build.sh. Using "set -e" cleans up the script a bit to avoid a long chain of "&&"s --- autogen.sh | 21 +++++++++++++++++++++ build.sh | 22 ++++------------------ 2 files changed, 25 insertions(+), 18 deletions(-) create mode 100755 autogen.sh diff --git a/autogen.sh b/autogen.sh new file mode 100755 index 0000000..c69a09e --- /dev/null +++ b/autogen.sh @@ -0,0 +1,21 @@ +#!/bin/sh + +set -e +cd "$(dirname "$0")" + +AC_SEARCH_OPTS="" +# For those of us with pkg-config and other tools in /usr/local +PATH=$PATH:/usr/local/bin + +# This is to make life easier for people who installed pkg-config in /usr/local +# but have autoconf/make/etc in /usr/. AKA most mac users +if [ -d "/usr/local/share/aclocal" ] +then + AC_SEARCH_OPTS="-I /usr/local/share/aclocal" +fi + +# shellcheck disable=2086 +aclocal $AC_SEARCH_OPTS +autoconf +autoheader +automake --add-missing diff --git a/build.sh b/build.sh index f06c20a..14616e8 100755 --- a/build.sh +++ b/build.sh @@ -1,22 +1,8 @@ #!/bin/sh -cd "$(dirname "$0")" || exit 1 +set -e +cd "$(dirname "$0")" -AC_SEARCH_OPTS="" -# For those of us with pkg-config and other tools in /usr/local -PATH=$PATH:/usr/local/bin - -# This is to make life easier for people who installed pkg-config in /usr/local -# but have autoconf/make/etc in /usr/. AKA most mac users -if [ -d "/usr/local/share/aclocal" ] -then - AC_SEARCH_OPTS="-I /usr/local/share/aclocal" -fi - -# shellcheck disable=2086 -aclocal $AC_SEARCH_OPTS && \ -autoconf && \ -autoheader && \ -automake --add-missing && \ -./configure "$@" && \ +./autogen.sh +./configure "$@" make -j4