joncampbell123/dosbox-x
1
0
Fork 0
mirror of https://github.com/joncampbell123/dosbox-x.git synced 2025-05-09 11:51:09 +08:00
Code Issues Packages Projects Releases Wiki Activity

Turn e back on afterwards, and only echo the error message if the script actually exited prematurely

Browse Source
This commit is contained in:
Michiel Sikma 2020-02-22 16:36:52 +01:00
parent 7bef93d470
commit c75ba4bb37
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
autogen.sh
View File

@ -1,16 +1,20 @@
#!/bin/sh #!/bin/sh
echo "Generating build information using aclocal, autoheader, automake and autoconf"
echo "This may take a while ..."
# If an error occurs, quit the script and inform the user. This ensures scripts # If an error occurs, quit the script and inform the user. This ensures scripts
# like ./build-macosx etc. don't continue on if Autotools isn't installed. # like ./build-macosx etc. don't continue on if Autotools isn't installed.
function finish { function finish {
echo 'autogen.sh failed to complete: verify that GNU Autotools is installed on the system and try again' if [ $success -eq 0 ]; then
echo 'autogen.sh failed to complete: verify that GNU Autotools is installed on the system and try again'
fi
} }
success=0
trap finish EXIT trap finish EXIT
set -e set -e
echo "Generating build information using aclocal, autoheader, automake and autoconf"
echo "This may take a while ..."
# Regenerate configuration files. # Regenerate configuration files.
aclocal aclocal
@ -20,3 +24,7 @@ autoconf
echo "Now you are ready to run ./configure." echo "Now you are ready to run ./configure."
echo "You can also run ./configure --help for extra features to enable/disable." echo "You can also run ./configure --help for extra features to enable/disable."
# Don't quit on errors again from here on out (for calling scripts).
set +e
success=1