with-peflags was removed

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

diff --git a/extras/package/win32/configure-common.sh b/extras/package/win32/configure-common.sh
index 7ffaceea533eb5b3447a4cfc379274e85a721216..b40113f934ed6776633ad08d5df7ba21ed9acb77 100755 (executable)
--- a/extras/package/win32/configure-common.sh
+++ b/extras/package/win32/configure-common.sh
@@ -1,10 +1,7 @@
-if [ -z $CONTRIBS ]
-then
-       CONTRIBS=/usr/win32
-fi
+[ -z $CONTRIB_DIR ] && export CONTRIB_DIR=/usr/win32
 
-      $CONFIGURE \
-      --without-contrib \
+  $CONFIGURE \
+      --with-contrib="$CONTRIB_DIR" \
       --enable-update-check \
       --enable-lua \
       --enable-faad \
@@ -13,7 +10,7 @@ fi
       --enable-twolame \
       --enable-quicktime \
       --enable-real \
-      --enable-avcodec  --enable-merge-ffmpeg \
+      --enable-avcodec --enable-merge-ffmpeg \
       --enable-dca \
       --enable-mpc \
       --enable-libass \
@@ -21,18 +18,17 @@ fi
       --enable-schroedinger \
       --enable-realrtsp \
       --enable-live555 \
-      --enable-dvdread --with-dvdnav-config-path=$CONTRIBS/bin \
+      --enable-dvdread \
       --enable-shout \
       --enable-goom \
       --enable-caca \
-      --enable-portaudio \
-      --enable-sdl \
+      --disable-portaudio \
+      --disable-sdl \
       --enable-qt4 \
-      --enable-activex \
+      --enable-skins2 \
       --enable-sse --enable-mmx \
       --enable-libcddb \
       --enable-zvbi --disable-telx \
-      --disable-dvb \
-      --disable-sqlite \
-      --enable-peflags \
+      --enable-sqlite \
+      --disable-dirac \
       $CONFIGOPTS