From 2524230467574b180377f80e19e44d11cdca1672 Mon Sep 17 00:00:00 2001
From: lherschi <lhersch@dssgmbh.de>
Date: Wed, 20 Oct 2021 21:52:17 +0200
Subject: [PATCH] fix for correct display of build options in qt-gui in menu
 help->build options

---
 avidemux/common/ADM_commonUI/DIA_builtin.cpp | 2 +-
 avidemux/qt4/CMakeLists.txt                  | 5 +++++
 cmake/config.h.cmake                         | 4 ++--
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/avidemux/common/ADM_commonUI/DIA_builtin.cpp b/avidemux/common/ADM_commonUI/DIA_builtin.cpp
index 23635a3ea3..111aaeb9a2 100644
--- a/avidemux/common/ADM_commonUI/DIA_builtin.cpp
+++ b/avidemux/common/ADM_commonUI/DIA_builtin.cpp
@@ -48,7 +48,7 @@ uint8_t DIA_builtin(void)
 #ifdef USE_VDPAU
     adm_vdpau=1;
 #endif
-#ifdef USE_FONTCONFIG
+#ifdef HAVE_FONTCONFIG
   adm_fontconfig=1;
 #endif
 
diff --git a/avidemux/qt4/CMakeLists.txt b/avidemux/qt4/CMakeLists.txt
index 6aa5f82dd5..c7c581dbd6 100755
--- a/avidemux/qt4/CMakeLists.txt
+++ b/avidemux/qt4/CMakeLists.txt
@@ -81,6 +81,11 @@ INCLUDE_DIRECTORIES(${QT_INCLUDES})
 ADD_DEFINITIONS(${QT_DEFINITIONS})
 #--
 
+INCLUDE(admCheckFreeType)
+checkFreeType()
+INCLUDE(admCheckFontConfig)
+checkFontConfig()
+
 #
 ##########################################
 # Config
diff --git a/cmake/config.h.cmake b/cmake/config.h.cmake
index 3ff12100cb..d6f9edca9d 100644
--- a/cmake/config.h.cmake
+++ b/cmake/config.h.cmake
@@ -13,11 +13,11 @@
 #define PACKAGE   "avidemux"
 #define ADMLOCALE "${ADM_LOCALE}"
 
+/* FontConfig detected */
+#cmakedefine HAVE_FONTCONFIG
 
-#if ${CONFIG_HEADER_TYPE} == ADM_BUILD_CLI || ${CONFIG_HEADER_TYPE} == ADM_BUILD_GTK
 /* Define if the GNU gettext() function is already present or preinstalled. */
 #cmakedefine HAVE_GETTEXT
-#endif
 
 // GTK+ uses X11 framework
 #cmakedefine HAVE_GTK_X11