From: Pierre d'Herbemont <pdherbemont@videolan.org>
Date: Mon, 28 May 2007 18:27:44 +0000 (+0000)
Subject: bootstrap: Warn if contrib hasn't been built (on Mac OS X). (good for new comers).
X-Git-Tag: 0.9.0-test0~7217
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=4ee6aa92d66c6221f5818109ef78f0a793534a6d;p=vlc

bootstrap: Warn if contrib hasn't been built (on Mac OS X). (good for new comers).
---

diff --git a/bootstrap b/bootstrap
index ba7c30e81b..841c31bc6c 100755
--- a/bootstrap
+++ b/bootstrap
@@ -40,6 +40,20 @@ if test -d extras/contrib/bin; then
     ACLOCAL_ARGS="${ACLOCAL_ARGS} -I extras/contrib/share/aclocal"
   fi
   if test ".`uname -s`" = ".Darwin"; then
+    # Make sure contrib has been built
+    if test ! -e ./extras/contrib/config.mak; then
+        set +x
+        echo ""
+        echo "ERR: Contribs haven't been built"
+        echo "ERR: Please run:"
+        echo ""
+        echo "ERR:    'cd extras/contrib && ./bootstrap && make && cd ../..'"
+        echo ""
+        echo "ERR: Make sure fink has been disabled too"
+        echo ""
+        set -x
+        exit 1
+    fi
     export LD_LIBRARY_PATH=./extras/contrib/lib:$LD_LIBRARY_PATH
     export DYLD_LIBRARY_PATH=./extras/contrib/lib:$DYLD_LIBRARY_PATH
   elif test ".`uname -s`" = ".BeOS"; then