build-sys: Check for necessary programs in bootstrap.sh

Also use glib-gettextize instead of plain gettextize.

diff --git a/.gitignore b/.gitignore
index eb33e910ea0b76de27a58742810872b7102fcee1..0637904b73eaac99174cd69d92f8dce2e06f8e4e 100644 (file)
--- 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 c7c858232bbc10b42838973d028aac4033df61f3..d0baf9500a75dbd22862fbce22d92a1fee4b2d62 100755 (executable)
--- 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 8b81e54b23c0f672f78e5f7f509235d9f1c165ae..f883d98521f35c6465e8d81a84414bed749e18a1 100644 (file)
--- 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 9a0243ade54ca883b830de6d5b43af3e759ae2e9..d212a2ad62124d164cec5e7119c3e4370b657a74 100644 (file)
--- a/po/.gitignore
+++ b/po/.gitignore
@@ -10,6 +10,5 @@ insert-header.sin
 pulseaudio.pot
 quot.sed
 remove-potcdate.sin
-ChangeLog
 *.mo
 *.gmo