[vlc-commits] commit: Win32: configure scripts updates (Jean-Baptiste Kempf )

[git at videolan.org]

vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Sat Jan 15 15:56:39 2011 +0100| [295e4f255adc215d6981ab3b9fb798b1a370db24] | committer: Jean-Baptiste Kempf 

Win32: configure scripts updates

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=295e4f255adc215d6981ab3b9fb798b1a370db24
---

 extras/package/win32/configure-common.sh        |    3 ++-
 extras/package/win32/configure-mingw-release.sh |    2 +-
 extras/package/win32/configure-mingw.sh         |    2 +-
 extras/package/win32/configure-msys.sh          |    2 +-
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/extras/package/win32/configure-common.sh b/extras/package/win32/configure-common.sh
index e37d2ad..54aa2e6 100755
--- a/extras/package/win32/configure-common.sh
+++ b/extras/package/win32/configure-common.sh
@@ -28,7 +28,8 @@
       --enable-sse --enable-mmx \
       --enable-libcddb \
       --enable-zvbi --disable-telx \
+      --enable-sqlite \
       --disable-dvb \
-      --disable-sqlite \
+      --disable-dirac \
       --enable-peflags \
       $CONFIGOPTS
diff --git a/extras/package/win32/configure-mingw-release.sh b/extras/package/win32/configure-mingw-release.sh
index bab0610..b9333aa 100755
--- a/extras/package/win32/configure-mingw-release.sh
+++ b/extras/package/win32/configure-mingw-release.sh
@@ -7,5 +7,5 @@ export CONTRIB_DIR="$1"
 CC=i586-mingw32msvc-gcc CXX=i586-mingw32msvc-g++ \
 CONFIGURE="${root}configure" \
 CONFIGOPTS="--host=i586-mingw32msvc --build=i386-linux
- --enable-dirac --enable-mkv --enable-taglib --enable-release --enable-nls --enable-projectm" \
+ --enable-mkv --enable-taglib --enable-release --enable-nls --enable-projectm" \
 sh ${root}extras/package/win32/configure-common.sh
diff --git a/extras/package/win32/configure-mingw.sh b/extras/package/win32/configure-mingw.sh
index 0f91935..4581fed 100755
--- a/extras/package/win32/configure-mingw.sh
+++ b/extras/package/win32/configure-mingw.sh
@@ -7,5 +7,5 @@ export CONTRIB_DIR="$1"
 CC=i586-mingw32msvc-gcc CXX=i586-mingw32msvc-g++ \
 CONFIGURE="${root}configure" \
 CONFIGOPTS="--host=i586-mingw32msvc --build=i386-linux
- --enable-dirac --enable-mkv --enable-taglib --enable-debug --enable-projectm" \
+ --enable-mkv --enable-taglib --enable-debug --enable-projectm" \
 sh ${root}extras/package/win32/configure-common.sh
diff --git a/extras/package/win32/configure-msys.sh b/extras/package/win32/configure-msys.sh
index 48af43c..1640c2f 100755
--- a/extras/package/win32/configure-msys.sh
+++ b/extras/package/win32/configure-msys.sh
@@ -7,5 +7,5 @@ export CONTRIB_DIR="$1"
 CC=gcc CXX=g++ \
 CONFIGURE="${root}configure" \
 CONFIGOPTS="--host=i586-mingw32msvc --build=i386-linux
-    --disable-mkv --disable-taglib --disable-nls --disable-dirac --enable-debug" \
+    --disable-mkv --disable-taglib --disable-nls --enable-debug" \
 sh ${root}extras/package/win32/configure-common.sh