regenerate after the recent changes (wxDataViewCtrl enabled by default, socket sample available in wxBase, ...)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@50860 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
parent
f2582d7d90
commit
ac209a0f70
37
configure
vendored
37
configure
vendored
@ -1,5 +1,5 @@
|
||||
#! /bin/sh
|
||||
# From configure.in Id: configure.in 50595 2007-12-09 12:40:58Z RR .
|
||||
# From configure.in Id: configure.in 50845 2007-12-20 01:05:19Z VZ .
|
||||
# Guess values for system-dependent variables and create Makefiles.
|
||||
# Generated by GNU Autoconf 2.61 for wxWidgets 2.9.0.
|
||||
#
|
||||
@ -871,6 +871,7 @@ 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_0
|
||||
COND_PLATFORM_MSDOS_1
|
||||
COND_PLATFORM_OS2_1
|
||||
COND_PLATFORM_UNIX_0
|
||||
@ -942,6 +943,7 @@ COND_USE_GUI_1_WXUNIV_1
|
||||
COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN
|
||||
COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN
|
||||
COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN
|
||||
COND_USE_OPENGL_1
|
||||
COND_USE_PCH_1
|
||||
COND_USE_PLUGINS_0
|
||||
COND_USE_RTTI_0
|
||||
@ -2927,7 +2929,6 @@ DEFAULT_wxUSE_LIBSDL=no
|
||||
DEFAULT_wxUSE_OPENGL=no
|
||||
|
||||
DEFAULT_wxUSE_ACCESSIBILITY=no
|
||||
DEFAULT_wxUSE_DATAVIEWCTRL=no
|
||||
DEFAULT_wxUSE_GRAPHICS_CONTEXT=no
|
||||
DEFAULT_wxUSE_IPV6=no
|
||||
DEFAULT_wxUSE_MEDIACTRL=no
|
||||
@ -9205,7 +9206,7 @@ if test "$wxUSE_CONTROLS" = "yes"; then
|
||||
DEFAULT_wxUSE_GAUGE=yes
|
||||
DEFAULT_wxUSE_GRID=yes
|
||||
DEFAULT_wxUSE_HYPERLINKCTRL=yes
|
||||
DEFAULT_wxUSE_DATAVIEWCTRL=no
|
||||
DEFAULT_wxUSE_DATAVIEWCTRL=yes
|
||||
DEFAULT_wxUSE_IMAGLIST=yes
|
||||
DEFAULT_wxUSE_LISTBOOK=yes
|
||||
DEFAULT_wxUSE_LISTBOX=yes
|
||||
@ -46291,6 +46292,9 @@ if test "$wxUSE_GUI" = "yes"; then
|
||||
fi
|
||||
else
|
||||
SAMPLES_SUBDIRS="console"
|
||||
if test "$wxUSE_SOCKETS" = "yes" ; then
|
||||
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS sockets"
|
||||
fi
|
||||
fi
|
||||
|
||||
|
||||
@ -49056,6 +49060,11 @@ EOF
|
||||
COND_PLATFORM_MAC_1=""
|
||||
fi
|
||||
|
||||
COND_PLATFORM_MSDOS_0="#"
|
||||
if test "x$PLATFORM_MSDOS" = "x0" ; then
|
||||
COND_PLATFORM_MSDOS_0=""
|
||||
fi
|
||||
|
||||
COND_PLATFORM_MSDOS_1="#"
|
||||
if test "x$PLATFORM_MSDOS" = "x1" ; then
|
||||
COND_PLATFORM_MSDOS_1=""
|
||||
@ -49411,6 +49420,11 @@ EOF
|
||||
COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN=""
|
||||
fi
|
||||
|
||||
COND_USE_OPENGL_1="#"
|
||||
if test "x$USE_OPENGL" = "x1" ; then
|
||||
COND_USE_OPENGL_1=""
|
||||
fi
|
||||
|
||||
COND_USE_PCH_1="#"
|
||||
if test "x$USE_PCH" = "x1" ; then
|
||||
COND_USE_PCH_1=""
|
||||
@ -49977,7 +49991,12 @@ for subdir in $SUBDIRS; do
|
||||
fi
|
||||
else
|
||||
if test ${subdir} = "samples"; then
|
||||
makefiles="samples/Makefile.in samples/console/Makefile.in"
|
||||
makefiles="samples/Makefile.in $makefiles"
|
||||
for sample in `echo $SAMPLES_SUBDIRS`; do
|
||||
if test -d $srcdir/samples/$sample; then
|
||||
makefiles="samples/$sample/Makefile.in $makefiles"
|
||||
fi
|
||||
done
|
||||
elif test ${subdir} = "utils"; then
|
||||
makefiles=""
|
||||
for util in HelpGen tex2rtf ; do
|
||||
@ -50979,6 +50998,7 @@ 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_0!$COND_PLATFORM_MSDOS_0$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
|
||||
@ -51014,7 +51034,6 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_!$COND_TOOLKIT_GTK_TOOLKIT_VERSION_$ac_delim
|
||||
COND_TOOLKIT_GTK_TOOLKIT_VERSION_2!$COND_TOOLKIT_GTK_TOOLKIT_VERSION_2$ac_delim
|
||||
COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1!$COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1$ac_delim
|
||||
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_2_WXUNIV_0!$COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_WXUNIV_0$ac_delim
|
||||
_ACEOF
|
||||
|
||||
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
|
||||
@ -51056,6 +51075,7 @@ _ACEOF
|
||||
ac_delim='%!_!# '
|
||||
for ac_last_try in false false false false false :; do
|
||||
cat >conf$$subs.sed <<_ACEOF
|
||||
COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_WXUNIV_0!$COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_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
|
||||
@ -51091,6 +51111,7 @@ COND_USE_GUI_1_WXUNIV_1!$COND_USE_GUI_1_WXUNIV_1$ac_delim
|
||||
COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN!$COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN$ac_delim
|
||||
COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN!$COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN$ac_delim
|
||||
COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN!$COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN$ac_delim
|
||||
COND_USE_OPENGL_1!$COND_USE_OPENGL_1$ac_delim
|
||||
COND_USE_PCH_1!$COND_USE_PCH_1$ac_delim
|
||||
COND_USE_PLUGINS_0!$COND_USE_PLUGINS_0$ac_delim
|
||||
COND_USE_RTTI_0!$COND_USE_RTTI_0$ac_delim
|
||||
@ -51151,8 +51172,6 @@ RESFLAGS!$RESFLAGS$ac_delim
|
||||
RESPROGRAMOBJ!$RESPROGRAMOBJ$ac_delim
|
||||
WX_RESOURCES_MACOSX_ASCII!$WX_RESOURCES_MACOSX_ASCII$ac_delim
|
||||
WX_RESOURCES_MACOSX_DATA!$WX_RESOURCES_MACOSX_DATA$ac_delim
|
||||
LIBWXMACRES!$LIBWXMACRES$ac_delim
|
||||
POSTLINK_COMMAND!$POSTLINK_COMMAND$ac_delim
|
||||
_ACEOF
|
||||
|
||||
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
|
||||
@ -51194,6 +51213,8 @@ _ACEOF
|
||||
ac_delim='%!_!# '
|
||||
for ac_last_try in false false false false false :; do
|
||||
cat >conf$$subs.sed <<_ACEOF
|
||||
LIBWXMACRES!$LIBWXMACRES$ac_delim
|
||||
POSTLINK_COMMAND!$POSTLINK_COMMAND$ac_delim
|
||||
MACSETFILE!$MACSETFILE$ac_delim
|
||||
GCC!$GCC$ac_delim
|
||||
DLLTOOL!$DLLTOOL$ac_delim
|
||||
@ -51202,7 +51223,7 @@ LIBOBJS!$LIBOBJS$ac_delim
|
||||
LTLIBOBJS!$LTLIBOBJS$ac_delim
|
||||
_ACEOF
|
||||
|
||||
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 6; then
|
||||
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 8; then
|
||||
break
|
||||
elif $ac_last_try; then
|
||||
{ { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
|
||||
|
||||
Loading…
Reference in New Issue
Block a user