X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=bootstrap.sh;h=d0baf9500a75dbd22862fbce22d92a1fee4b2d62;hb=aca1c4001def39641e8662848bb70f8b54b394da;hp=a5bd9a7814520006a16eea2681f930f26a199b3f;hpb=909dc093a5d33b5eed2c718187c7acce1c6d9bd0;p=profile%2Fivi%2Fpulseaudio-panda.git

diff --git a/bootstrap.sh b/bootstrap.sh
index a5bd9a7..d0baf95 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -42,20 +42,15 @@ set -ex
 
 case $(uname) in
 	*Darwin*)
-		CP_OPTS="-R"
-		CHMOD_OPTS=""
 		LIBTOOLIZE="glibtoolize"
 		;;
-	*)
-		CP_OPTS="-av"
-		CHMOD_OPTS="-c"
-		;;
 esac
+test "x$LIBTOOLIZE" = "x" && LIBTOOLIZE=libtoolize
 
 if [ -f .git/hooks/pre-commit.sample -a ! -f .git/hooks/pre-commit ] ; then
-    echo "Activating pre-commit hook."
-    cp ${CP_OPTS}  .git/hooks/pre-commit.sample .git/hooks/pre-commit
-    chmod ${CHMOD_OPTS} +x  .git/hooks/pre-commit
+    cp -p .git/hooks/pre-commit.sample .git/hooks/pre-commit && \
+    chmod +x .git/hooks/pre-commit && \
+    echo "Activated pre-commit hook."
 fi
 
 if [ -f .tarball-version ]; then
@@ -69,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
@@ -84,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
@@ -100,7 +98,7 @@ else
     run_versioned automake "$VERSION" --copy --foreign --add-missing
 
     if test "x$NOCONFIGURE" = "x"; then
-        CFLAGS="-g -O0" ./configure --sysconfdir=/etc --localstatedir=/var --enable-force-preopen "$@"
+        CFLAGS="$CFLAGS -g -O0" ./configure --sysconfdir=/etc --localstatedir=/var --enable-force-preopen "$@"
         make clean
     fi
 fi