Add optional first arg to specify contrib directory.

[vlc] / extras / package / win32 / configure-common.sh

diff --git a/extras/package/win32/configure-common.sh b/extras/package/win32/configure-common.sh
index 344aeb5d491be5f08fde1bc8d4862413da8302e5..849a5057368e6cc7f5e1ccd3fb6209b882a031ea 100755 (executable)
--- a/extras/package/win32/configure-common.sh
+++ b/extras/package/win32/configure-common.sh
@@ -1,8 +1,10 @@
+if [ -z $CONTRIBS ]
+then
+       CONTRIBS=/usr/win32
+fi
+
       $CONFIG \
-      --enable-release \
       --without-contrib \
-      --enable-nls \
-      --enable-shared-libvlc \
       --enable-update-check \
       --enable-lua \
       --enable-faad \
@@ -11,28 +13,26 @@
       --enable-twolame \
       --enable-quicktime \
       --enable-real \
-      --enable-realrtsp \
-      --enable-ffmpeg --with-ffmpeg-mp3lame --with-ffmpeg-faac \
-      --with-ffmpeg-config-path=/usr/win32/bin --with-ffmpeg-zlib \
-      --enable-live555 --with-live555-tree=/usr/win32/live.com \
+      --enable-avcodec  --enable-merge-ffmpeg \
       --enable-dca \
-      --enable-mkv \
-      --enable-asademux --enable-csri \
+      --enable-mpc \
+      --enable-libass \
       --enable-x264 \
-      --enable-dvdread --with-dvdnav-config-path=/usr/win32/bin \
+      --enable-schroedinger \
+      --enable-realrtsp \
+      --enable-live555 --with-live555-tree=$CONTRIBS/live.com \
+      --enable-dvdread --with-dvdnav-config-path=$CONTRIBS/bin \
       --enable-shout \
       --enable-goom \
-      --enable-caca --with-caca-config-path=/usr/win32/bin \
+      --enable-caca \
       --enable-portaudio \
-      --enable-sdl --with-sdl-config-path=/usr/win32/bin \
+      --enable-sdl --with-sdl-config-path=$CONTRIBS/bin \
       --enable-qt4 \
-      --enable-wxwidgets --with-wx-config-path=/usr/win32/lib/wx/config \
-      --with-freetype-config-path=/usr/win32/bin \
-      --with-fribidi-config-path=/usr/win32/bin \
-      --with-xml2-config-path=/usr/win32/bin \
-      --enable-mozilla --with-mozilla-sdk-path=/usr/win32/gecko-sdk \
+      --enable-mozilla --with-mozilla-sdk-path=$CONTRIBS/gecko-sdk \
       --enable-activex \
-      --disable-gnomevfs --disable-hal --disable-gtk \
-      --disable-cddax --disable-vcdx \
-      --disable-libcddb --disable-dvb --disable-zvbi \
-      --disable-pulse
+      --enable-sse --enable-mmx \
+      --enable-libcddb \
+      --enable-zvbi --disable-telx \
+      --disable-dvb \
+      --disable-sqlite \
+      --enable-peflags