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 25add32e4a29042395c2ca25d32f4ec174fb880d..849a5057368e6cc7f5e1ccd3fb6209b882a031ea 100755 (executable)
--- 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 \
@@ -8,25 +13,26 @@
       --enable-twolame \
       --enable-quicktime \
       --enable-real \
-      --enable-avcodec \
+      --enable-avcodec  --enable-merge-ffmpeg \
       --enable-dca \
       --enable-mpc \
       --enable-libass \
       --enable-x264 \
-      --enable-schroedinger --enable-dirac \
+      --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 --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-mozilla --with-mozilla-sdk-path=/usr/win32/gecko-sdk \
+      --enable-mozilla --with-mozilla-sdk-path=$CONTRIBS/gecko-sdk \
       --enable-activex \
       --enable-sse --enable-mmx \
-      --disable-gnomevfs --disable-hal \
-      --disable-cddax --disable-vcdx --disable-libcdio --disable-vcdinfo \
-      --disable-libcddb --disable-dvb --disable-zvbi --enable-telx \
-      --disable-pulse
+      --enable-libcddb \
+      --enable-zvbi --disable-telx \
+      --disable-dvb \
+      --disable-sqlite \
+      --enable-peflags