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 ad9b774c081471e7896640b5acbc9b605992ed41..b40113f934ed6776633ad08d5df7ba21ed9acb77 100755 (executable)
--- a/extras/package/win32/configure-common.sh
+++ b/extras/package/win32/configure-common.sh
@@ -1,5 +1,7 @@
-      $CONFIG \
-      --without-contrib \
+[ -z $CONTRIB_DIR ] && export CONTRIB_DIR=/usr/win32
+
+  $CONFIGURE \
+      --with-contrib="$CONTRIB_DIR" \
       --enable-update-check \
       --enable-lua \
       --enable-faad \
@@ -8,24 +10,25 @@
       --enable-twolame \
       --enable-quicktime \
       --enable-real \
-      --enable-avcodec  --enable-merge-ffmpeg \
+      --enable-avcodec --enable-merge-ffmpeg \
       --enable-dca \
       --enable-mpc \
       --enable-libass \
       --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 \
+      --enable-dvdread \
       --enable-shout \
       --enable-goom \
       --enable-caca \
-      --enable-portaudio \
-      --enable-sdl --with-sdl-config-path=/usr/win32/bin \
+      --disable-portaudio \
+      --disable-sdl \
       --enable-qt4 \
-      --enable-activex \
+      --enable-skins2 \
       --enable-sse --enable-mmx \
       --enable-libcddb \
       --enable-zvbi --disable-telx \
-      --disable-dvb \
-      --enable-peflags
+      --enable-sqlite \
+      --disable-dirac \
+      $CONFIGOPTS