From 6ae6e2220ac79a6767770ca6a4b837e193dad14c Mon Sep 17 00:00:00 2001
From: Antoine Cellerier <dionoea@videolan.org>
Date: Sat, 8 May 2010 17:44:22 +0200
Subject: [PATCH] Add optional first arg to specify contrib directory.

---
 extras/package/win32/configure-common.sh | 13 +++++++++----
 extras/package/win32/configure-mingw.sh  | 16 ++++++++++++----
 2 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/extras/package/win32/configure-common.sh b/extras/package/win32/configure-common.sh
index ceb27de1c1..849a505736 100755
--- a/extras/package/win32/configure-common.sh
+++ b/extras/package/win32/configure-common.sh
@@ -1,3 +1,8 @@
+if [ -z $CONTRIBS ]
+then
+	CONTRIBS=/usr/win32
+fi
+
       $CONFIG \
       --without-contrib \
       --enable-update-check \
@@ -15,15 +20,15 @@
       --enable-x264 \
       --enable-schroedinger \
       --enable-realrtsp \
-      --enable-live555 --with-live555-tree=/usr/win32/live.com \
-      --enable-dvdread --with-dvdnav-config-path=/usr/win32/bin \
+      --enable-live555 --with-live555-tree=$CONTRIBS/live.com \
+      --enable-dvdread --with-dvdnav-config-path=$CONTRIBS/bin \
       --enable-shout \
       --enable-goom \
       --enable-caca \
       --enable-portaudio \
-      --enable-sdl --with-sdl-config-path=/usr/win32/bin \
+      --enable-sdl --with-sdl-config-path=$CONTRIBS/bin \
       --enable-qt4 \
-      --enable-mozilla --with-mozilla-sdk-path=/usr/win32/gecko-sdk \
+      --enable-mozilla --with-mozilla-sdk-path=$CONTRIBS/gecko-sdk \
       --enable-activex \
       --enable-sse --enable-mmx \
       --enable-libcddb \
diff --git a/extras/package/win32/configure-mingw.sh b/extras/package/win32/configure-mingw.sh
index c396fedaeb..6f52f4c3cb 100755
--- a/extras/package/win32/configure-mingw.sh
+++ b/extras/package/win32/configure-mingw.sh
@@ -2,10 +2,18 @@
 
 root=$(echo $0|sed 's#extras/package/win32/configure-mingw.sh##')./
 
-PATH="/usr/win32/bin:$PATH" \
-PKG_CONFIG_LIBDIR=/usr/win32/lib/pkgconfig \
-CPPFLAGS="-I/usr/win32/include -I/usr/win32/include/ebml" \
-LDFLAGS="-L/usr/win32/lib" \
+if [ -n $1 ]
+then
+	CONTRIBS="$1"
+else
+	CONTRIBS="/usr/win32"
+fi
+export CONTRIBS
+
+PATH="$CONTRIBS/bin:$PATH" \
+PKG_CONFIG_LIBDIR=$CONTRIBS/lib/pkgconfig \
+CPPFLAGS="-I$CONTRIBS/include -I$CONTRIBS/include/ebml" \
+LDFLAGS="-L$CONTRIBS/lib" \
 CC=i586-mingw32msvc-gcc CXX=i586-mingw32msvc-g++ \
 CONFIG="${root}configure --host=i586-mingw32msvc --build=i386-linux
  --enable-dirac --enable-mkv --enable-taglib --enable-debug --enable-projectm" \
-- 
2.39.2