No changes, just rebaked and reran autoconf.
It seems that autoconf_inc.m4 hadn't been regenerated by a previous change as rerunning bakefile_gen resulted in a lot of changes in it, do it now without any other changes to ensure that the next commit only contains the changes due to its modification of files.bkl. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@64441 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
42
configure
vendored
42
configure
vendored
@@ -889,6 +889,8 @@ COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1
|
||||
COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0
|
||||
COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1
|
||||
COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0
|
||||
COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1
|
||||
COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0
|
||||
COND_PLATFORM_MACOSX_1_USE_GUI_1
|
||||
COND_PLATFORM_MACOSX_1_USE_OPENGL_1
|
||||
COND_PLATFORM_MACOSX_1_USE_SOVERSION_1
|
||||
@@ -950,6 +952,8 @@ COND_TOOLKIT_OSX_CARBON_USE_GUI_1
|
||||
COND_TOOLKIT_OSX_COCOA
|
||||
COND_TOOLKIT_OSX_COCOA_USE_GUI_1
|
||||
COND_TOOLKIT_OSX_IPHONE
|
||||
COND_TOOLKIT_OSX_IPHONE_USE_GUI_1
|
||||
COND_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0
|
||||
COND_TOOLKIT_PM
|
||||
COND_TOOLKIT_PM_USE_GUI_1
|
||||
COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0
|
||||
@@ -50988,6 +50992,16 @@ EOF
|
||||
COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0=""
|
||||
fi
|
||||
|
||||
COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1="#"
|
||||
if test "x$PLATFORM_MACOSX" = "x1" -a "x$TOOLKIT" = "xOSX_IPHONE" -a "x$USE_GUI" = "x1" ; then
|
||||
COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1=""
|
||||
fi
|
||||
|
||||
COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0="#"
|
||||
if test "x$PLATFORM_MACOSX" = "x1" -a "x$TOOLKIT" = "xOSX_IPHONE" -a "x$USE_GUI" = "x1" -a "x$WXUNIV" = "x0" ; then
|
||||
COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0=""
|
||||
fi
|
||||
|
||||
COND_PLATFORM_MACOSX_1_USE_GUI_1="#"
|
||||
if test "x$PLATFORM_MACOSX" = "x1" -a "x$USE_GUI" = "x1" ; then
|
||||
COND_PLATFORM_MACOSX_1_USE_GUI_1=""
|
||||
@@ -51293,6 +51307,16 @@ EOF
|
||||
COND_TOOLKIT_OSX_IPHONE=""
|
||||
fi
|
||||
|
||||
COND_TOOLKIT_OSX_IPHONE_USE_GUI_1="#"
|
||||
if test "x$TOOLKIT" = "xOSX_IPHONE" -a "x$USE_GUI" = "x1" ; then
|
||||
COND_TOOLKIT_OSX_IPHONE_USE_GUI_1=""
|
||||
fi
|
||||
|
||||
COND_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0="#"
|
||||
if test "x$TOOLKIT" = "xOSX_IPHONE" -a "x$USE_GUI" = "x1" -a "x$WXUNIV" = "x0" ; then
|
||||
COND_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0=""
|
||||
fi
|
||||
|
||||
COND_TOOLKIT_PM="#"
|
||||
if test "x$TOOLKIT" = "xPM" ; then
|
||||
COND_TOOLKIT_PM=""
|
||||
@@ -53051,6 +53075,8 @@ COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1!$COND_PLATFORM_MACOSX_1_TOOL
|
||||
COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0!$COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0$ac_delim
|
||||
COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1!$COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1$ac_delim
|
||||
COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0!$COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0$ac_delim
|
||||
COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1!$COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1$ac_delim
|
||||
COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0!$COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0$ac_delim
|
||||
COND_PLATFORM_MACOSX_1_USE_GUI_1!$COND_PLATFORM_MACOSX_1_USE_GUI_1$ac_delim
|
||||
COND_PLATFORM_MACOSX_1_USE_OPENGL_1!$COND_PLATFORM_MACOSX_1_USE_OPENGL_1$ac_delim
|
||||
COND_PLATFORM_MACOSX_1_USE_SOVERSION_1!$COND_PLATFORM_MACOSX_1_USE_SOVERSION_1$ac_delim
|
||||
@@ -53067,8 +53093,6 @@ COND_PLATFORM_UNIX_1_TOOLKIT_MGL_USE_GUI_1!$COND_PLATFORM_UNIX_1_TOOLKIT_MGL_USE
|
||||
COND_PLATFORM_UNIX_1_USE_GUI_1!$COND_PLATFORM_UNIX_1_USE_GUI_1$ac_delim
|
||||
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_PLATFORM_WIN32_1_SHARED_0!$COND_PLATFORM_WIN32_1_SHARED_0$ac_delim
|
||||
_ACEOF
|
||||
|
||||
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
|
||||
@@ -53110,6 +53134,8 @@ _ACEOF
|
||||
ac_delim='%!_!# '
|
||||
for ac_last_try in false false false false false :; do
|
||||
cat >conf$$subs.sed <<_ACEOF
|
||||
COND_PLATFORM_WIN32_1!$COND_PLATFORM_WIN32_1$ac_delim
|
||||
COND_PLATFORM_WIN32_1_SHARED_0!$COND_PLATFORM_WIN32_1_SHARED_0$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
|
||||
@@ -53153,6 +53179,8 @@ COND_TOOLKIT_OSX_CARBON_USE_GUI_1!$COND_TOOLKIT_OSX_CARBON_USE_GUI_1$ac_delim
|
||||
COND_TOOLKIT_OSX_COCOA!$COND_TOOLKIT_OSX_COCOA$ac_delim
|
||||
COND_TOOLKIT_OSX_COCOA_USE_GUI_1!$COND_TOOLKIT_OSX_COCOA_USE_GUI_1$ac_delim
|
||||
COND_TOOLKIT_OSX_IPHONE!$COND_TOOLKIT_OSX_IPHONE$ac_delim
|
||||
COND_TOOLKIT_OSX_IPHONE_USE_GUI_1!$COND_TOOLKIT_OSX_IPHONE_USE_GUI_1$ac_delim
|
||||
COND_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0!$COND_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0$ac_delim
|
||||
COND_TOOLKIT_PM!$COND_TOOLKIT_PM$ac_delim
|
||||
COND_TOOLKIT_PM_USE_GUI_1!$COND_TOOLKIT_PM_USE_GUI_1$ac_delim
|
||||
COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0!$COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0$ac_delim
|
||||
@@ -53203,10 +53231,6 @@ COND_WXUSE_LIBTIFF_BUILTIN!$COND_WXUSE_LIBTIFF_BUILTIN$ac_delim
|
||||
COND_WXUSE_REGEX_BUILTIN!$COND_WXUSE_REGEX_BUILTIN$ac_delim
|
||||
COND_WXUSE_ZLIB_BUILTIN!$COND_WXUSE_ZLIB_BUILTIN$ac_delim
|
||||
COND_wxUSE_EXPAT_builtin!$COND_wxUSE_EXPAT_builtin$ac_delim
|
||||
COND_wxUSE_LIBJPEG_builtin!$COND_wxUSE_LIBJPEG_builtin$ac_delim
|
||||
COND_wxUSE_LIBPNG_builtin!$COND_wxUSE_LIBPNG_builtin$ac_delim
|
||||
COND_wxUSE_LIBTIFF_builtin!$COND_wxUSE_LIBTIFF_builtin$ac_delim
|
||||
COND_wxUSE_REGEX_builtin!$COND_wxUSE_REGEX_builtin$ac_delim
|
||||
_ACEOF
|
||||
|
||||
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
|
||||
@@ -53248,6 +53272,10 @@ _ACEOF
|
||||
ac_delim='%!_!# '
|
||||
for ac_last_try in false false false false false :; do
|
||||
cat >conf$$subs.sed <<_ACEOF
|
||||
COND_wxUSE_LIBJPEG_builtin!$COND_wxUSE_LIBJPEG_builtin$ac_delim
|
||||
COND_wxUSE_LIBPNG_builtin!$COND_wxUSE_LIBPNG_builtin$ac_delim
|
||||
COND_wxUSE_LIBTIFF_builtin!$COND_wxUSE_LIBTIFF_builtin$ac_delim
|
||||
COND_wxUSE_REGEX_builtin!$COND_wxUSE_REGEX_builtin$ac_delim
|
||||
COND_wxUSE_ZLIB_builtin!$COND_wxUSE_ZLIB_builtin$ac_delim
|
||||
DEREZ!$DEREZ$ac_delim
|
||||
SHARED!$SHARED$ac_delim
|
||||
@@ -53296,7 +53324,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` = 46; then
|
||||
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 50; then
|
||||
break
|
||||
elif $ac_last_try; then
|
||||
{ { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
|
||||
|
||||
Reference in New Issue
Block a user