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

Test whether GTK+ is 2.18 or newer in configure.

Browse Source 
We need to define __WXGTK218__ symbol in configure instead of simply checking
if we are compiled with 2.18 in wx/infobar.h because GTK_CHECK_VERSION() can't
be used when compiling user code which can't even include gtk/gtkversion.h
defining it because it doesn't necessarily use `pkg-config --cflags gtk+-2.0`
at all in its CFLAGS.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62405 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2009-10-14 22:49:38 +00:00
parent b43914a8be
commit d85aece199
5 changed files with 138 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

98
configure vendored
View File

@@ -29532,8 +29532,8 @@ libraries returned by 'pkg-config gtk+-2.0 --libs' or 'gtk-config
CFLAGS="$wx_cv_cflags_gtk $CFLAGS"
LIBS="$LIBS $wx_cv_libs_gtk"
{ echo "$as_me:$LINENO: checking if GTK+ is version >= 2.10" >&5
echo $ECHO_N "checking if GTK+ is version >= 2.10... $ECHO_C" >&6; }
{ echo "$as_me:$LINENO: checking if GTK+ is version >= 2.18" >&5
echo $ECHO_N "checking if GTK+ is version >= 2.18... $ECHO_C" >&6; }
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -29547,8 +29547,8 @@ int
main ()
{
#if !GTK_CHECK_VERSION(2,10,0)
Not GTK+ 2.10
#if !GTK_CHECK_VERSION(2,18,0)
Not GTK+ 2.18
#endif
;
@@ -29573,6 +29573,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
test ! -s conftest.err
} && test -s conftest.$ac_objext; then
cat >>confdefs.h <<\_ACEOF
#define __WXGTK218__ 1
_ACEOF
cat >>confdefs.h <<\_ACEOF
#define __WXGTK210__ 1
_ACEOF
@@ -29583,7 +29587,7 @@ _ACEOF
{ echo "$as_me:$LINENO: result: yes" >&5
echo "${ECHO_T}yes" >&6; }
ac_wxgtk210=1
ac_wxgtk218=1
else
echo "$as_me: failed program was:" >&5
@@ -29592,15 +29596,15 @@ sed 's/^/| /' conftest.$ac_ext >&5
{ echo "$as_me:$LINENO: result: no" >&5
echo "${ECHO_T}no" >&6; }
ac_wxgtk210=0
ac_wxgtk218=0
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
if test "$ac_wxgtk210" = 0; then
{ echo "$as_me:$LINENO: checking if GTK+ is version >= 2.6" >&5
echo $ECHO_N "checking if GTK+ is version >= 2.6... $ECHO_C" >&6; }
if test "$ac_wxgtk218" = 0; then
{ echo "$as_me:$LINENO: checking if GTK+ is version >= 2.10" >&5
echo $ECHO_N "checking if GTK+ is version >= 2.10... $ECHO_C" >&6; }
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -29614,8 +29618,8 @@ int
main ()
{
#if !GTK_CHECK_VERSION(2,6,0)
Not GTK+ 2.6
#if !GTK_CHECK_VERSION(2,10,0)
Not GTK+ 2.10
#endif
;
@@ -29640,13 +29644,17 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
test ! -s conftest.err
} && test -s conftest.$ac_objext; then
cat >>confdefs.h <<\_ACEOF
#define __WXGTK210__ 1
_ACEOF
cat >>confdefs.h <<\_ACEOF
#define __WXGTK26__ 1
_ACEOF
{ echo "$as_me:$LINENO: result: yes" >&5
echo "${ECHO_T}yes" >&6; }
ac_wxgtk26=1
ac_wxgtk210=1
else
echo "$as_me: failed program was:" >&5
@@ -29655,11 +29663,75 @@ sed 's/^/| /' conftest.$ac_ext >&5
{ echo "$as_me:$LINENO: result: no" >&5
echo "${ECHO_T}no" >&6; }
ac_wxgtk26=0
ac_wxgtk210=0
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
if test "$ac_wxgtk210" = 0; then
{ echo "$as_me:$LINENO: checking if GTK+ is version >= 2.6" >&5
echo $ECHO_N "checking if GTK+ is version >= 2.6... $ECHO_C" >&6; }
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#include <gtk/gtk.h>
int
main ()
{
#if !GTK_CHECK_VERSION(2,6,0)
Not GTK+ 2.6
#endif
;
return 0;
}
_ACEOF
rm -f conftest.$ac_objext
if { (ac_try="$ac_compile"
case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
(eval "$ac_compile") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
} && test -s conftest.$ac_objext; then
cat >>confdefs.h <<\_ACEOF
#define __WXGTK26__ 1
_ACEOF
{ echo "$as_me:$LINENO: result: yes" >&5
echo "${ECHO_T}yes" >&6; }
ac_wxgtk26=1
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
{ echo "$as_me:$LINENO: result: no" >&5
echo "${ECHO_T}no" >&6; }
ac_wxgtk26=0
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
fi
CFLAGS="$save_CFLAGS"