Bump libgnutls - Note that 2.3.4 was available when last bumped

[vlc] / extras / contrib / bootstrap

diff --git a/extras/contrib/bootstrap b/extras/contrib/bootstrap
index fbba865e19638dc1bc75e21b0302c22cb3bf77f9..5c2123ce1c4f9752262272d2077d519ca080a95f 100755 (executable)
--- a/extras/contrib/bootstrap
+++ b/extras/contrib/bootstrap
@@ -270,7 +270,7 @@ echo "EXTRA_LDFLAGS = ${EXTRA_LDFLAGS}" >> config.mak
 echo "EXTRA_PATH = ${EXTRA_PATH}" >> config.mak
 
 if wget --version >/dev/null 2>&1; then
-    echo "WGET = `which wget` -c" >> config.mak
+    echo "WGET = `which wget` -c --passive" >> config.mak
 elif which curl >/dev/null; then
     echo "WGET = `which curl` -L -O" >> config.mak
 else
@@ -278,30 +278,25 @@ else
     exit 1
 fi
 
-if test -f /sw/bin/svn; then
-    echo "SVN = /sw/bin/svn" >> config.mak
-elif test -f /usr/local/bin/svn; then
-    echo "SVN = /usr/local/bin/svn" >> config.mak
-elif test -f /usr/bin/svn; then
-    echo "SVN = /usr/bin/svn" >> config.mak
-elif test -f /opt/local/bin/svn; then
-    echo "SVN = /opt/local/bin/svn" >> config.mak
-elif svn help >/dev/null 2>&1; then
+if svn help >/dev/null 2>&1; then
     echo "SVN = `which svn`" >> config.mak
 else
-    echo "You do not have a subversion client installed." >&2
+    echo "You do not have a subversion client in your PATH." >&2
 fi
 
-if test -f /sw/bin/git; then
-    echo "GIT = /sw/bin/git" >> config.mak
-elif test -f /usr/local/bin/git; then
-    echo "GIT = /usr/local/bin/git" >> config.mak
-elif test -f /usr/bin/git; then
-    echo "GIT = /usr/bin/git" >> config.mak
-elif test -f /opt/local/bin/git; then
-    echo "GIT = /opt/local/bin/git" >> config.mak
-elif git help >/dev/null 2>&1; then
+if git help >/dev/null 2>&1; then
     echo "GIT = `which git`" >> config.mak
 else
-    echo "You do not have a Git client installed." >&2
+    echo "You do not have a Git client in your PATH." >&2
+fi
+
+if test -z "$CONTRIBS_RELEASE"; then
+    set +x
+    echo
+    echo "***********************************************************"
+    echo "* If you are building contribs for a release build of VLC *"
+    echo "* Please run CONTRIBS_RELEASE=sexy ./bootstrap            *"
+    echo "***********************************************************"
+else
+    echo "EXTRA_CFLAGS += -DNDEBUG" >> config.mak
 fi