diff options
| author | Maarten Bosmans <mkbosmans@gmail.com> | 2011-07-27 14:13:53 +0200 |
|---|---|---|
| committer | Colin Guthrie <colin@mageia.org> | 2011-07-28 10:51:09 +0100 |
| commit | f35214e4f19b8b926482b887e8b66757e082f60a (patch) | |
| tree | b996626e2d76f161103ad2369a85af1560666665 /bootstrap.sh | |
| parent | 4e8bb96975699eec63977d37c38e2bc8dc1eb9d2 (diff) | |
build-sys: Check for necessary programs in bootstrap.sh
Also use glib-gettextize instead of plain gettextize.
Diffstat (limited to 'bootstrap.sh')
| -rwxr-xr-x | bootstrap.sh | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/bootstrap.sh b/bootstrap.sh index c7c858232..d0baf9500 100755 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -45,6 +45,7 @@ case $(uname) in LIBTOOLIZE="glibtoolize" ;; esac +test "x$LIBTOOLIZE" = "x" && LIBTOOLIZE=libtoolize if [ -f .git/hooks/pre-commit.sample -a ! -f .git/hooks/pre-commit ] ; then cp -p .git/hooks/pre-commit.sample .git/hooks/pre-commit && \ @@ -63,9 +64,15 @@ fi # configure file faulty. if ! pkg-config --version &>/dev/null; then echo "pkg-config is required to bootstrap this program" &>/dev/null - exit 1 + DIE=1 fi +# Other necessary programs +glib-gettextize --version >/dev/null || DIE=1 +intltoolize --version >/dev/null || DIE=1 +$LIBTOOLIZE --version >/dev/null || DIE=1 +test "$DIE" = 1 && exit 1 + if type -p colorgcc > /dev/null ; then export CC=colorgcc fi @@ -78,14 +85,11 @@ else rm -f config.cache rm -f Makefile.am~ configure.ac~ - # Evil, evil, evil, evil hack - sed 's/read dummy/\#/' `which gettextize` | bash -s -- --copy --force + glib-gettextize --copy --force test -f Makefile.am~ && mv Makefile.am~ Makefile.am test -f configure.ac~ && mv configure.ac~ configure.ac touch config.rpath - test "x$LIBTOOLIZE" = "x" && LIBTOOLIZE=libtoolize - intltoolize --copy --force --automake "$LIBTOOLIZE" -c --force run_versioned aclocal "$VERSION" -I m4 |