[vlc-commits] Qt: fix compilation with ML

[Jean-Baptiste Kempf]

vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Thu Jan 20 15:12:20 2011 +0100| [d4e913a695bb5ae17fbb34c416d388ddcc35afe7] | committer: Jean-Baptiste Kempf

Qt: fix compilation with ML

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

 configure.ac               |    2 +-
 modules/gui/qt4/Modules.am |    9 ++-------
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/configure.ac b/configure.ac
index 64d24f4..1541ba3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4239,7 +4239,7 @@ if test "${enable_media_library}" == "yes"; then
        VLC_ADD_PLUGIN([media_library])
     fi
 fi
-AM_CONDITIONAL([ENABLE_MEDIA_LIBRARY], [test "${enable_media_library}" != "no"])
+AM_CONDITIONAL([ENABLE_MEDIA_LIBRARY], [test "${enable_media_library}" = "yes"])
 
 dnl
 dnl  Endianness check
diff --git a/modules/gui/qt4/Modules.am b/modules/gui/qt4/Modules.am
index b2d7e65..49be539 100644
--- a/modules/gui/qt4/Modules.am
+++ b/modules/gui/qt4/Modules.am
@@ -90,14 +90,9 @@ nodist_SOURCES_qt4 = \
 		ui/messages_panel.h \
 		ui/about.h \
 		ui/update.h \
-		ui/sout.h
-
-if ENABLE_MEDIA_LIBRARY
-nodist_SOURCES_qt4 +=
 		dialogs/ml_configuration.moc.cpp \
-		components/playlist/ml_item.moc.cpp \
-		components/playlist/ml_model.moc.cpp
-endif
+		components/playlist/ml_model.moc.cpp \
+		ui/sout.h
 
 DEPS_res = \
 	pixmaps/arrow_down_dark.png \