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

don't fall back to GTK 1.x if --with-gtk2 was specified; don't try to build in Unicode when using GTK 1.x

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@17727 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2002-11-05 13:36:49 +00:00
parent 6fb2eb9c0c
commit 8f05d8f9d5
2 changed files with 422 additions and 414 deletions
Download Patch File Download Diff File Expand all files Collapse all files

811
configure vendored
View File

File diff suppressed because it is too large Load Diff

25
configure.in
View File

@@ -1976,17 +1976,17 @@ if test "$wxUSE_GUI" = "yes"; then
GTK_MODULES=gthread GTK_MODULES=gthread
fi fi
dnl note that if we fail to find GTK2 we abort and don't fall
dnl back to GTK1.x
wx_cv_lib_gtk= wx_cv_lib_gtk=
if test "x$wxUSE_GTK2" = "xyes"; then if test "x$wxUSE_GTK2" = "xyes"; then
AM_PATH_GTK_2_0(2.0.0, wx_cv_lib_gtk=2.0, , $GTK_MODULES) AM_PATH_GTK_2_0(2.0.0, wx_cv_lib_gtk=2.0, , $GTK_MODULES)
fi else
if test -z "$wx_cv_lib_gtk"; then
AM_PATH_GTK(1.2.7, wx_cv_lib_gtk=1.2.7, , $GTK_MODULES) AM_PATH_GTK(1.2.7, wx_cv_lib_gtk=1.2.7, , $GTK_MODULES)
fi
if test -z "$wx_cv_lib_gtk"; then if test -z "$wx_cv_lib_gtk"; then
AM_PATH_GTK(1.2.3, wx_cv_lib_gtk=1.2.3, , $GTK_MODULES) AM_PATH_GTK(1.2.3, wx_cv_lib_gtk=1.2.3, , $GTK_MODULES)
fi
fi fi
if test -z "$wx_cv_lib_gtk"; then if test -z "$wx_cv_lib_gtk"; then
@@ -2037,6 +2037,11 @@ equivalent variable and GTK+ is version 1.2.3 or above.
] ]
) )
fi fi
else
if test "$wxUSE_UNICODE" = "yes"; then
AC_MSG_WARN([Unicode configuration not supported with GTK+ 1.x])
wxUSE_UNICODE=no
fi
fi fi
dnl we need poll() in src/gtk/app.cpp (we know that Darwin doesn't dnl we need poll() in src/gtk/app.cpp (we know that Darwin doesn't
@@ -2187,7 +2192,7 @@ equivalent variable and GTK+ is version 1.2.3 or above.
] ]
) )
fi fi
if test "$wxUSE_UNICODE" = "yes"; then if test "$wxUSE_UNICODE" = "yes"; then
PKG_CHECK_MODULES(PANGOX, pangox, PKG_CHECK_MODULES(PANGOX, pangox,
[ [
@@ -4357,9 +4362,9 @@ fi
if test "$wxUSE_RESOURCES" = "yes" ; then if test "$wxUSE_RESOURCES" = "yes" ; then
if test "$wxUSE_NANOX" = "yes"; then if test "$wxUSE_NANOX" = "yes"; then
AC_MSG_WARN([Cannot use resource database functions in NanoX]) AC_MSG_WARN([Cannot use resource database functions in NanoX])
else else
AC_DEFINE(wxUSE_RESOURCES) AC_DEFINE(wxUSE_RESOURCES)
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS resource" SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS resource"
fi fi
if test "$wxUSE_PROLOGIO" != "yes" ; then if test "$wxUSE_PROLOGIO" != "yes" ; then
ALL_OBJECTS="$ALL_OBJECTS parser.o" ALL_OBJECTS="$ALL_OBJECTS parser.o"