fix for correct display of build options in qt-gui in menu help->buil…

…d options
mean00 · Oct 20, 2021 · 2524230 · 2524230
1 parent 9e4cf0b
commit 2524230
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git 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
@@ -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
@@ -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