comparison: configure
configure
- branch
- newapi
- changeset 292
- 8e5e7adf5372
- parent 277
- 5099a34747c4
equal
deleted
inserted
replaced
| 291:302a150ff5e4 | 292:8e5e7adf5372 |
|---|---|
| 363 while true | 363 while true |
| 364 do | 364 do |
| 365 if [ -z "$PKG_CONFIG" ]; then | 365 if [ -z "$PKG_CONFIG" ]; then |
| 366 break | 366 break |
| 367 fi | 367 fi |
| 368 if test_pkg_config "gtk+-4.0" "" "" "" ; then | 368 if test_pkg_config "gtk4" "" "" "" ; then |
| 369 TEMP_CFLAGS="$TEMP_CFLAGS `"$PKG_CONFIG" --cflags gtk+-4.0`" | 369 TEMP_CFLAGS="$TEMP_CFLAGS `"$PKG_CONFIG" --cflags gtk4`" |
| 370 TEMP_LDFLAGS="$TEMP_LDFLAGS `"$PKG_CONFIG" --libs gtk+-4.0`" | 370 TEMP_LDFLAGS="$TEMP_LDFLAGS `"$PKG_CONFIG" --libs gtk4`" |
| 371 else | 371 else |
| 372 break | 372 break |
| 373 fi | 373 fi |
| 374 TEMP_CFLAGS="$TEMP_CFLAGS -DUI_GTK3" | 374 TEMP_CFLAGS="$TEMP_CFLAGS -DUI_GTK4" |
| 375 TEMP_LDFLAGS="$TEMP_LDFLAGS -lpthread" | 375 TEMP_LDFLAGS="$TEMP_LDFLAGS -lpthread" |
| 376 print_check_msg "$dep_checked_gtk4" "yes\n" | 376 print_check_msg "$dep_checked_gtk4" "yes\n" |
| 377 dep_checked_gtk4=1 | 377 dep_checked_gtk4=1 |
| 378 return 1 | 378 return 1 |
| 379 done | 379 done |
| 680 echo " toolkit: cocoa" >> "$TEMP_DIR/options" | 680 echo " toolkit: cocoa" >> "$TEMP_DIR/options" |
| 681 ERROR=0 | 681 ERROR=0 |
| 682 break | 682 break |
| 683 fi | 683 fi |
| 684 fi | 684 fi |
| 685 if checkopt_toolkit_gtk4 ; then | |
| 686 echo " toolkit: gtk4" >> "$TEMP_DIR/options" | |
| 687 ERROR=0 | |
| 688 break | |
| 689 fi | |
| 685 if checkopt_toolkit_gtk3 ; then | 690 if checkopt_toolkit_gtk3 ; then |
| 686 echo " toolkit: gtk3" >> "$TEMP_DIR/options" | 691 echo " toolkit: gtk3" >> "$TEMP_DIR/options" |
| 687 ERROR=0 | |
| 688 break | |
| 689 fi | |
| 690 if checkopt_toolkit_qt5 ; then | |
| 691 echo " toolkit: qt5" >> "$TEMP_DIR/options" | |
| 692 ERROR=0 | 692 ERROR=0 |
| 693 break | 693 break |
| 694 fi | 694 fi |
| 695 if checkopt_toolkit_gtk2 ; then | 695 if checkopt_toolkit_gtk2 ; then |
| 696 echo " toolkit: gtk2" >> "$TEMP_DIR/options" | 696 echo " toolkit: gtk2" >> "$TEMP_DIR/options" |
