diff options
| author | Dane Springmeyer <dane@mapbox.com> | 2014-05-12 13:40:58 -0700 |
|---|---|---|
| committer | Dane Springmeyer <dane@mapbox.com> | 2014-05-12 13:40:58 -0700 |
| commit | 6538f580ce52259ff837b85622f0553d0d0c5885 (patch) | |
| tree | 66454e4a26740b95884e74ca16e4c7f5e058459f /setup-libraries.sh | |
| parent | b6d6c7ee3058c2dd18919bc65d8f83ff97965ab5 (diff) | |
| download | qtlocation-mapboxgl-6538f580ce52259ff837b85622f0553d0d0c5885.tar.gz | |
ensure setup-libraries.sh checks for valid pkg-config
Diffstat (limited to 'setup-libraries.sh')
| -rwxr-xr-x | setup-libraries.sh | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/setup-libraries.sh b/setup-libraries.sh index cd5dd43854..d434611115 100755 --- a/setup-libraries.sh +++ b/setup-libraries.sh @@ -3,7 +3,7 @@ set -e -u UNAME=$(uname -s); -MISSING_DEPS=false +MISSING_DEPS="" function ensure_dep { if [[ ! `which $1` ]]; then @@ -15,6 +15,7 @@ ensure_dep aclocal ensure_dep cmake ensure_dep automake ensure_dep autoconf +ensure_dep pkg-config if [ ${UNAME} = 'Darwin' ]; then ensure_dep makedepend ensure_dep glibtool @@ -23,11 +24,13 @@ elif [ ${UNAME} = 'Linux' ]; then ensure_dep gccmakedep fi -if [[ $MISSING_DEPS != false ]]; then +if [[ $MISSING_DEPS != "" ]]; then if [ ${UNAME} = 'Darwin' ]; then - echo 'Please run "brew install autoconf automake libtool makedepend cmake" and then re-run ./setup-libraries.sh' + echo "Missing build deps: ${MISSING_DEPS}" + echo 'Please run "brew install autoconf automake libtool makedepend cmake pkg-config" and then re-run ./setup-libraries.sh' elif [ ${UNAME} = 'Linux' ]; then - echo 'Please run "sudo apt-get install automake libtool xutils-dev cmake" and then re-run ./setup-libraries.sh' + echo "Missing build deps: ${MISSING_DEPS}" + echo 'Please run "sudo apt-get install automake libtool xutils-dev cmake pkg-config" and then re-run ./setup-libraries.sh' fi exit 1 fi |