regenerated after latest configure.in changes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@51252 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
65
configure
vendored
65
configure
vendored
@@ -1,5 +1,5 @@
|
|||||||
#! /bin/sh
|
#! /bin/sh
|
||||||
# From configure.in Id: configure.in 51052 2008-01-06 22:23:20Z VZ .
|
# From configure.in Id: configure.in 51251 2008-01-16 16:09:00Z SC .
|
||||||
# Guess values for system-dependent variables and create Makefiles.
|
# Guess values for system-dependent variables and create Makefiles.
|
||||||
# Generated by GNU Autoconf 2.61 for wxWidgets 2.9.0.
|
# Generated by GNU Autoconf 2.61 for wxWidgets 2.9.0.
|
||||||
#
|
#
|
||||||
@@ -741,6 +741,7 @@ EXTRALIBS_MEDIA
|
|||||||
EXTRALIBS_GUI
|
EXTRALIBS_GUI
|
||||||
EXTRALIBS_OPENGL
|
EXTRALIBS_OPENGL
|
||||||
EXTRALIBS_SDL
|
EXTRALIBS_SDL
|
||||||
|
EXTRALIBS_STC
|
||||||
WITH_PLUGIN_SDL
|
WITH_PLUGIN_SDL
|
||||||
EXTRALIBS_GTKPRINT
|
EXTRALIBS_GTKPRINT
|
||||||
EXTRALIBS_GNOMEPRINT
|
EXTRALIBS_GNOMEPRINT
|
||||||
@@ -1883,6 +1884,7 @@ Optional Packages:
|
|||||||
--with-libjpeg use libjpeg (JPEG file format)
|
--with-libjpeg use libjpeg (JPEG file format)
|
||||||
--with-libtiff use libtiff (TIFF file format)
|
--with-libtiff use libtiff (TIFF file format)
|
||||||
--with-libxpm use libxpm (XPM file format)
|
--with-libxpm use libxpm (XPM file format)
|
||||||
|
--with-libiconv use libiconv (character conversion)
|
||||||
--with-libmspack use libmspack (CHM help files loading)
|
--with-libmspack use libmspack (CHM help files loading)
|
||||||
--without-gtkprint don't use GTK printing support
|
--without-gtkprint don't use GTK printing support
|
||||||
--without-gnomeprint don't use GNOME printing libraries
|
--without-gnomeprint don't use GNOME printing libraries
|
||||||
@@ -3734,6 +3736,50 @@ echo "$as_me: error: Invalid value for --with-libxpm: should be yes, no, sys, or
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
||||||
|
withstring=
|
||||||
|
defaultval=$wxUSE_ALL_FEATURES
|
||||||
|
if test -z "$defaultval"; then
|
||||||
|
if test x"$withstring" = xwithout; then
|
||||||
|
defaultval=yes
|
||||||
|
else
|
||||||
|
defaultval=no
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
{ echo "$as_me:$LINENO: checking for --${withstring:-with}-libiconv" >&5
|
||||||
|
echo $ECHO_N "checking for --${withstring:-with}-libiconv... $ECHO_C" >&6; }
|
||||||
|
|
||||||
|
# Check whether --with-libiconv was given.
|
||||||
|
if test "${with_libiconv+set}" = set; then
|
||||||
|
withval=$with_libiconv;
|
||||||
|
if test "$withval" = yes; then
|
||||||
|
wx_cv_use_libiconv='wxUSE_LIBICONV=yes'
|
||||||
|
else
|
||||||
|
wx_cv_use_libiconv='wxUSE_LIBICONV=no'
|
||||||
|
fi
|
||||||
|
|
||||||
|
else
|
||||||
|
|
||||||
|
wx_cv_use_libiconv='wxUSE_LIBICONV=${'DEFAULT_wxUSE_LIBICONV":-$defaultval}"
|
||||||
|
|
||||||
|
fi
|
||||||
|
|
||||||
|
|
||||||
|
eval "$wx_cv_use_libiconv"
|
||||||
|
|
||||||
|
if test x"$withstring" = xwithout; then
|
||||||
|
if test $wxUSE_LIBICONV = yes; then
|
||||||
|
result=no
|
||||||
|
else
|
||||||
|
result=yes
|
||||||
|
fi
|
||||||
|
else
|
||||||
|
result=$wxUSE_LIBICONV
|
||||||
|
fi
|
||||||
|
|
||||||
|
{ echo "$as_me:$LINENO: result: $result" >&5
|
||||||
|
echo "${ECHO_T}$result" >&6; }
|
||||||
|
|
||||||
|
|
||||||
withstring=
|
withstring=
|
||||||
defaultval=$wxUSE_ALL_FEATURES
|
defaultval=$wxUSE_ALL_FEATURES
|
||||||
if test -z "$defaultval"; then
|
if test -z "$defaultval"; then
|
||||||
@@ -17703,7 +17749,7 @@ echo "$as_me: WARNING: Could not determine deployment target from SDKSettings.pl
|
|||||||
else
|
else
|
||||||
wxUSE_MACOSX_VERSION_MIN=
|
wxUSE_MACOSX_VERSION_MIN=
|
||||||
fi
|
fi
|
||||||
elif test "x$wxUSE_MACOSX_VERSION_MIN" == "x"; then
|
elif test "x$wxUSE_MACOSX_VERSION_MIN" = "x"; then
|
||||||
if test "$wxUSE_MAC" = 1; then
|
if test "$wxUSE_MAC" = 1; then
|
||||||
# otherwise configure stops on leopard for universal_binary
|
# otherwise configure stops on leopard for universal_binary
|
||||||
wxUSE_MACOSX_VERSION_MIN=10.4
|
wxUSE_MACOSX_VERSION_MIN=10.4
|
||||||
@@ -35570,7 +35616,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
|
|||||||
|
|
||||||
if test "$TOOLKIT" != "MSW"; then
|
if test "$TOOLKIT" != "MSW"; then
|
||||||
|
|
||||||
|
if test "$wxUSE_LIBICONV" != "no" ; then
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@@ -35782,7 +35828,8 @@ _ACEOF
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
||||||
LIBS="$LIBICONV $LIBS"
|
LIBS="$LIBICONV $LIBS"
|
||||||
|
fi
|
||||||
|
|
||||||
if test "$wxUSE_ON_FATAL_EXCEPTION" = "yes" -a "$wxUSE_UNIX" = "yes"; then
|
if test "$wxUSE_ON_FATAL_EXCEPTION" = "yes" -a "$wxUSE_UNIX" = "yes"; then
|
||||||
|
|
||||||
@@ -46514,6 +46561,7 @@ fi
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
TOOLKIT_LOWERCASE=`echo $TOOLKIT | tr '[A-Z]' '[a-z]'`
|
TOOLKIT_LOWERCASE=`echo $TOOLKIT | tr '[A-Z]' '[a-z]'`
|
||||||
@@ -50888,6 +50936,7 @@ EXTRALIBS_MEDIA!$EXTRALIBS_MEDIA$ac_delim
|
|||||||
EXTRALIBS_GUI!$EXTRALIBS_GUI$ac_delim
|
EXTRALIBS_GUI!$EXTRALIBS_GUI$ac_delim
|
||||||
EXTRALIBS_OPENGL!$EXTRALIBS_OPENGL$ac_delim
|
EXTRALIBS_OPENGL!$EXTRALIBS_OPENGL$ac_delim
|
||||||
EXTRALIBS_SDL!$EXTRALIBS_SDL$ac_delim
|
EXTRALIBS_SDL!$EXTRALIBS_SDL$ac_delim
|
||||||
|
EXTRALIBS_STC!$EXTRALIBS_STC$ac_delim
|
||||||
WITH_PLUGIN_SDL!$WITH_PLUGIN_SDL$ac_delim
|
WITH_PLUGIN_SDL!$WITH_PLUGIN_SDL$ac_delim
|
||||||
EXTRALIBS_GTKPRINT!$EXTRALIBS_GTKPRINT$ac_delim
|
EXTRALIBS_GTKPRINT!$EXTRALIBS_GTKPRINT$ac_delim
|
||||||
EXTRALIBS_GNOMEPRINT!$EXTRALIBS_GNOMEPRINT$ac_delim
|
EXTRALIBS_GNOMEPRINT!$EXTRALIBS_GNOMEPRINT$ac_delim
|
||||||
@@ -50956,7 +51005,6 @@ GCC_PCH!$GCC_PCH$ac_delim
|
|||||||
ICC_PCH!$ICC_PCH$ac_delim
|
ICC_PCH!$ICC_PCH$ac_delim
|
||||||
BK_MAKE_PCH!$BK_MAKE_PCH$ac_delim
|
BK_MAKE_PCH!$BK_MAKE_PCH$ac_delim
|
||||||
COND_BUILD_DEBUG!$COND_BUILD_DEBUG$ac_delim
|
COND_BUILD_DEBUG!$COND_BUILD_DEBUG$ac_delim
|
||||||
COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT!$COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT$ac_delim
|
|
||||||
_ACEOF
|
_ACEOF
|
||||||
|
|
||||||
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
|
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
|
||||||
@@ -50998,6 +51046,7 @@ _ACEOF
|
|||||||
ac_delim='%!_!# '
|
ac_delim='%!_!# '
|
||||||
for ac_last_try in false false false false false :; do
|
for ac_last_try in false false false false false :; do
|
||||||
cat >conf$$subs.sed <<_ACEOF
|
cat >conf$$subs.sed <<_ACEOF
|
||||||
|
COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT!$COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT$ac_delim
|
||||||
COND_BUILD_DEBUG_DEBUG_INFO_DEFAULT!$COND_BUILD_DEBUG_DEBUG_INFO_DEFAULT$ac_delim
|
COND_BUILD_DEBUG_DEBUG_INFO_DEFAULT!$COND_BUILD_DEBUG_DEBUG_INFO_DEFAULT$ac_delim
|
||||||
COND_BUILD_DEBUG_UNICODE_0!$COND_BUILD_DEBUG_UNICODE_0$ac_delim
|
COND_BUILD_DEBUG_UNICODE_0!$COND_BUILD_DEBUG_UNICODE_0$ac_delim
|
||||||
COND_BUILD_DEBUG_UNICODE_1!$COND_BUILD_DEBUG_UNICODE_1$ac_delim
|
COND_BUILD_DEBUG_UNICODE_1!$COND_BUILD_DEBUG_UNICODE_1$ac_delim
|
||||||
@@ -51094,7 +51143,6 @@ 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_!$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!$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!$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
|
|
||||||
_ACEOF
|
_ACEOF
|
||||||
|
|
||||||
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
|
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
|
||||||
@@ -51136,6 +51184,7 @@ _ACEOF
|
|||||||
ac_delim='%!_!# '
|
ac_delim='%!_!# '
|
||||||
for ac_last_try in false false false false false :; do
|
for ac_last_try in false false false false false :; do
|
||||||
cat >conf$$subs.sed <<_ACEOF
|
cat >conf$$subs.sed <<_ACEOF
|
||||||
|
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
|
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!$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_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0!$COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0$ac_delim
|
||||||
@@ -51232,7 +51281,6 @@ RESCOMP!$RESCOMP$ac_delim
|
|||||||
RESFLAGS!$RESFLAGS$ac_delim
|
RESFLAGS!$RESFLAGS$ac_delim
|
||||||
RESPROGRAMOBJ!$RESPROGRAMOBJ$ac_delim
|
RESPROGRAMOBJ!$RESPROGRAMOBJ$ac_delim
|
||||||
WX_RESOURCES_MACOSX_ASCII!$WX_RESOURCES_MACOSX_ASCII$ac_delim
|
WX_RESOURCES_MACOSX_ASCII!$WX_RESOURCES_MACOSX_ASCII$ac_delim
|
||||||
WX_RESOURCES_MACOSX_DATA!$WX_RESOURCES_MACOSX_DATA$ac_delim
|
|
||||||
_ACEOF
|
_ACEOF
|
||||||
|
|
||||||
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
|
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
|
||||||
@@ -51274,6 +51322,7 @@ _ACEOF
|
|||||||
ac_delim='%!_!# '
|
ac_delim='%!_!# '
|
||||||
for ac_last_try in false false false false false :; do
|
for ac_last_try in false false false false false :; do
|
||||||
cat >conf$$subs.sed <<_ACEOF
|
cat >conf$$subs.sed <<_ACEOF
|
||||||
|
WX_RESOURCES_MACOSX_DATA!$WX_RESOURCES_MACOSX_DATA$ac_delim
|
||||||
LIBWXMACRES!$LIBWXMACRES$ac_delim
|
LIBWXMACRES!$LIBWXMACRES$ac_delim
|
||||||
POSTLINK_COMMAND!$POSTLINK_COMMAND$ac_delim
|
POSTLINK_COMMAND!$POSTLINK_COMMAND$ac_delim
|
||||||
MACSETFILE!$MACSETFILE$ac_delim
|
MACSETFILE!$MACSETFILE$ac_delim
|
||||||
@@ -51284,7 +51333,7 @@ LIBOBJS!$LIBOBJS$ac_delim
|
|||||||
LTLIBOBJS!$LTLIBOBJS$ac_delim
|
LTLIBOBJS!$LTLIBOBJS$ac_delim
|
||||||
_ACEOF
|
_ACEOF
|
||||||
|
|
||||||
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 8; then
|
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 9; then
|
||||||
break
|
break
|
||||||
elif $ac_last_try; then
|
elif $ac_last_try; then
|
||||||
{ { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
|
{ { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
|
||||||
|
Reference in New Issue
Block a user