diff --git a/configure b/configure index 1b4e3ca7ce..c7291e206a 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for wxWidgets 3.0.0. +# Generated by GNU Autoconf 2.69 for wxWidgets 3.0.1. # # Report bugs to . # @@ -580,8 +580,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='wxWidgets' PACKAGE_TARNAME='wxwidgets' -PACKAGE_VERSION='3.0.0' -PACKAGE_STRING='wxWidgets 3.0.0' +PACKAGE_VERSION='3.0.1' +PACKAGE_STRING='wxWidgets 3.0.1' PACKAGE_BUGREPORT='wx-dev@lists.wxwidgets.org' PACKAGE_URL='' @@ -1960,7 +1960,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures wxWidgets 3.0.0 to adapt to many kinds of systems. +\`configure' configures wxWidgets 3.0.1 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -2029,7 +2029,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of wxWidgets 3.0.0:";; + short | recursive ) echo "Configuration of wxWidgets 3.0.1:";; esac cat <<\_ACEOF @@ -2488,7 +2488,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -wxWidgets configure 3.0.0 +wxWidgets configure 3.0.1 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -3342,7 +3342,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by wxWidgets $as_me 3.0.0, which was +It was created by wxWidgets $as_me 3.0.1, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -3805,7 +3805,7 @@ fi wx_major_version_number=3 wx_minor_version_number=0 -wx_release_number=0 +wx_release_number=1 wx_subrelease_number=0 WX_RELEASE=$wx_major_version_number.$wx_minor_version_number @@ -30051,8 +30051,6 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $ ac_compiler_gnu=$ac_cv_c_compiler_gnu -if test "$wxUSE_UNICODE" = yes; then - wchar_headers="#include #include " case "${host}" in @@ -30156,7 +30154,6 @@ else $as_echo "no" >&6; } fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext; -fi if test "$wxUSE_FILE" = "yes"; then @@ -41944,7 +41941,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by wxWidgets $as_me 3.0.0, which was +This file was extended by wxWidgets $as_me 3.0.1, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -42010,7 +42007,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -wxWidgets config.status 3.0.0 +wxWidgets config.status 3.0.1 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/configure.in b/configure.in index d2bb7f8306..56812db35b 100644 --- a/configure.in +++ b/configure.in @@ -4270,8 +4270,6 @@ if test "$ac_cv_func_vsscanf" = "yes"; then fi AC_LANG_POP() -if test "$wxUSE_UNICODE" = yes; then - dnl also look if we have wide char IO functions, notice that [f]putws are dnl declared in special widec.h under Solaris wchar_headers="#include @@ -4297,7 +4295,6 @@ if test "$wxUSE_UNICODE" = yes; then [AC_MSG_RESULT([yes]) AC_DEFINE(HAVE__VSNWPRINTF)], [AC_MSG_RESULT([no])]); -fi if test "$wxUSE_FILE" = "yes"; then WX_CHECK_FUNCS(fsync) diff --git a/include/wx/wxcrtvararg.h b/include/wx/wxcrtvararg.h index 666e806ef3..bcb6c2c7f9 100644 --- a/include/wx/wxcrtvararg.h +++ b/include/wx/wxcrtvararg.h @@ -202,7 +202,7 @@ so on but not all systems have them so use our own implementations in this case. */ -#if wxUSE_UNICODE && !defined(wxHAVE_TCHAR_SUPPORT) && !defined(HAVE_WPRINTF) +#if !defined(wxHAVE_TCHAR_SUPPORT) && !defined(HAVE_WPRINTF) #define wxNEED_WPRINTF #endif #if !defined(wxHAVE_TCHAR_SUPPORT) && !defined(HAVE_VSWSCANF)