[pulseaudio-discuss] [PATCH] build-sys: Check for necessary programs in bootstrap.sh
Maarten Bosmans
mkbosmans at gmail.com
Wed Jul 27 05:13:53 PDT 2011
Also use glib-gettextize instead of plain gettextize.
---
.gitignore | 2 +-
bootstrap.sh | 14 +++++++++-----
m4/.gitignore | 1 -
po/.gitignore | 1 -
4 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/.gitignore b/.gitignore
index eb33e91..0637904 100644
--- a/.gitignore
+++ b/.gitignore
@@ -27,5 +27,5 @@ libltdl
libtool
ltmain.sh
missing
+mkinstalldirs
stamp-*
-ChangeLog
diff --git a/bootstrap.sh b/bootstrap.sh
index c7c8582..d0baf95 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
diff --git a/m4/.gitignore b/m4/.gitignore
index 8b81e54..f883d98 100644
--- a/m4/.gitignore
+++ b/m4/.gitignore
@@ -1,4 +1,3 @@
-ChangeLog
gettext.m4
iconv.m4
lib-ld.m4
diff --git a/po/.gitignore b/po/.gitignore
index 9a0243a..d212a2a 100644
--- a/po/.gitignore
+++ b/po/.gitignore
@@ -10,6 +10,5 @@ insert-header.sin
pulseaudio.pot
quot.sed
remove-potcdate.sin
-ChangeLog
*.mo
*.gmo
--
1.7.4.1
More information about the pulseaudio-discuss
mailing list