Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix the pkg-config name for gtk4

Browse Source 
See https://developer.gnome.org/gtk4/stable/gtk-compiling.html

Closes https://github.com/wxWidgets/wxWidgets/pull/1642
This commit is contained in:
wangqr
2019-11-07 22:09:51 -05:00
committed by Vadim Zeitlin
parent f0871418d0
commit 79794cd415
2 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
configure vendored
View File

@@ -23132,7 +23132,7 @@ fi
min_gtk_version=3.90.0
pkg_config_args="gtk+-4.0 >= $min_gtk_version"
pkg_config_args="gtk4 >= $min_gtk_version"
for module in . $GTK_MODULES
do
case "$module" in
@@ -23218,11 +23218,11 @@ $as_echo_n "checking for GTK+ - version >= $min_gtk_version... " >&6; }
if test x"$no_gtk" = x ; then
GTK_CFLAGS=`$PKG_CONFIG $pkg_config_args --cflags`
GTK_LIBS=`$PKG_CONFIG $pkg_config_args --libs`
gtk_config_major_version=`$PKG_CONFIG --modversion gtk+-4.0 | \
gtk_config_major_version=`$PKG_CONFIG --modversion gtk4 | \
sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'`
gtk_config_minor_version=`$PKG_CONFIG --modversion gtk+-4.0 | \
gtk_config_minor_version=`$PKG_CONFIG --modversion gtk4 | \
sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\2/'`
gtk_config_micro_version=`$PKG_CONFIG --modversion gtk+-4.0 | \
gtk_config_micro_version=`$PKG_CONFIG --modversion gtk4 | \
sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\3/'`
if test "x$enable_gtktest" = "xyes" ; then
ac_save_CFLAGS="$CFLAGS"
@@ -23256,7 +23256,7 @@ main ()
(gtk_get_minor_version() != $gtk_config_minor_version) ||
(gtk_get_micro_version() != $gtk_config_micro_version))
{
printf("\n*** 'pkg-config --modversion gtk+-4.0' returned %d.%d.%d, but GTK+ (%d.%d.%d)\n",
printf("\n*** 'pkg-config --modversion gtk4' returned %d.%d.%d, but GTK+ (%d.%d.%d)\n",
$gtk_config_major_version, $gtk_config_minor_version, $gtk_config_micro_version,
gtk_get_major_version(), gtk_get_minor_version(), gtk_get_micro_version());
printf ("*** was found! If pkg-config was correct, then it is best\n");