skins2 doesn't depend on ctl3d32.dll

[vlc] / configure.ac

diff --git a/configure.ac b/configure.ac
index daa9fa7676172776c7d15a0ca41654d392410001..a0ecbd25646d063aef4a3e02787f7a2801c33d0e 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -2167,7 +2167,7 @@ dnl
 AC_ARG_ENABLE(sid,
     [AS_HELP_STRING([--enable-sid],[C64 sid demux support (default auto)])])
 AS_IF([test "${enable_sid}" != "no"], [
-    PKG_CHECK_MODULES(sid, [libsidplay2], [
+    PKG_CHECK_MODULES(SID, [libsidplay2], [
         AC_LANG_PUSH(C++)
         oldCPPFLAGS="$CPPFLAGS"
         CPPFLAGS="$CPPFLAGS $SID_CFLAGS"
@@ -3613,7 +3613,7 @@ AS_IF([test "${enable_skins2}" != "no"], [
   AS_IF([test "${SYS}" = "mingw32"], [
     VLC_ADD_CPPFLAGS([skins2],[-U_OFF_T_ -U_off_t -Imodules/gui/skins2 -DWIN32_SKINS])
     VLC_ADD_CXXFLAGS([skins2],[-O2 -fno-rtti])
-    VLC_ADD_LIBS([skins2],[-loleaut32 -lwinspool -lwinmm -lshell32 -lctl3d32 -ladvapi32 -lwsock32 -lgdi32 -lcomdlg32 -lole32 -luuid -lcomctl32  -lmsimg32 -luser32])
+    VLC_ADD_LIBS([skins2],[-loleaut32 -lwinspool -lwinmm -lshell32 -ladvapi32 -lwsock32 -lgdi32 -lcomdlg32 -lole32 -luuid -lcomctl32  -lmsimg32 -luser32])
 
   ], [test "${SYS}" = "darwin"], [
     VLC_ADD_CPPFLAGS([skins2],[-Imodules/gui/skins2 -DMACOSX_SKINS])
@@ -3689,7 +3689,7 @@ AC_ARG_ENABLE(qt4,
   AS_IF([test "${SYS}" = "darwin"], [enable_qt4=no])
 ])
 AS_IF([test "${enable_qt4}" != "no"], [
-  PKG_CHECK_MODULES(QT4, [QtCore QtGui >= 4.4.0], [
+  PKG_CHECK_MODULES(QT4, [QtCore QtGui >= 4.6.0], [
     VLC_ADD_PLUGIN([qt4])
     VLC_ADD_LIBS([qt4],[${QT4_LIBS}])
     VLC_ADD_CXXFLAGS([qt4],[${QT4_CFLAGS}])