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

update minimum GTK2 version requirement to 2.6

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@72001 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Paul Cornett
2012-07-10 16:39:44 +00:00
parent abac13f901
commit 4e621d2471
18 changed files with 18 additions and 381 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
configure vendored
View File

@@ -23103,7 +23103,7 @@ fi
no_gtk=yes
fi
min_gtk_version=2.4.0
min_gtk_version=2.6.0
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GTK+ - version >= $min_gtk_version" >&5
$as_echo_n "checking for GTK+ - version >= $min_gtk_version... " >&6; }
@@ -24147,8 +24147,6 @@ libraries returned by 'pkg-config gtk+-2.0 --libs' or 'gtk-config
$as_echo "#define __WXGTK210__ 1" >>confdefs.h
$as_echo "#define __WXGTK26__ 1" >>confdefs.h
elif test "$WXGTK2" = 1; then
save_CFLAGS="$CFLAGS"
save_LIBS="$LIBS"
@@ -24180,8 +24178,6 @@ if ac_fn_c_try_compile "$LINENO"; then :
$as_echo "#define __WXGTK210__ 1" >>confdefs.h
$as_echo "#define __WXGTK26__ 1" >>confdefs.h
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
ac_wxgtk218=1
@@ -24219,8 +24215,6 @@ if ac_fn_c_try_compile "$LINENO"; then :
$as_echo "#define __WXGTK210__ 1" >>confdefs.h
$as_echo "#define __WXGTK26__ 1" >>confdefs.h
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
ac_wxgtk210=1
@@ -24233,44 +24227,6 @@ $as_echo "no" >&6; }
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
if test "$ac_wxgtk210" = 0; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if GTK+ is version >= 2.6" >&5
$as_echo_n "checking if GTK+ is version >= 2.6... " >&6; }
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <gtk/gtk.h>
int
main ()
{
#if !GTK_CHECK_VERSION(2,6,0)
Not GTK+ 2.6
#endif
;
return 0;
}
_ACEOF
if ac_fn_c_try_compile "$LINENO"; then :
$as_echo "#define __WXGTK26__ 1" >>confdefs.h
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
ac_wxgtk26=1
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
ac_wxgtk26=0
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
fi
CFLAGS="$save_CFLAGS"