Template changes

source/CMakeLists.txt

@@ -8,22 +8,23 @@ include_directories(${GTK_INCLUDE_DIRS})
 link_directories(${GTK_LIBRARY_DIRS})
 add_definitions(${GTK_CFLAGS_OTHER})
 
-pkg_check_modules(VTE291 REQUIRED vte-2.91)
+# pkg_check_modules(VTE291 REQUIRED vte-2.91)
-include_directories(${VTE291_INCLUDE_DIRS})
+# include_directories(${VTE291_INCLUDE_DIRS})
-link_directories(${VTE291_LIBRARY_DIRS})
+# link_directories(${VTE291_LIBRARY_DIRS})
-add_definitions(${VTE291_CFLAGS_OTHER})
+# add_definitions(${VTE291_CFLAGS_OTHER})
+# add_definitions(-DVTE_UNCLUDE)
 
 find_library(WEBKIT_LIBRARIES_FOUND webkit2gtk-4.0 webkit2gtk-web-extension-4.0)
 
-option(WEBKIT_FOUND "No" OFF)
 if(WEBKIT_LIBRARIES_FOUND)
-        option(WEBKIT_FOUND "Yes" ON)
+        add_definitions(-DWEBKIT_INCLUDE)
         PKG_CHECK_MODULES(WEBKIT REQUIRED webkit2gtk-4.0 webkit2gtk-web-extension-4.0)
         include_directories(${WEBKIT_INCLUDE_DIRS})
         link_directories(${WEBKIT_LIBRARY_DIRS})
         add_definitions(${WEBKIT_CFLAGS_OTHER})
 endif()
 
+
 set(GRESOURCE_C   resources.c)
 set(GRESOURCE_XML gresource.xml)
 
@@ -65,8 +66,6 @@ add_custom_target(
     DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${GRESOURCE_C}
 )
 
-add_definitions(-DVTE_INCLUDE)
-
 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -Werror -Wmissing-declarations -fdiagnostics-color=always \
 	-O2 -pipe -fno-plt -fexceptions \
         -Wformat -Werror=format-security \

source/ubl-settings-bootloader.h

@@ -10,7 +10,7 @@
 #include <libublsettings.h>
 #include <libublsettings-gtk3.h>
 #include <libublsettingsui-gtk3.h>
-#ifdef WEBKIT_FOUND
+#ifdef WEBKIT_INCLUDE
     #include <webkit2/webkit2.h>
 #endif 
 #include "ubl-strings.h"