Introduce HAVE_WX and HAVE_QT4 and show "Switch to WX" in QT4 only if built with WX

diff --git a/configure.ac b/configure.ac
index b50b2f57bb19ea83fad5e987d12479e36db2a971..4193560b0c728d80be5d7506db621000031bb4ef 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -5194,6 +5194,7 @@ then
     if test "${ac_cv_wx_headers}" = "yes"
     then
       VLC_ADD_PLUGINS([wxwidgets])
+      AC_DEFINE([HAVE_WX], 1, [Define to 1 if you have WxWidgets library.])
       ALIASES="${ALIASES} wxvlc"
     fi
     CPPFLAGS="${CPPFLAGS_save}"
@@ -5213,6 +5214,7 @@ AS_IF([test "${enable_qt4}" != "no" &&
   (test "${SYS}" != "darwin" || test "${enable_qt4}" = "yes")], [
   PKG_CHECK_MODULES(QT4, [QtCore QtGui >= 4.2.0],
     [ VLC_ADD_PLUGINS([qt4])
+      AC_DEFINE([HAVE_QT4], 1, [Define to 1 if you have QT4 library.])
       ALIASES="${ALIASES} qvlc"
       enableqt4=true
       VLC_ADD_LIBS([qt4],[$QT4_LIBS])

diff --git a/modules/gui/qt4/menus.cpp b/modules/gui/qt4/menus.cpp
index c6642837343cde16256d26d36909da41a8011da2..2be86e89ff994ce5dcfcd74616433898810b6c8d 100644 (file)
--- a/modules/gui/qt4/menus.cpp
+++ b/modules/gui/qt4/menus.cpp
@@ -332,11 +332,13 @@ QMenu *QVLCMenu::InterfacesMenu( intf_thread_t *p_intf, QMenu *current )
         menu->addSeparator();
         menu->addAction( qtr( "Switch to skins" ), THEDP, SLOT( switchToSkins() ),
                 QString( "Ctrl+Z" ) );
+#ifdef HAVE_WX
         if( module_Exists( VLC_OBJECT( p_intf ), "wxwidgets" ) )
         {
             menu->addAction( qtr( "Switch to WxWidgets" ), THEDP,
                     SLOT( switchToWx() ) );
         }
+#endif
     }
 
     CONNECT( menu, aboutToShow(), THEDP->menusUpdateMapper, map() );