rebake
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@55457 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
15
configure
vendored
15
configure
vendored
@@ -1,5 +1,5 @@
|
||||
#! /bin/sh
|
||||
# From configure.in Id: configure.in 54996 2008-08-06 17:50:06Z VZ .
|
||||
# From configure.in Id: configure.in 55019 2008-08-08 02:59:32Z VZ .
|
||||
# Guess values for system-dependent variables and create Makefiles.
|
||||
# Generated by GNU Autoconf 2.61 for wxWidgets 2.9.0.
|
||||
#
|
||||
@@ -864,6 +864,7 @@ COND_PLATFORM_MACOSX_1
|
||||
COND_PLATFORM_MACOSX_1_PLATFORM_MSDOS_0
|
||||
COND_PLATFORM_MACOSX_1_TOOLKIT_
|
||||
COND_PLATFORM_MACOSX_1_TOOLKIT_COCOA
|
||||
COND_PLATFORM_MACOSX_1_TOOLKIT_COCOA_USE_GUI_1
|
||||
COND_PLATFORM_MACOSX_1_TOOLKIT_GTK
|
||||
COND_PLATFORM_MACOSX_1_TOOLKIT_MAC
|
||||
COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1
|
||||
@@ -49692,6 +49693,11 @@ EOF
|
||||
COND_PLATFORM_MACOSX_1_TOOLKIT_COCOA=""
|
||||
fi
|
||||
|
||||
COND_PLATFORM_MACOSX_1_TOOLKIT_COCOA_USE_GUI_1="#"
|
||||
if test "x$PLATFORM_MACOSX" = "x1" -a "x$TOOLKIT" = "xCOCOA" -a "x$USE_GUI" = "x1" ; then
|
||||
COND_PLATFORM_MACOSX_1_TOOLKIT_COCOA_USE_GUI_1=""
|
||||
fi
|
||||
|
||||
COND_PLATFORM_MACOSX_1_TOOLKIT_GTK="#"
|
||||
if test "x$PLATFORM_MACOSX" = "x1" -a "x$TOOLKIT" = "xGTK" ; then
|
||||
COND_PLATFORM_MACOSX_1_TOOLKIT_GTK=""
|
||||
@@ -51685,6 +51691,7 @@ COND_PLATFORM_MACOSX_1!$COND_PLATFORM_MACOSX_1$ac_delim
|
||||
COND_PLATFORM_MACOSX_1_PLATFORM_MSDOS_0!$COND_PLATFORM_MACOSX_1_PLATFORM_MSDOS_0$ac_delim
|
||||
COND_PLATFORM_MACOSX_1_TOOLKIT_!$COND_PLATFORM_MACOSX_1_TOOLKIT_$ac_delim
|
||||
COND_PLATFORM_MACOSX_1_TOOLKIT_COCOA!$COND_PLATFORM_MACOSX_1_TOOLKIT_COCOA$ac_delim
|
||||
COND_PLATFORM_MACOSX_1_TOOLKIT_COCOA_USE_GUI_1!$COND_PLATFORM_MACOSX_1_TOOLKIT_COCOA_USE_GUI_1$ac_delim
|
||||
COND_PLATFORM_MACOSX_1_TOOLKIT_GTK!$COND_PLATFORM_MACOSX_1_TOOLKIT_GTK$ac_delim
|
||||
COND_PLATFORM_MACOSX_1_TOOLKIT_MAC!$COND_PLATFORM_MACOSX_1_TOOLKIT_MAC$ac_delim
|
||||
COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1!$COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1$ac_delim
|
||||
@@ -51727,7 +51734,6 @@ COND_TOOLKIT_COCOA_USE_GUI_1!$COND_TOOLKIT_COCOA_USE_GUI_1$ac_delim
|
||||
COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0!$COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0$ac_delim
|
||||
COND_TOOLKIT_DFB!$COND_TOOLKIT_DFB$ac_delim
|
||||
COND_TOOLKIT_DFB_USE_GUI_1!$COND_TOOLKIT_DFB_USE_GUI_1$ac_delim
|
||||
COND_TOOLKIT_GTK!$COND_TOOLKIT_GTK$ac_delim
|
||||
_ACEOF
|
||||
|
||||
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
|
||||
@@ -51769,6 +51775,7 @@ _ACEOF
|
||||
ac_delim='%!_!# '
|
||||
for ac_last_try in false false false false false :; do
|
||||
cat >conf$$subs.sed <<_ACEOF
|
||||
COND_TOOLKIT_GTK!$COND_TOOLKIT_GTK$ac_delim
|
||||
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
|
||||
@@ -51865,7 +51872,6 @@ LDFLAGS_GL!$LDFLAGS_GL$ac_delim
|
||||
OPENGL_LIBS!$OPENGL_LIBS$ac_delim
|
||||
DMALLOC_LIBS!$DMALLOC_LIBS$ac_delim
|
||||
WX_VERSION_TAG!$WX_VERSION_TAG$ac_delim
|
||||
RESCOMP!$RESCOMP$ac_delim
|
||||
_ACEOF
|
||||
|
||||
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
|
||||
@@ -51907,6 +51913,7 @@ _ACEOF
|
||||
ac_delim='%!_!# '
|
||||
for ac_last_try in false false false false false :; do
|
||||
cat >conf$$subs.sed <<_ACEOF
|
||||
RESCOMP!$RESCOMP$ac_delim
|
||||
RESFLAGS!$RESFLAGS$ac_delim
|
||||
RESPROGRAMOBJ!$RESPROGRAMOBJ$ac_delim
|
||||
WX_RESOURCES_MACOSX_ASCII!$WX_RESOURCES_MACOSX_ASCII$ac_delim
|
||||
@@ -51921,7 +51928,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` = 12; then
|
||||
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 13; 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