[vlc-commits] qt: do not build sources if Qt is disabled/absent

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Sun May 14 22:58:17 2017 +0300| [c50926d77150f91562ddb1ed1f1f89d9257d1319] | committer: Rémi Denis-Courmont

qt: do not build sources if Qt is disabled/absent

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

 configure.ac               | 1 -
 modules/gui/qt/Makefile.am | 6 +++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/configure.ac b/configure.ac
index e2dc745ab6..4af6675f33 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3718,7 +3718,6 @@ AS_IF([test "${enable_qt}" != "no"], [
     ])
 ])
 AS_IF([test "${enable_qt}" != "no"], [
-  VLC_ADD_PLUGIN([qt])
   ALIASES="${ALIASES} qvlc"
 ])
 AC_SUBST(QT_VERSION)
diff --git a/modules/gui/qt/Makefile.am b/modules/gui/qt/Makefile.am
index 36fbb55455..56b90dc630 100644
--- a/modules/gui/qt/Makefile.am
+++ b/modules/gui/qt/Makefile.am
@@ -39,9 +39,6 @@ if UPDATE_CHECK
 libqt_plugin_la_CPPFLAGS += -DUPDATE_CHECK
 endif
 
-gui_LTLIBRARIES += $(LTLIBqt)
-EXTRA_LTLIBRARIES += libqt_plugin.la
-
 libqt_plugin_la_SOURCES = \
 	gui/qt/qt.cpp gui/qt/qt.hpp \
 	gui/qt/menus.cpp gui/qt/menus.hpp \
@@ -449,4 +446,7 @@ nodist_libqt_plugin_la_SOURCES += gui/qt/resources.cpp
 gui/qt/resources.cpp: gui/qt/vlc.qrc $(libqt_plugin_la_RES)
 	$(AM_V_GEN)$(RCC) -name vlc -o $@ $<
 
+if ENABLE_QT
+gui_LTLIBRARIES += libqt_plugin.la
 BUILT_SOURCES += $(nodist_libqt_plugin_la_SOURCES)
+endif