AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

require GTK+ 2.4 for wxGTK2

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@49661 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin 2007-11-05 22:32:45 +00:00
parent ff654490b7
commit 88262190d5
3 changed files with 97 additions and 121 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

177
configure vendored
View File

@ -1,5 +1,5 @@
#! /bin/sh
# From configure.in Id: configure.in 49606 2007-11-03 16:14:28Z PC .
# From configure.in Id: configure.in 49607 2007-11-03 16:44:04Z PC .
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.61 for wxWidgets 2.9.0.
#
@ -869,6 +869,7 @@ COND_PLATFORM_MACOSX_1_TOOLKIT_X11
COND_PLATFORM_MACOSX_1_USE_GUI_1
COND_PLATFORM_MACOSX_1_USE_SOVERSION_1
COND_PLATFORM_MACOS_1
COND_PLATFORM_MAC_1
COND_PLATFORM_MSDOS_1
COND_PLATFORM_OS2_1
COND_PLATFORM_UNIX_0
@ -880,6 +881,9 @@ COND_PLATFORM_UNIX_1_USE_PLUGINS_0
COND_PLATFORM_WIN32_0
COND_PLATFORM_WIN32_1
COND_SHARED_0
COND_SHARED_0_TOOLKIT_MAC_WXUNIV_0
COND_SHARED_0_TOOLKIT_MSW_WXUNIV_0
COND_SHARED_0_TOOLKIT_PM_WXUNIV_0
COND_SHARED_0_USE_GUI_1_USE_OPENGL_1
COND_SHARED_0_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN
COND_SHARED_0_USE_GUI_1_WXUSE_LIBPNG_BUILTIN
@ -30552,7 +30556,7 @@ if test "$wxUSE_GUI" = "yes"; then
WXGTK12=
WXGTK127=
WXGTK20=
WXGTK2=
WXGPE=
if test "$wxUSE_COCOA" = 1 ; then
@ -30685,7 +30689,7 @@ fi
no_gtk=yes
fi
min_gtk_version=2.0.0
min_gtk_version=2.4.0
{ echo "$as_me:$LINENO: checking for GTK+ - version >= $min_gtk_version" >&5
echo $ECHO_N "checking for GTK+ - version >= $min_gtk_version... $ECHO_C" >&6; }
@ -31603,7 +31607,7 @@ echo "${ECHO_T}$wx_cv_lib_gtk" >&6; }
fi
case "$wx_cv_lib_gtk" in
2.0) WXGTK20=1
2.0) WXGTK2=1
TOOLKIT_VERSION=2
;;
1.2.7) WXGTK127=1
@ -31631,7 +31635,7 @@ libraries returned by 'pkg-config gtk+-2.0 --libs' or 'gtk-config
;;
esac
if test "$WXGTK20" = 1; then
if test "$WXGTK2" = 1; then
save_CFLAGS="$CFLAGS"
save_LIBS="$LIBS"
CFLAGS="$wx_cv_cflags_gtk $CFLAGS"
@ -31758,10 +31762,6 @@ _ACEOF
cat >>confdefs.h <<\_ACEOF
#define __WXGTK26__ 1
_ACEOF
cat >>confdefs.h <<\_ACEOF
#define __WXGTK24__ 1
_ACEOF
{ echo "$as_me:$LINENO: result: yes" >&5
@ -31825,10 +31825,6 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
cat >>confdefs.h <<\_ACEOF
#define __WXGTK26__ 1
_ACEOF
cat >>confdefs.h <<\_ACEOF
#define __WXGTK24__ 1
_ACEOF
{ echo "$as_me:$LINENO: result: yes" >&5
@ -31846,68 +31842,6 @@ echo "${ECHO_T}no" >&6; }
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
if test "$ac_wxgtk26" = 0; then
{ echo "$as_me:$LINENO: checking if GTK+ is version >= 2.4" >&5
echo $ECHO_N "checking if GTK+ is version >= 2.4... $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,4,0)
Not GTK+ 2.4
#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 __WXGTK24__ 1
_ACEOF
{ echo "$as_me:$LINENO: result: yes" >&5
echo "${ECHO_T}yes" >&6; }
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; }
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
@ -43582,9 +43516,9 @@ echo "${ECHO_T}no" >&6; }
fi
fi
if test "$WXGTK20" = 1 ; then
if test "$WXGTK2" = 1 ; then
cat >>confdefs.h <<_ACEOF
#define __WXGTK20__ $WXGTK20
#define __WXGTK20__ $WXGTK2
_ACEOF
WXGTK12=1
@ -44821,7 +44755,7 @@ _ACEOF
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS sound"
fi
if test "$WXGTK20" = 1; then
if test "$WXGTK2" = 1; then
if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
@ -49346,7 +49280,7 @@ TOOLKIT_LOWERCASE=`echo $TOOLKIT | tr A-Z a-z`
case "$TOOLKIT" in
GTK)
TOOLKIT_DESC="GTK+"
if test "$WXGTK20" = 1; then
if test "$WXGTK2" = 1; then
TOOLKIT_DESC="$TOOLKIT_DESC 2"
if test "$wxUSE_GTKPRINT" = "yes" ; then
TOOLKIT_EXTRA="$TOOLKIT_EXTRA GTK+ printing";
@ -51934,6 +51868,11 @@ EOF
COND_PLATFORM_MACOS_1=""
fi
COND_PLATFORM_MAC_1="#"
if test "x$PLATFORM_MAC" = "x1" ; then
COND_PLATFORM_MAC_1=""
fi
COND_PLATFORM_MSDOS_1="#"
if test "x$PLATFORM_MSDOS" = "x1" ; then
COND_PLATFORM_MSDOS_1=""
@ -51989,6 +51928,21 @@ EOF
COND_SHARED_0=""
fi
COND_SHARED_0_TOOLKIT_MAC_WXUNIV_0="#"
if test "x$SHARED" = "x0" -a "x$TOOLKIT" = "xMAC" -a "x$WXUNIV" = "x0" ; then
COND_SHARED_0_TOOLKIT_MAC_WXUNIV_0=""
fi
COND_SHARED_0_TOOLKIT_MSW_WXUNIV_0="#"
if test "x$SHARED" = "x0" -a "x$TOOLKIT" = "xMSW" -a "x$WXUNIV" = "x0" ; then
COND_SHARED_0_TOOLKIT_MSW_WXUNIV_0=""
fi
COND_SHARED_0_TOOLKIT_PM_WXUNIV_0="#"
if test "x$SHARED" = "x0" -a "x$TOOLKIT" = "xPM" -a "x$WXUNIV" = "x0" ; then
COND_SHARED_0_TOOLKIT_PM_WXUNIV_0=""
fi
COND_SHARED_0_USE_GUI_1_USE_OPENGL_1="#"
if test "x$SHARED" = "x0" -a "x$USE_GUI" = "x1" -a "x$USE_OPENGL" = "x1" ; then
COND_SHARED_0_USE_GUI_1_USE_OPENGL_1=""
@ -53835,6 +53789,7 @@ COND_PLATFORM_MACOSX_1_TOOLKIT_X11!$COND_PLATFORM_MACOSX_1_TOOLKIT_X11$ac_delim
COND_PLATFORM_MACOSX_1_USE_GUI_1!$COND_PLATFORM_MACOSX_1_USE_GUI_1$ac_delim
COND_PLATFORM_MACOSX_1_USE_SOVERSION_1!$COND_PLATFORM_MACOSX_1_USE_SOVERSION_1$ac_delim
COND_PLATFORM_MACOS_1!$COND_PLATFORM_MACOS_1$ac_delim
COND_PLATFORM_MAC_1!$COND_PLATFORM_MAC_1$ac_delim
COND_PLATFORM_MSDOS_1!$COND_PLATFORM_MSDOS_1$ac_delim
COND_PLATFORM_OS2_1!$COND_PLATFORM_OS2_1$ac_delim
COND_PLATFORM_UNIX_0!$COND_PLATFORM_UNIX_0$ac_delim
@ -53846,6 +53801,9 @@ COND_PLATFORM_UNIX_1_USE_PLUGINS_0!$COND_PLATFORM_UNIX_1_USE_PLUGINS_0$ac_delim
COND_PLATFORM_WIN32_0!$COND_PLATFORM_WIN32_0$ac_delim
COND_PLATFORM_WIN32_1!$COND_PLATFORM_WIN32_1$ac_delim
COND_SHARED_0!$COND_SHARED_0$ac_delim
COND_SHARED_0_TOOLKIT_MAC_WXUNIV_0!$COND_SHARED_0_TOOLKIT_MAC_WXUNIV_0$ac_delim
COND_SHARED_0_TOOLKIT_MSW_WXUNIV_0!$COND_SHARED_0_TOOLKIT_MSW_WXUNIV_0$ac_delim
COND_SHARED_0_TOOLKIT_PM_WXUNIV_0!$COND_SHARED_0_TOOLKIT_PM_WXUNIV_0$ac_delim
COND_SHARED_0_USE_GUI_1_USE_OPENGL_1!$COND_SHARED_0_USE_GUI_1_USE_OPENGL_1$ac_delim
COND_SHARED_0_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN!$COND_SHARED_0_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN$ac_delim
COND_SHARED_0_USE_GUI_1_WXUSE_LIBPNG_BUILTIN!$COND_SHARED_0_USE_GUI_1_WXUSE_LIBPNG_BUILTIN$ac_delim
@ -53869,10 +53827,6 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1!$COND_TOOLKIT_GTK_TOOLKIT_VERSION_2
COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0!$COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0$ac_delim
COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1!$COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1$ac_delim
COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0!$COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0$ac_delim
COND_TOOLKIT_GTK_USE_GUI_1!$COND_TOOLKIT_GTK_USE_GUI_1$ac_delim
COND_TOOLKIT_MAC!$COND_TOOLKIT_MAC$ac_delim
COND_TOOLKIT_MAC_USE_GUI_1!$COND_TOOLKIT_MAC_USE_GUI_1$ac_delim
COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0!$COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0$ac_delim
_ACEOF
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
@ -53914,6 +53868,10 @@ _ACEOF
ac_delim='%!_!# '
for ac_last_try in false false false false false :; do
cat >conf$$subs.sed <<_ACEOF
COND_TOOLKIT_GTK_USE_GUI_1!$COND_TOOLKIT_GTK_USE_GUI_1$ac_delim
COND_TOOLKIT_MAC!$COND_TOOLKIT_MAC$ac_delim
COND_TOOLKIT_MAC_USE_GUI_1!$COND_TOOLKIT_MAC_USE_GUI_1$ac_delim
COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0!$COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0$ac_delim
COND_TOOLKIT_MGL!$COND_TOOLKIT_MGL$ac_delim
COND_TOOLKIT_MGL_USE_GUI_1!$COND_TOOLKIT_MGL_USE_GUI_1$ac_delim
COND_TOOLKIT_MOTIF!$COND_TOOLKIT_MOTIF$ac_delim
@ -54007,10 +53965,6 @@ LIBWXMACRES!$LIBWXMACRES$ac_delim
POSTLINK_COMMAND!$POSTLINK_COMMAND$ac_delim
MACSETFILE!$MACSETFILE$ac_delim
GCC!$GCC$ac_delim
DLLTOOL!$DLLTOOL$ac_delim
CPPUNIT_CONFIG!$CPPUNIT_CONFIG$ac_delim
LIBOBJS!$LIBOBJS$ac_delim
LTLIBOBJS!$LTLIBOBJS$ac_delim
_ACEOF
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
@ -54049,6 +54003,53 @@ CEOF$ac_eof
_ACEOF
ac_delim='%!_!# '
for ac_last_try in false false false false false :; do
cat >conf$$subs.sed <<_ACEOF
DLLTOOL!$DLLTOOL$ac_delim
CPPUNIT_CONFIG!$CPPUNIT_CONFIG$ac_delim
LIBOBJS!$LIBOBJS$ac_delim
LTLIBOBJS!$LTLIBOBJS$ac_delim
_ACEOF
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 4; then
break
elif $ac_last_try; then
{ { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
{ (exit 1); exit 1; }; }
else
ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
fi
done
ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed`
if test -n "$ac_eof"; then
ac_eof=`echo "$ac_eof" | sort -nru | sed 1q`
ac_eof=`expr $ac_eof + 1`
fi
cat >>$CONFIG_STATUS <<_ACEOF
cat >"\$tmp/subs-5.sed" <<\CEOF$ac_eof
/@[a-zA-Z_][a-zA-Z_0-9]*@/!b end
_ACEOF
sed '
s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
s/^/s,@/; s/!/@,|#_!!_#|/
:n
t n
s/'"$ac_delim"'$/,g/; t
s/$/\\/; p
N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n
' >>$CONFIG_STATUS <conf$$subs.sed
rm -f conf$$subs.sed
cat >>$CONFIG_STATUS <<_ACEOF
:end
s/|#_!!_#|//g
CEOF$ac_eof
_ACEOF
# VPATH may cause trouble with some makes, so we remove $(srcdir),
# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
# trailing colons and then remove the whole line if VPATH becomes empty
@ -54292,7 +54293,7 @@ s&@abs_builddir@&$ac_abs_builddir&;t t
s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
s&@INSTALL@&$ac_INSTALL&;t t
$ac_datarootdir_hack
" $ac_file_inputs | sed -f "$tmp/subs-1.sed" | sed -f "$tmp/subs-2.sed" | sed -f "$tmp/subs-3.sed" | sed -f "$tmp/subs-4.sed" | sed 's/|#_!!_#|//g' >$tmp/out
" $ac_file_inputs | sed -f "$tmp/subs-1.sed" | sed -f "$tmp/subs-2.sed" | sed -f "$tmp/subs-3.sed" | sed -f "$tmp/subs-4.sed" | sed -f "$tmp/subs-5.sed" >$tmp/out
test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
{ ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&

38
configure.in
View File

@ -2708,7 +2708,7 @@ if test "$wxUSE_GUI" = "yes"; then
WXGTK12=
WXGTK127=
WXGTK20=
WXGTK2=
WXGPE=
if test "$wxUSE_COCOA" = 1 ; then
@ -2770,7 +2770,7 @@ if test "$wxUSE_GUI" = "yes"; then
fi
esac
AM_PATH_GTK_2_0(2.0.0, wx_cv_lib_gtk=2.0, , $GTK_MODULES)
AM_PATH_GTK_2_0(2.4.0, wx_cv_lib_gtk=2.0, , $GTK_MODULES)
dnl Solaris also requires -lX11 for static lib
case "${host}" in
@ -2811,7 +2811,7 @@ if test "$wxUSE_GUI" = "yes"; then
fi
case "$wx_cv_lib_gtk" in
2.0) WXGTK20=1
2.0) WXGTK2=1
TOOLKIT_VERSION=2
;;
1.2.7) WXGTK127=1
@ -2830,7 +2830,7 @@ libraries returned by 'pkg-config gtk+-2.0 --libs' or 'gtk-config
;;
esac
if test "$WXGTK20" = 1; then
if test "$WXGTK2" = 1; then
save_CFLAGS="$CFLAGS"
save_LIBS="$LIBS"
CFLAGS="$wx_cv_cflags_gtk $CFLAGS"
@ -2858,7 +2858,6 @@ libraries returned by 'pkg-config gtk+-2.0 --libs' or 'gtk-config
[
AC_DEFINE(__WXGTK210__)
AC_DEFINE(__WXGTK26__)
AC_DEFINE(__WXGTK24__)
AC_MSG_RESULT([yes])
ac_wxgtk210=1
],
@ -2880,7 +2879,6 @@ libraries returned by 'pkg-config gtk+-2.0 --libs' or 'gtk-config
],
[
AC_DEFINE(__WXGTK26__)
AC_DEFINE(__WXGTK24__)
AC_MSG_RESULT([yes])
ac_wxgtk26=1
],
@ -2890,26 +2888,6 @@ libraries returned by 'pkg-config gtk+-2.0 --libs' or 'gtk-config
])
fi
if test "$ac_wxgtk26" = 0; then
dnl test if we have at least GTK+ 2.4:
AC_MSG_CHECKING([if GTK+ is version >= 2.4])
AC_TRY_COMPILE([
#include <gtk/gtk.h>
],
[
#if !GTK_CHECK_VERSION(2,4,0)
Not GTK+ 2.4
#endif
],
[
AC_DEFINE(__WXGTK24__)
AC_MSG_RESULT([yes])
],
[
AC_MSG_RESULT([no])
])
fi
CFLAGS="$save_CFLAGS"
LIBS="$save_LIBS"
else
@ -5044,8 +5022,8 @@ else
fi
fi
if test "$WXGTK20" = 1 ; then
AC_DEFINE_UNQUOTED(__WXGTK20__,$WXGTK20)
if test "$WXGTK2" = 1 ; then
AC_DEFINE_UNQUOTED(__WXGTK20__,$WXGTK2)
WXGTK12=1
fi
@ -5401,7 +5379,7 @@ if test "$wxUSE_SOUND" = "yes"; then
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS sound"
fi
if test "$WXGTK20" = 1; then
if test "$WXGTK2" = 1; then
PKG_PROG_PKG_CONFIG()
if test "$wxUSE_PRINTING_ARCHITECTURE" = "yes" ; then
@ -7475,7 +7453,7 @@ AC_SUBST(CPPUNIT_LIBS)
case "$TOOLKIT" in
GTK)
TOOLKIT_DESC="GTK+"
if test "$WXGTK20" = 1; then
if test "$WXGTK2" = 1; then
TOOLKIT_DESC="$TOOLKIT_DESC 2"
if test "$wxUSE_GTKPRINT" = "yes" ; then
TOOLKIT_EXTRA="$TOOLKIT_EXTRA GTK+ printing";

3
setup.h.in
View File

@ -62,9 +62,6 @@
/* Define this if your version of GTK+ is greater than 2.0 */
#undef __WXGTK20__
/* Define this if your version of GTK+ is greater than 2.4 */
#undef __WXGTK24__
/* Define this if your version of GTK+ is greater than 2.6 */
#undef __WXGTK26__