cheng/libsodium
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

autogen.sh: make config.guess update optional

Browse Source
This commit is contained in:
Frank Denis 2019-05-16 23:38:48 +02:00
parent bb6f156412
commit d437e39034
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
autogen.sh
View File

@ -1,6 +1,6 @@
#! /bin/sh #! /bin/sh
if glibtoolize --version > /dev/null 2>&1; then if glibtoolize --version >/dev/null 2>&1; then
LIBTOOLIZE='glibtoolize' LIBTOOLIZE='glibtoolize'
else else
LIBTOOLIZE='libtoolize' LIBTOOLIZE='libtoolize'
@ -26,16 +26,19 @@ command -v automake >/dev/null 2>&1 || {
exit 1 exit 1
} }
if autoreconf --version > /dev/null 2>&1 ; then if autoreconf --version >/dev/null 2>&1; then
autoreconf -ivf autoreconf -ivf
else else
$LIBTOOLIZE && \ $LIBTOOLIZE &&
aclocal && \ aclocal &&
automake --add-missing --force-missing --include-deps && \ automake --add-missing --force-missing --include-deps &&
autoconf autoconf
fi fi
command -v curl >/dev/null 2>&1 && { [ -z "$DO_NOT_UPDATE_CONFIG_SCRIPTS" ] &&
command -v curl >/dev/null 2>&1 && {
echo "Downloading config.guess and config.sub..."
curl -sL -o config.guess \ curl -sL -o config.guess \
'https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD' && 'https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD' &&
mv -f config.guess build-aux/config.guess mv -f config.guess build-aux/config.guess
@ -43,6 +46,8 @@ command -v curl >/dev/null 2>&1 && {
curl -sL -o config.sub \ curl -sL -o config.sub \
'https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD' && 'https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD' &&
mv -f config.sub build-aux/config.sub mv -f config.sub build-aux/config.sub
echo "Done."
} }
rm -f config.guess config.sub rm -f config.guess config.sub