enable support for printf positional parameters by default
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41030 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
32
configure
vendored
32
configure
vendored
@@ -1006,7 +1006,7 @@ Optional Features:
|
|||||||
--enable-unicode compile wxString with Unicode support
|
--enable-unicode compile wxString with Unicode support
|
||||||
--enable-sound use wxSound class
|
--enable-sound use wxSound class
|
||||||
--enable-mediactrl use wxMediaCtrl class
|
--enable-mediactrl use wxMediaCtrl class
|
||||||
--enable-gstreamer8 force GStreamer 0.8 instead of 0.10 with the wxMediaCtrl class on unix
|
--enable-gstreamer8 force GStreamer 0.8 instead of 0.10 with the wxMediaCtrl class on unix
|
||||||
--enable-printfposparam use wxVsnprintf() which supports positional parameters
|
--enable-printfposparam use wxVsnprintf() which supports positional parameters
|
||||||
--enable-zipstream use wxZip streams
|
--enable-zipstream use wxZip streams
|
||||||
--enable-url use wxURL class
|
--enable-url use wxURL class
|
||||||
@@ -2434,7 +2434,7 @@ else
|
|||||||
DEFAULT_wxUSE_SOUND=yes
|
DEFAULT_wxUSE_SOUND=yes
|
||||||
DEFAULT_wxUSE_MEDIACTRL=no
|
DEFAULT_wxUSE_MEDIACTRL=no
|
||||||
DEFAULT_wxUSE_GSTREAMER8=no
|
DEFAULT_wxUSE_GSTREAMER8=no
|
||||||
DEFAULT_wxUSE_PRINTF_POS_PARAMS=no
|
DEFAULT_wxUSE_PRINTF_POS_PARAMS=yes
|
||||||
DEFAULT_wxUSE_INTL=yes
|
DEFAULT_wxUSE_INTL=yes
|
||||||
DEFAULT_wxUSE_CONFIG=yes
|
DEFAULT_wxUSE_CONFIG=yes
|
||||||
DEFAULT_wxUSE_FONTMAP=yes
|
DEFAULT_wxUSE_FONTMAP=yes
|
||||||
@@ -12156,7 +12156,7 @@ echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6
|
|||||||
GCC=`test $ac_compiler_gnu = yes && echo yes`
|
GCC=`test $ac_compiler_gnu = yes && echo yes`
|
||||||
ac_test_CFLAGS=${CFLAGS+set}
|
ac_test_CFLAGS=${CFLAGS+set}
|
||||||
ac_save_CFLAGS=$CFLAGS
|
ac_save_CFLAGS=$CFLAGS
|
||||||
CFLAGS="$CFLAGS -g"
|
CFLAGS="-g"
|
||||||
echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
|
echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
|
||||||
echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6
|
echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6
|
||||||
if test "${ac_cv_prog_cc_g+set}" = set; then
|
if test "${ac_cv_prog_cc_g+set}" = set; then
|
||||||
@@ -12628,7 +12628,7 @@ fi
|
|||||||
unset ac_cv_prog_cc_g
|
unset ac_cv_prog_cc_g
|
||||||
ac_test_CFLAGS=${CFLAGS+set}
|
ac_test_CFLAGS=${CFLAGS+set}
|
||||||
ac_save_CFLAGS=$CFLAGS
|
ac_save_CFLAGS=$CFLAGS
|
||||||
CFLAGS="$CFLAGS -g"
|
CFLAGS="-g"
|
||||||
echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
|
echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
|
||||||
echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6
|
echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6
|
||||||
if test "${ac_cv_prog_cc_g+set}" = set; then
|
if test "${ac_cv_prog_cc_g+set}" = set; then
|
||||||
@@ -13800,9 +13800,9 @@ if test "$ac_test_CXXFLAGS" = set; then
|
|||||||
CXXFLAGS=$ac_save_CXXFLAGS
|
CXXFLAGS=$ac_save_CXXFLAGS
|
||||||
elif test $ac_cv_prog_cxx_g = yes; then
|
elif test $ac_cv_prog_cxx_g = yes; then
|
||||||
if test "$GXX" = yes; then
|
if test "$GXX" = yes; then
|
||||||
CXXFLAGS="$CXXFLAGS -g -O2"
|
CXXFLAGS="-g -O2"
|
||||||
else
|
else
|
||||||
CXXFLAGS="$CXXFLAGS -g"
|
CXXFLAGS="-g"
|
||||||
fi
|
fi
|
||||||
else
|
else
|
||||||
if test "$GXX" = yes; then
|
if test "$GXX" = yes; then
|
||||||
@@ -14065,7 +14065,7 @@ fi
|
|||||||
unset ac_cv_prog_cc_g
|
unset ac_cv_prog_cc_g
|
||||||
ac_test_CFLAGS=${CFLAGS+set}
|
ac_test_CFLAGS=${CFLAGS+set}
|
||||||
ac_save_CFLAGS=$CFLAGS
|
ac_save_CFLAGS=$CFLAGS
|
||||||
CFLAGS="$CFLAGS -g"
|
CFLAGS="-g"
|
||||||
echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
|
echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
|
||||||
echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6
|
echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6
|
||||||
if test "${ac_cv_prog_cc_g+set}" = set; then
|
if test "${ac_cv_prog_cc_g+set}" = set; then
|
||||||
@@ -29220,7 +29220,7 @@ _ACEOF
|
|||||||
cat confdefs.h >>conftest.$ac_ext
|
cat confdefs.h >>conftest.$ac_ext
|
||||||
cat >>conftest.$ac_ext <<_ACEOF
|
cat >>conftest.$ac_ext <<_ACEOF
|
||||||
/* end confdefs.h. */
|
/* end confdefs.h. */
|
||||||
#include <X11/Intrinsic.h>
|
#include <X11/Xlib.h>
|
||||||
_ACEOF
|
_ACEOF
|
||||||
if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
|
if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
|
||||||
(eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
|
(eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
|
||||||
@@ -29247,7 +29247,7 @@ else
|
|||||||
sed 's/^/| /' conftest.$ac_ext >&5
|
sed 's/^/| /' conftest.$ac_ext >&5
|
||||||
|
|
||||||
for ac_dir in $ac_x_header_dirs; do
|
for ac_dir in $ac_x_header_dirs; do
|
||||||
if test -r "$ac_dir/X11/Intrinsic.h"; then
|
if test -r "$ac_dir/X11/Xlib.h"; then
|
||||||
ac_x_includes=$ac_dir
|
ac_x_includes=$ac_dir
|
||||||
break
|
break
|
||||||
fi
|
fi
|
||||||
@@ -29261,18 +29261,18 @@ if test "$ac_x_libraries" = no; then
|
|||||||
# See if we find them without any special options.
|
# See if we find them without any special options.
|
||||||
# Don't add to $LIBS permanently.
|
# Don't add to $LIBS permanently.
|
||||||
ac_save_LIBS=$LIBS
|
ac_save_LIBS=$LIBS
|
||||||
LIBS="-lXt $LIBS"
|
LIBS="-lX11 $LIBS"
|
||||||
cat >conftest.$ac_ext <<_ACEOF
|
cat >conftest.$ac_ext <<_ACEOF
|
||||||
/* confdefs.h. */
|
/* confdefs.h. */
|
||||||
_ACEOF
|
_ACEOF
|
||||||
cat confdefs.h >>conftest.$ac_ext
|
cat confdefs.h >>conftest.$ac_ext
|
||||||
cat >>conftest.$ac_ext <<_ACEOF
|
cat >>conftest.$ac_ext <<_ACEOF
|
||||||
/* end confdefs.h. */
|
/* end confdefs.h. */
|
||||||
#include <X11/Intrinsic.h>
|
#include <X11/Xlib.h>
|
||||||
int
|
int
|
||||||
main ()
|
main ()
|
||||||
{
|
{
|
||||||
XtMalloc (0)
|
XrmInitialize ()
|
||||||
;
|
;
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
@@ -29310,7 +29310,7 @@ for ac_dir in `echo "$ac_x_includes $ac_x_header_dirs" | sed s/include/lib/g`
|
|||||||
do
|
do
|
||||||
# Don't even attempt the hair of trying to link an X program!
|
# Don't even attempt the hair of trying to link an X program!
|
||||||
for ac_extension in a so sl; do
|
for ac_extension in a so sl; do
|
||||||
if test -r $ac_dir/libXt.$ac_extension; then
|
if test -r $ac_dir/libX11.$ac_extension; then
|
||||||
ac_x_libraries=$ac_dir
|
ac_x_libraries=$ac_dir
|
||||||
break 2
|
break 2
|
||||||
fi
|
fi
|
||||||
@@ -34967,8 +34967,10 @@ if test "${wx_cv_func_snprintf_pos_params+set}" = set; then
|
|||||||
else
|
else
|
||||||
|
|
||||||
if test "$cross_compiling" = yes; then
|
if test "$cross_compiling" = yes; then
|
||||||
{ { echo "$as_me:$LINENO: error: internal error: not reached in cross-compile" >&5
|
{ { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
|
||||||
echo "$as_me: error: internal error: not reached in cross-compile" >&2;}
|
See \`config.log' for more details." >&5
|
||||||
|
echo "$as_me: error: cannot run test program while cross compiling
|
||||||
|
See \`config.log' for more details." >&2;}
|
||||||
{ (exit 1); exit 1; }; }
|
{ (exit 1); exit 1; }; }
|
||||||
else
|
else
|
||||||
cat >conftest.$ac_ext <<_ACEOF
|
cat >conftest.$ac_ext <<_ACEOF
|
||||||
|
@@ -642,7 +642,7 @@ else
|
|||||||
DEFAULT_wxUSE_SOUND=yes
|
DEFAULT_wxUSE_SOUND=yes
|
||||||
DEFAULT_wxUSE_MEDIACTRL=no
|
DEFAULT_wxUSE_MEDIACTRL=no
|
||||||
DEFAULT_wxUSE_GSTREAMER8=no
|
DEFAULT_wxUSE_GSTREAMER8=no
|
||||||
DEFAULT_wxUSE_PRINTF_POS_PARAMS=no
|
DEFAULT_wxUSE_PRINTF_POS_PARAMS=yes
|
||||||
DEFAULT_wxUSE_INTL=yes
|
DEFAULT_wxUSE_INTL=yes
|
||||||
DEFAULT_wxUSE_CONFIG=yes
|
DEFAULT_wxUSE_CONFIG=yes
|
||||||
DEFAULT_wxUSE_FONTMAP=yes
|
DEFAULT_wxUSE_FONTMAP=yes
|
||||||
@@ -963,7 +963,7 @@ WX_ARG_ENABLE(timer, [ --enable-timer use wxTimer class], wxUS
|
|||||||
WX_ARG_ENABLE(unicode, [ --enable-unicode compile wxString with Unicode support], wxUSE_UNICODE)
|
WX_ARG_ENABLE(unicode, [ --enable-unicode compile wxString with Unicode support], wxUSE_UNICODE)
|
||||||
WX_ARG_ENABLE(sound, [ --enable-sound use wxSound class], wxUSE_SOUND)
|
WX_ARG_ENABLE(sound, [ --enable-sound use wxSound class], wxUSE_SOUND)
|
||||||
WX_ARG_ENABLE(mediactrl, [ --enable-mediactrl use wxMediaCtrl class], wxUSE_MEDIACTRL)
|
WX_ARG_ENABLE(mediactrl, [ --enable-mediactrl use wxMediaCtrl class], wxUSE_MEDIACTRL)
|
||||||
WX_ARG_ENABLE(gstreamer8, [ --enable-gstreamer8 force GStreamer 0.8 instead of 0.10 with the wxMediaCtrl class on unix], wxUSE_GSTREAMER8)
|
WX_ARG_ENABLE(gstreamer8, [ --enable-gstreamer8 force GStreamer 0.8 instead of 0.10 with the wxMediaCtrl class on unix], wxUSE_GSTREAMER8)
|
||||||
WX_ARG_ENABLE(printfposparam,[ --enable-printfposparam use wxVsnprintf() which supports positional parameters], wxUSE_PRINTF_POS_PARAMS)
|
WX_ARG_ENABLE(printfposparam,[ --enable-printfposparam use wxVsnprintf() which supports positional parameters], wxUSE_PRINTF_POS_PARAMS)
|
||||||
WX_ARG_ENABLE(zipstream, [ --enable-zipstream use wxZip streams], wxUSE_ZIPSTREAM)
|
WX_ARG_ENABLE(zipstream, [ --enable-zipstream use wxZip streams], wxUSE_ZIPSTREAM)
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user