configure

branch
newapi
changeset 292
8e5e7adf5372
parent 277
5099a34747c4
--- a/configure	Fri Jun 14 18:25:43 2024 +0200
+++ b/configure	Sun Jun 16 10:42:22 2024 +0200
@@ -365,13 +365,13 @@
         if [ -z "$PKG_CONFIG" ]; then
             break
         fi
-        if test_pkg_config "gtk+-4.0" "" "" "" ; then
-            TEMP_CFLAGS="$TEMP_CFLAGS `"$PKG_CONFIG" --cflags gtk+-4.0`"
-            TEMP_LDFLAGS="$TEMP_LDFLAGS `"$PKG_CONFIG" --libs gtk+-4.0`"
+        if test_pkg_config "gtk4" "" "" "" ; then
+            TEMP_CFLAGS="$TEMP_CFLAGS `"$PKG_CONFIG" --cflags gtk4`"
+            TEMP_LDFLAGS="$TEMP_LDFLAGS `"$PKG_CONFIG" --libs gtk4`"
         else
             break
         fi
-        TEMP_CFLAGS="$TEMP_CFLAGS -DUI_GTK3"
+        TEMP_CFLAGS="$TEMP_CFLAGS -DUI_GTK4"
         TEMP_LDFLAGS="$TEMP_LDFLAGS -lpthread"
         print_check_msg "$dep_checked_gtk4" "yes\n"
         dep_checked_gtk4=1
@@ -682,13 +682,13 @@
             break
         fi
         fi
-        if checkopt_toolkit_gtk3 ; then
-            echo "  toolkit: gtk3" >> "$TEMP_DIR/options"
+        if checkopt_toolkit_gtk4 ; then
+            echo "  toolkit: gtk4" >> "$TEMP_DIR/options"
             ERROR=0
             break
         fi
-        if checkopt_toolkit_qt5 ; then
-            echo "  toolkit: qt5" >> "$TEMP_DIR/options"
+        if checkopt_toolkit_gtk3 ; then
+            echo "  toolkit: gtk3" >> "$TEMP_DIR/options"
             ERROR=0
             break
         fi

mercurial