From be6d290129014202a46bb6d354558d86546582ba Mon Sep 17 00:00:00 2001
From: Moritz Bunkus <moritz@bunkus.org>
Date: Sat, 9 May 2015 17:01:25 +0200
Subject: [PATCH] configure: enable Qt-based GUIs by default

---
 ac/qt5.m4       | 14 +++++++++++---
 ac/wxwidgets.m4 |  2 +-
 mkvtoolnix.spec |  3 +--
 3 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/ac/qt5.m4 b/ac/qt5.m4
index 7b347495b..58a6e726a 100644
--- a/ac/qt5.m4
+++ b/ac/qt5.m4
@@ -3,7 +3,8 @@ dnl Check for Qt 5
 dnl
 
 AC_ARG_ENABLE([qt],
-  AC_HELP_STRING([--enable-qt],[compile the Qt version of the GUIs (no)]))
+  AC_HELP_STRING([--enable-qt],[compile the Qt version of the GUIs (yes)]),
+  [],[enable_qt=yes])
 AC_ARG_ENABLE([static_qt],
   AC_HELP_STRING([--enable-static-qt],[link to static versions of the Qt library (no)]))
 AC_ARG_WITH([qt_pkg_config_modules],
@@ -240,8 +241,15 @@ return 0;
     AC_MSG_RESULT(no: not found by pkg-config)
   fi
 
-  AC_ARG_WITH(mkvtoolnix-gui,[AS_HELP_STRING([--with-mkvtoolnix-gui],[build mkvtoolnix-gui (not working yet, only for development)])],
-              [BUILD_MKVTOOLNIX_GUI=yes],[BUILD_MKVTOOLNIX_GUI=no])
+  AC_ARG_WITH(mkvtoolnix-gui,[AS_HELP_STRING([--without-mkvtoolnix-gui],[do not build mkvtoolnix-gui])])
+  if test x"$with_mkvtoolnix_gui" = xyes -o x"$with_mkvtoolnix_gui" = x; then
+    BUILD_MKVTOOLNIX_GUI=yes
+  else
+    BUILD_MKVTOOLNIX_GUI=no
+  fi
+
+else
+  echo '*** Not checking for Qt: disabled by user request'
 fi
 
 if test x"$have_qt" != "xyes" ; then
diff --git a/ac/wxwidgets.m4 b/ac/wxwidgets.m4
index c9fee6752..e770c73ac 100644
--- a/ac/wxwidgets.m4
+++ b/ac/wxwidgets.m4
@@ -2,7 +2,7 @@ dnl
 dnl Check for wxWidgets
 dnl
   AC_ARG_ENABLE([gui],
-    AC_HELP_STRING([--enable-gui],[compile mkvinfo's GUI and mmg (yes)]))
+    AC_HELP_STRING([--enable-gui],[compile mkvinfo's GUI and mmg/mkvtoolnix-gui (yes)]))
 
   AC_ARG_ENABLE([wxwidgets],
     AC_HELP_STRING([--enable-wxwidgets],[compile the wxWidgets version of the GUIs (yes)]))
diff --git a/mkvtoolnix.spec b/mkvtoolnix.spec
index e64cb0140..bbb0fc415 100644
--- a/mkvtoolnix.spec
+++ b/mkvtoolnix.spec
@@ -69,8 +69,7 @@ export EXTRA_CONFIGURE_ARGS="--with-boost=/opt/boost"
 export EXTRA_CONFIGURE_ARGS="--with-wx-config=/usr/bin/wx-config-3.0"
 %endif
 
-%configure --prefix=%{_prefix} $EXTRA_CONFIGURE_ARGS \
-  --enable-qt --with-mkvtoolnix-gui
+%configure --prefix=%{_prefix} $EXTRA_CONFIGURE_ARGS
 
 %build
 export LC_CTYPE=en_US.UTF-8