From b42f7bdd034fbc888cf54d1d304c378592c31a8d Mon Sep 17 00:00:00 2001 From: Mohammad Akhlaghi Date: Sat, 11 Aug 2018 11:34:41 +0200 Subject: Added bash as a dependency to be checked at configure time While we had set the default Makefile SHELL to be bash, we weren't actually checking if `bash' is available on the system. With this commit, it is also checked at configure time. --- configure | 8 ++++---- reproduce/src/make/initialize.mk | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/configure b/configure index b9548eb..c776d47 100755 --- a/configure +++ b/configure @@ -49,7 +49,7 @@ glconf=$cdir/gnuastro/gnuastro-local.conf echo "---------------------" echo "Checking dependencies" echo "---------------------" -for prog in cat sed make awk grep flock astnoisechisel pdflatex biber; do +for prog in bash cat sed make awk grep flock astnoisechisel pdflatex biber; do if type $prog > /dev/null; then echo " '$prog' was found." else @@ -57,9 +57,9 @@ for prog in cat sed make awk grep flock astnoisechisel pdflatex biber; do echo "ERROR: '$prog' not found in search path." if [ $prog = "flock" ]; then echo - echo "'flock' is available on GNU/Linux operating system" - echo "repositories, please install it through your package" - echo "manager. For other OSs, you can install the " + echo "'flock' (file-lock, used for managing parallel operations)" + echo "is available on GNU/Linux OSs through your package manager," + echo "please install it. For other OSs, you can install the " echo "implementation at: https://github.com/discoteq/flock" fi exit 1 diff --git a/reproduce/src/make/initialize.mk b/reproduce/src/make/initialize.mk index 4f134a9..f615e22 100644 --- a/reproduce/src/make/initialize.mk +++ b/reproduce/src/make/initialize.mk @@ -59,7 +59,7 @@ pconfdir = reproduce/config/pipeline # it won't appear in the prerequisites and the pipeline will try to build # the other directories in the top root directory (`/'). To solve this # problem, when `BDIR' isn't defined, we'll define it with a place-holder -# name ((only so it won't evaluate to blank space). Note that this +# name (only so it won't evaluate to blank space). Note that this # directory will never be built. ifeq ($(BDIR),) configure-run = no -- cgit v1.2.1