From 20e26c840bc0c01933b42c8fd7846d1ca8d45a2a Mon Sep 17 00:00:00 2001
From: Moritz Bunkus <moritz@bunkus.org>
Date: Sat, 15 Aug 2015 18:53:12 +0200
Subject: [PATCH] build system: remove option --without-mkvtoolnix-gui

---
 ChangeLog             |  7 +++++++
 Rakefile              |  2 +-
 ac/qt5.m4             | 10 ----------
 build-config.in       |  1 -
 debian-upstream/rules |  4 ++--
 5 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 1ef029a66..6c30e10e2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2015-08-15  Moritz Bunkus  <moritz@bunkus.org>
 
+        * build system: removal: the switch »--without-mkvtoolnix-gui« has
+        been removed. There are only two GUIs left in the package: the
+        Qt-enabled mkvinfo and MKVToolNix GUI. Both are enabled by default
+        and can be disabled with the option »--disable-qt«. In that case
+        only the text-mode version of mkvinfo is built, and the MKVToolNix
+        GUI is not built at all.
+
         * Removal: all support for wxWidgets has been removed. This means
         that the mkvmerge GUI (mmg) has been removed and that mkvinfo now
         only supports a text-mode and a Qt-based interface.
diff --git a/Rakefile b/Rakefile
index 508a04831..f3a91c1b7 100755
--- a/Rakefile
+++ b/Rakefile
@@ -43,7 +43,7 @@ require_relative "rake.d/tarball"
 require_relative 'rake.d/gtest' if $have_gtest
 
 def setup_globals
-  $build_mkvtoolnix_gui  ||=  c?(:USE_QT) && c?(:BUILD_MKVTOOLNIX_GUI)
+  $build_mkvtoolnix_gui  ||=  c?(:USE_QT)
   $build_tools           ||=  c?(:BUILD_TOOLS)
 
   $programs                =  %w{mkvmerge mkvinfo mkvextract mkvpropedit}
diff --git a/ac/qt5.m4 b/ac/qt5.m4
index 48786beb8..8b15ffa41 100644
--- a/ac/qt5.m4
+++ b/ac/qt5.m4
@@ -229,13 +229,6 @@ return 0;
     fi
   fi
 
-  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
-
   AC_PATH_PROG(LCONVERT, lconvert)
 
 else
@@ -248,8 +241,6 @@ if test x"$have_qt" != "xyes" ; then
   QT_LIBS=
   MOC=
   UIC=
-elif test x"$BUILD_MKVTOOLNIX_GUI" = "xyes" ; then
-  opt_features_yes="$opt_features_yes\n   * mkvtoolnix-gui"
 fi
 
 AC_SUBST(MOC)
@@ -257,4 +248,3 @@ AC_SUBST(UIC)
 AC_SUBST(QT_CFLAGS)
 AC_SUBST(QT_LIBS)
 AC_SUBST(USE_QT)
-AC_SUBST(BUILD_MKVTOOLNIX_GUI)
diff --git a/build-config.in b/build-config.in
index effb92ebf..6df7e9d31 100644
--- a/build-config.in
+++ b/build-config.in
@@ -132,7 +132,6 @@ ZLIB_LIBS = @ZLIB_LIBS@
 
 # Which additional stuff to compile
 USE_QT = @USE_QT@
-BUILD_MKVTOOLNIX_GUI = @BUILD_MKVTOOLNIX_GUI@
 BUILD_TOOLS = @BUILD_TOOLS@
 
 TRANSLATIONS = @TRANSLATIONS@
diff --git a/debian-upstream/rules b/debian-upstream/rules
index 63fcef775..57e3e45bd 100755
--- a/debian-upstream/rules
+++ b/debian-upstream/rules
@@ -31,8 +31,8 @@ override_dh_clean:
 	rake.d/dependecy.d/*.rb src/input/*.d config.h build-config
 
 override_dh_install:
-	./drake install 'install:shared' DESTDIR=$(CURDIR)/debian/tmp docdir='$${datarootdir}/doc/mkvtoolnix-gui'
-	./drake 'install:manpages' DESTDIR=$(CURDIR)/debian/tmp USE_QT=yes BUILD_MKVTOOLNIX_GUI=yes docdir='$${datarootdir}/doc/mkvtoolnix-gui'
+	./drake install 'install:shared'      DESTDIR=$(CURDIR)/debian/tmp docdir='$${datarootdir}/doc/mkvtoolnix-gui'
+	./drake 'install:manpages' USE_QT=yes DESTDIR=$(CURDIR)/debian/tmp docdir='$${datarootdir}/doc/mkvtoolnix-gui'
 
 	dh_install --list-missing -Xmkvtoolnix.xml