diff options
| author | Tollef Fog Heen <tfheen@err.no> | 2010-04-30 17:44:43 +0200 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2010-05-06 21:42:46 +0200 |
| commit | b237ef2cfac7ab0b33170809e8cb64628606207d (patch) | |
| tree | 8302cdf18ad733e40aebffffd5a90a6790622e34 /bootstrap.sh | |
| parent | 41160f3dbf0cb61e23a02338da1f289a2ff00066 (diff) | |
build-sys: better test for pkg-config/pkg.m4
In some cases, people will run autoreconf rather than bootstrap.sh, or
they will uninstall pkg-config. This is now detected properly rather
than relying on bootstrap.sh checking for us.
Diffstat (limited to 'bootstrap.sh')
| -rwxr-xr-x | bootstrap.sh | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/bootstrap.sh b/bootstrap.sh index 73243ed44..cb87bf782 100755 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -48,15 +48,6 @@ if [ -f .git/hooks/pre-commit.sample -a ! -f .git/hooks/pre-commit ] ; then echo "Activated pre-commit hook." fi -# We check for this here, because if pkg-config is not found in the -# system, it's likely that the pkg.m4 macro file is also not present, -# which will make PKG_PROG_PKG_CONFIG be undefined and the generated -# configure file faulty. -if ! pkg-config --version &>/dev/null; then - echo "pkg-config is required to bootstrap this program" &>/dev/null - exit 1 -fi - if type -p colorgcc > /dev/null ; then export CC=colorgcc fi |