Test search for any version of unnessessary library

source/CMakeLists.txt

@@ -7,16 +7,10 @@ pkg_check_modules(GTK REQUIRED gtk+-3.0)
 include_directories(${GTK_INCLUDE_DIRS})
 link_directories(${GTK_LIBRARY_DIRS})
 add_definitions(${GTK_CFLAGS_OTHER})
-option(USE_WEBKIT "Force turn on or turn off webkit" ON)
-
-if (USE_WEBKIT)
         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()
-
-configure_file(ubl-settings-manager.h.in ubl-settings-manager-cm.h)
 
 #set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pedantic -Wall -Wextra -Werror -Wmissing-declarations -fdiagnostics-color=always -std=c++2a")
 #set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pedantic -Wall -Wextra -Werror -Wmissing-declarations -fdiagnostics-color=always -lm")

source/ubl-settings-manager.c

@@ -136,7 +136,6 @@ void on_item_selection_changed(GtkIconView *IV, actionWidgets *widgets){
 void on_ButtonOpenHelp_activated(GtkWidget *button, GtkBuilder *builder){
     if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(gtk_builder_get_object(builder,"AlwaysOpenHelpCheckbox"))))
     {
-        #ifdef WEBKIT_FOUND
         FILE *fl = popen(check_web2kit_command,"r");
         char ssttrr[1000];
         memset(ssttrr,0,1000);
@@ -150,9 +149,6 @@ void on_ButtonOpenHelp_activated(GtkWidget *button, GtkBuilder *builder){
             gtk_widget_show_all(browser);
         } else
             if(system(UBLINUX_WIKI_COMMAND)){}; 
-        #else 
-        if(system(UBLINUX_WIKI_COMMAND)){};
-        #endif
     } else 
     {
     GtkWidget *window = GTK_WIDGET(gtk_builder_get_object(builder,"HelpSureWindow"));
@@ -175,7 +171,6 @@ void on_CancelHelpButton_activated(GtkWidget *button,GtkBuilder *builder){
 };
 
 void on_ReadHelpButton_activated(GtkWidget *button, GtkBuilder *builder){
-    #ifdef WEBKIT_FOUND
         FILE *fl = popen(check_web2kit_command,"r");
         char ssttrr[1000];
         memset(ssttrr,0,1000);
@@ -189,9 +184,6 @@ void on_ReadHelpButton_activated(GtkWidget *button, GtkBuilder *builder){
             gtk_widget_show_all(browser);
         } else
             if(system(UBLINUX_WIKI_COMMAND)){}; 
-    #else 
-    if(system(UBLINUX_WIKI_COMMAND)){};
-    #endif
     GtkWidget *window = GTK_WIDGET(gtk_builder_get_object(builder,"HelpSureWindow"));
     gtk_widget_hide(window);
 };

source/ubl-settings-manager.h

@@ -5,15 +5,12 @@
 #include <time.h>
 #include <getopt.h>
 #include <dlfcn.h>
-#include "ubl-settings-manager-cm.h"
-#ifdef WEBKIT_FOUND
 #include <webkit2/webkit2.h>
-#endif
 
 #define UBLINUX_WIKI_COMMAND "xdg-open http://wiki.ublinux.ru"
 #define UBLINUX_WIKI_LINK " http://wiki.ublinux.ru"
 
-#define check_web2kit_command "ldconfig -p |grep web2kit"
+#define check_web2kit_command "ldconfig -p |grep webkit2"
 
 #define cmdVersionText yon_char_get_augumented(yon_char_get_augumented(_("Version: "),version_application),"\n")
 #define cmdHelpText yon_char_get_augumented(yon_char_get_augumented(_("ubl-settings-manager version: "),version_application),_("\nGTK settings manager for UBLinux\nUsage:  ubl-settings-manager [OPTIONS...]\nOptions:\n  -h, --help		  Show this help\n  -V, --version	  	  Show package version\n      --lock-settings Lock menu settings\n"))