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

Fix checking for GTK+ 3.0 in configure.

Browse Source 
Update gtk-3.0.m4 to work correctly with gthread module and regenerate
configure using the new version of this file.

Closes #15319.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74475 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2013-07-10 20:48:48 +00:00
parent 46629a0a1c
commit 497b4e64ce
2 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
build/aclocal/gtk-3.0.m4
View File

@@ -12,12 +12,14 @@ dnl
AC_ARG_ENABLE(gtktest, [ --disable-gtktest do not try to compile and run a test GTK+ program], AC_ARG_ENABLE(gtktest, [ --disable-gtktest do not try to compile and run a test GTK+ program],
, enable_gtktest=yes) , enable_gtktest=yes)
pkg_config_args=gtk+-3.0 pkg_gtk_version=gtk+-3.0
pkg_config_args=$pkg_gtk_version
for module in . $4 for module in . $4
do do
case "$module" in case "$module" in
gthread) gthread)
pkg_config_args="$pkg_config_args gthread-2.0" pkg_gthread_version=gthread-2.0
pkg_config_args="$pkg_config_args $pkg_gthread_version"
;; ;;
esac esac
done done
@@ -47,8 +49,7 @@ AC_ARG_ENABLE(gtktest, [ --disable-gtktest do not try to compile and run
echo "Will use uninstalled version of GTK+ found in PKG_CONFIG_PATH" echo "Will use uninstalled version of GTK+ found in PKG_CONFIG_PATH"
enable_gtktest=no enable_gtktest=no
fi fi
if $PKG_CONFIG --atleast-version $min_gtk_version $pkg_gtk_version ; then
if $PKG_CONFIG --atleast-version $min_gtk_version $pkg_config_args; then
: :
else else
no_gtk=yes no_gtk=yes
@@ -205,7 +206,7 @@ AC_DEFUN([GTK_CHECK_BACKEND],
AC_PATH_PROG(PKG_CONFIG, [pkg-config], [AC_MSG_ERROR([No pkg-config found])]) AC_PATH_PROG(PKG_CONFIG, [pkg-config], [AC_MSG_ERROR([No pkg-config found])])
if $PKG_CONFIG --atleast-version $min_gtk_version $pkg_config_args ; then if $PKG_CONFIG --atleast-version $min_gtk_version $pkg_gtk_version ; then
target_found=yes target_found=yes
else else
target_found=no target_found=no

9
configure vendored
View File

@@ -23646,12 +23646,14 @@ else
fi fi
pkg_config_args=gtk+-3.0 pkg_gtk_version=gtk+-3.0
pkg_config_args=$pkg_gtk_version
for module in . $GTK_MODULES for module in . $GTK_MODULES
do do
case "$module" in case "$module" in
gthread) gthread)
pkg_config_args="$pkg_config_args gthread-2.0" pkg_gthread_version=gthread-2.0
pkg_config_args="$pkg_config_args $pkg_gthread_version"
;; ;;
esac esac
done done
@@ -23722,8 +23724,7 @@ $as_echo_n "checking for GTK+ - version >= $min_gtk_version... " >&6; }
echo "Will use uninstalled version of GTK+ found in PKG_CONFIG_PATH" echo "Will use uninstalled version of GTK+ found in PKG_CONFIG_PATH"
enable_gtktest=no enable_gtktest=no
fi fi
if $PKG_CONFIG --atleast-version $min_gtk_version $pkg_gtk_version ; then
if $PKG_CONFIG --atleast-version $min_gtk_version $pkg_config_args; then
: :
else else
no_gtk=yes no_gtk=yes