AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

remove unused configure tests and macros

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@48648 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Paul Cornett 2007-09-13 06:24:14 +00:00
parent 73a790d8d5
commit 05787cec0d
4 changed files with 15 additions and 661 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

537
configure vendored
View File

@ -1,5 +1,5 @@
#! /bin/sh #! /bin/sh
# From configure.in Id: configure.in 48592 2007-09-06 17:31:51Z RR . # From configure.in Id: configure.in 48647 2007-09-13 05:42:42Z PC .
# 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.
# #
@ -1688,7 +1688,7 @@ Optional Features:
--enable-dataobj use data object classes --enable-dataobj use data object classes
--enable-ipc use interprocess communication (wxSocket etc.) --enable-ipc use interprocess communication (wxSocket etc.)
--enable-baseevtloop use event loop in console programs too --enable-baseevtloop use event loop in console programs too
--enable-epoolloop use wxEpollDispatcher class (Linux only) --enable-epollloop use wxEpollDispatcher class (Linux only)
--enable-selectloop use wxSelectDispatcher class --enable-selectloop use wxSelectDispatcher class
--enable-apple_ieee use the Apple IEEE codec --enable-apple_ieee use the Apple IEEE codec
--enable-arcstream use wxArchive streams --enable-arcstream use wxArchive streams
@ -6801,15 +6801,15 @@ echo "${ECHO_T}$result" >&6; }
fi fi
fi fi
{ echo "$as_me:$LINENO: checking for --${enablestring:-enable}-epoolloop" >&5 { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-epollloop" >&5
echo $ECHO_N "checking for --${enablestring:-enable}-epoolloop... $ECHO_C" >&6; } echo $ECHO_N "checking for --${enablestring:-enable}-epollloop... $ECHO_C" >&6; }
# Check whether --enable-epoolloop was given. # Check whether --enable-epollloop was given.
if test "${enable_epoolloop+set}" = set; then if test "${enable_epollloop+set}" = set; then
enableval=$enable_epoolloop; enableval=$enable_epollloop;
if test "$enableval" = yes; then if test "$enableval" = yes; then
wx_cv_use_epoolloop='wxUSE_EPOLL_DISPATCHER=yes' wx_cv_use_epollloop='wxUSE_EPOLL_DISPATCHER=yes'
else else
wx_cv_use_epoolloop='wxUSE_EPOLL_DISPATCHER=no' wx_cv_use_epollloop='wxUSE_EPOLL_DISPATCHER=no'
fi fi
cache=yes cache=yes
@ -6823,12 +6823,12 @@ else
cache=no cache=no
fi fi
wx_cv_use_epoolloop='wxUSE_EPOLL_DISPATCHER=${'DEFAULT_wxUSE_EPOLL_DISPATCHER":-$defaultval}" wx_cv_use_epollloop='wxUSE_EPOLL_DISPATCHER=${'DEFAULT_wxUSE_EPOLL_DISPATCHER":-$defaultval}"
fi fi
eval "$wx_cv_use_epoolloop" eval "$wx_cv_use_epollloop"
if test "x$cache" = xyes; then if test "x$cache" = xyes; then
echo "wxUSE_EPOLL_DISPATCHER=$wxUSE_EPOLL_DISPATCHER" >> ${wx_arg_cache_file}.tmp echo "wxUSE_EPOLL_DISPATCHER=$wxUSE_EPOLL_DISPATCHER" >> ${wx_arg_cache_file}.tmp
fi fi
@ -21453,11 +21453,7 @@ done
for ac_header in langinfo.h wchar.h
for ac_header in stdlib.h fnmatch.h langinfo.h malloc.h unistd.h wchar.h
do do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
{ echo "$as_me:$LINENO: checking for $ac_header" >&5 { echo "$as_me:$LINENO: checking for $ac_header" >&5
@ -38251,80 +38247,6 @@ echo "${ECHO_T}$wx_cv_func_snprintf_decl" >&6; }
#define HAVE_SNPRINTF_DECL 1 #define HAVE_SNPRINTF_DECL 1
_ACEOF _ACEOF
{ echo "$as_me:$LINENO: checking if snprintf declaration is broken" >&5
echo $ECHO_N "checking if snprintf declaration is broken... $ECHO_C" >&6; }
if test "${wx_cv_func_broken_snprintf_decl+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#include <stdio.h>
#include <stdarg.h>
#ifdef __MSL__
#if __MSL__ >= 0x6000
namespace std {}
using namespace std;
#endif
#endif
int
main ()
{
char *buf;
const char *fmt = "%s";
snprintf(buf, 10u, fmt, "wx");
;
return 0;
}
_ACEOF
rm -f conftest.$ac_objext
if { (ac_try="$ac_compile"
case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
(eval "$ac_compile") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
} && test -s conftest.$ac_objext; then
wx_cv_func_broken_snprintf_decl=no
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
wx_cv_func_broken_snprintf_decl=yes
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
{ echo "$as_me:$LINENO: result: $wx_cv_func_broken_snprintf_decl" >&5
echo "${ECHO_T}$wx_cv_func_broken_snprintf_decl" >&6; }
if test "$wx_cv_func_broken_snprintf_decl" = "yes"; then
cat >>confdefs.h <<\_ACEOF
#define HAVE_BROKEN_SNPRINTF_DECL 1
_ACEOF
fi
fi fi
if test "$wxUSE_PRINTF_POS_PARAMS" = "yes"; then if test "$wxUSE_PRINTF_POS_PARAMS" = "yes"; then
@ -38414,172 +38336,6 @@ fi
if test "$wxUSE_UNICODE" = yes; then if test "$wxUSE_UNICODE" = yes; then
for ac_func in swprintf
do
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
{ echo "$as_me:$LINENO: checking for $ac_func" >&5
echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
For example, HP-UX 11i <limits.h> declares gettimeofday. */
#define $ac_func innocuous_$ac_func
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func (); below.
Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
<limits.h> exists even on freestanding compilers. */
#ifdef __STDC__
# include <limits.h>
#else
# include <assert.h>
#endif
#undef $ac_func
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
builtin and then its argument prototype would still apply. */
#ifdef __cplusplus
extern "C"
#endif
char $ac_func ();
/* The GNU C library defines this for functions which it implements
to always fail with ENOSYS. Some functions are actually named
something starting with __ and the normal name is an alias. */
#if defined __stub_$ac_func || defined __stub___$ac_func
choke me
#endif
int
main ()
{
return $ac_func ();
;
return 0;
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
if { (ac_try="$ac_link"
case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
(eval "$ac_link") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
} && test -s conftest$ac_exeext &&
$as_test_x conftest$ac_exeext; then
eval "$as_ac_var=yes"
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
eval "$as_ac_var=no"
fi
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
fi
ac_res=`eval echo '${'$as_ac_var'}'`
{ echo "$as_me:$LINENO: result: $ac_res" >&5
echo "${ECHO_T}$ac_res" >&6; }
if test `eval echo '${'$as_ac_var'}'` = yes; then
cat >>confdefs.h <<_ACEOF
#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
_ACEOF
fi
done
if test "$ac_cv_func_swprintf" = "yes"; then
{ echo "$as_me:$LINENO: checking if swprintf declaration is broken" >&5
echo $ECHO_N "checking if swprintf declaration is broken... $ECHO_C" >&6; }
if test "${wx_cv_func_broken_swprintf_decl+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#include <stdio.h>
#include <stdarg.h>
#include <wchar.h>
int
main ()
{
wchar_t *buf;
const wchar_t *fmt = L"test";
swprintf(buf, 10u, fmt);
;
return 0;
}
_ACEOF
rm -f conftest.$ac_objext
if { (ac_try="$ac_compile"
case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
(eval "$ac_compile") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
} && test -s conftest.$ac_objext; then
wx_cv_func_broken_swprintf_decl=no
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
wx_cv_func_broken_swprintf_decl=yes
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
{ echo "$as_me:$LINENO: result: $wx_cv_func_broken_swprintf_decl" >&5
echo "${ECHO_T}$wx_cv_func_broken_swprintf_decl" >&6; }
if test "$wx_cv_func_broken_swprintf_decl" = "yes"; then
cat >>confdefs.h <<\_ACEOF
#define HAVE_BROKEN_SWPRINTF_DECL 1
_ACEOF
fi
fi
wchar_headers="#include <stdio.h> wchar_headers="#include <stdio.h>
#include <wchar.h>" #include <wchar.h>"
case "${host}" in case "${host}" in
@ -38649,7 +38405,7 @@ done
esac esac
for wx_func in wputc wputchar putws fputws wprintf vswprintf for wx_func in putws fputws wprintf vswprintf
do do
{ echo "$as_me:$LINENO: checking for $wx_func" >&5 { echo "$as_me:$LINENO: checking for $wx_func" >&5
echo $ECHO_N "checking for $wx_func... $ECHO_C" >&6; } echo $ECHO_N "checking for $wx_func... $ECHO_C" >&6; }
@ -38781,90 +38537,6 @@ fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext; rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext;
fi fi
if test "x$ac_cv_header_fnmatch_h" = "xyes"; then
for wx_func in fnmatch
do
{ echo "$as_me:$LINENO: checking for $wx_func" >&5
echo $ECHO_N "checking for $wx_func... $ECHO_C" >&6; }
if { as_var=wx_cv_func_$wx_func; eval "test \"\${$as_var+set}\" = set"; }; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#include <fnmatch.h>
$ac_includes_default
int
main ()
{
#ifndef $wx_func
&$wx_func;
#endif
;
return 0;
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
if { (ac_try="$ac_link"
case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
(eval "$ac_link") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
} && test -s conftest$ac_exeext &&
$as_test_x conftest$ac_exeext; then
eval wx_cv_func_$wx_func=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
eval wx_cv_func_$wx_func=no
fi
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
fi
ac_res=`eval echo '${'wx_cv_func_$wx_func'}'`
{ echo "$as_me:$LINENO: result: $ac_res" >&5
echo "${ECHO_T}$ac_res" >&6; }
if eval test \$wx_cv_func_$wx_func = yes
then
cat >>confdefs.h <<_ACEOF
#define HAVE_`echo $wx_func | tr 'a-z' 'A-Z'` 1
_ACEOF
else
:
fi
done
fi
if test "$wxUSE_FILE" = "yes"; then if test "$wxUSE_FILE" = "yes"; then
for wx_func in fsync for wx_func in fsync
@ -40167,101 +39839,6 @@ echo "$as_me: WARNING: wxSingleInstanceChecker not available" >&2;}
fi fi
for ac_func in timegm
do
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
{ echo "$as_me:$LINENO: checking for $ac_func" >&5
echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
For example, HP-UX 11i <limits.h> declares gettimeofday. */
#define $ac_func innocuous_$ac_func
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func (); below.
Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
<limits.h> exists even on freestanding compilers. */
#ifdef __STDC__
# include <limits.h>
#else
# include <assert.h>
#endif
#undef $ac_func
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
builtin and then its argument prototype would still apply. */
#ifdef __cplusplus
extern "C"
#endif
char $ac_func ();
/* The GNU C library defines this for functions which it implements
to always fail with ENOSYS. Some functions are actually named
something starting with __ and the normal name is an alias. */
#if defined __stub_$ac_func || defined __stub___$ac_func
choke me
#endif
int
main ()
{
return $ac_func ();
;
return 0;
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
if { (ac_try="$ac_link"
case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
(eval "$ac_link") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
} && test -s conftest$ac_exeext &&
$as_test_x conftest$ac_exeext; then
eval "$as_ac_var=yes"
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
eval "$as_ac_var=no"
fi
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
fi
ac_res=`eval echo '${'$as_ac_var'}'`
{ echo "$as_me:$LINENO: result: $ac_res" >&5
echo "${ECHO_T}$ac_res" >&6; }
if test `eval echo '${'$as_ac_var'}'` = yes; then
cat >>confdefs.h <<_ACEOF
#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
_ACEOF
fi
done
for ac_func in setenv putenv for ac_func in setenv putenv
do do
@ -43268,94 +42845,6 @@ _ACEOF
fi fi
{ echo "$as_me:$LINENO: checking for readdir_r" >&5
echo $ECHO_N "checking for readdir_r... $ECHO_C" >&6; }
if test "${ac_cv_func_readdir_r+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
/* Define readdir_r to an innocuous variant, in case <limits.h> declares readdir_r.
For example, HP-UX 11i <limits.h> declares gettimeofday. */
#define readdir_r innocuous_readdir_r
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char readdir_r (); below.
Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
<limits.h> exists even on freestanding compilers. */
#ifdef __STDC__
# include <limits.h>
#else
# include <assert.h>
#endif
#undef readdir_r
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
builtin and then its argument prototype would still apply. */
#ifdef __cplusplus
extern "C"
#endif
char readdir_r ();
/* The GNU C library defines this for functions which it implements
to always fail with ENOSYS. Some functions are actually named
something starting with __ and the normal name is an alias. */
#if defined __stub_readdir_r || defined __stub___readdir_r
choke me
#endif
int
main ()
{
return readdir_r ();
;
return 0;
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
if { (ac_try="$ac_link"
case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
(eval "$ac_link") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
} && test -s conftest$ac_exeext &&
$as_test_x conftest$ac_exeext; then
ac_cv_func_readdir_r=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_func_readdir_r=no
fi
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
fi
{ echo "$as_me:$LINENO: result: $ac_cv_func_readdir_r" >&5
echo "${ECHO_T}$ac_cv_func_readdir_r" >&6; }
if test $ac_cv_func_readdir_r = yes; then
cat >>confdefs.h <<\_ACEOF
#define HAVE_READDIR_R 1
_ACEOF
fi

74
configure.in
View File

@ -1508,7 +1508,7 @@ dnl ------------------------------------------------------------------------
dnl Note: non-empty last parameter makes check compile-only, dnl Note: non-empty last parameter makes check compile-only,
dnl skipping worthless preprocessing check dnl skipping worthless preprocessing check
AC_CHECK_HEADERS(stdlib.h fnmatch.h langinfo.h malloc.h unistd.h wchar.h,,, [AC_INCLUDES_DEFAULT()]) AC_CHECK_HEADERS(langinfo.h wchar.h,,, [AC_INCLUDES_DEFAULT])
dnl maybe wchar_t is in wcstr.h if we don't have wchar.h? dnl maybe wchar_t is in wcstr.h if we don't have wchar.h?
if test "$ac_cv_header_wchar_h" != "yes"; then if test "$ac_cv_header_wchar_h" != "yes"; then
@ -4231,36 +4231,6 @@ if test "$ac_cv_func_snprintf" = "yes"; then
if test "$wx_cv_func_snprintf_decl" = "yes"; then if test "$wx_cv_func_snprintf_decl" = "yes"; then
AC_DEFINE(HAVE_SNPRINTF_DECL) AC_DEFINE(HAVE_SNPRINTF_DECL)
dnl we know there is an snprintf declaration, but some old headers
dnl may have one taking a "char *" format instead of "const char *"
AC_CACHE_CHECK([if snprintf declaration is broken], wx_cv_func_broken_snprintf_decl,
[
AC_TRY_COMPILE(
[
#include <stdio.h>
#include <stdarg.h>
#ifdef __MSL__
#if __MSL__ >= 0x6000
namespace std {}
using namespace std;
#endif
#endif
],
[
char *buf;
const char *fmt = "%s";
snprintf(buf, 10u, fmt, "wx");
],
wx_cv_func_broken_snprintf_decl=no,
wx_cv_func_broken_snprintf_decl=yes
)
]
)
if test "$wx_cv_func_broken_snprintf_decl" = "yes"; then
AC_DEFINE(HAVE_BROKEN_SNPRINTF_DECL)
fi
fi fi
if test "$wxUSE_PRINTF_POS_PARAMS" = "yes"; then if test "$wxUSE_PRINTF_POS_PARAMS" = "yes"; then
@ -4304,38 +4274,6 @@ fi
if test "$wxUSE_UNICODE" = yes; then if test "$wxUSE_UNICODE" = yes; then
dnl our wxVsnprintf() implementation needs to use the system swprintf() in Unicode
dnl builds so let's check if swprintf() is declared as C99 imposes:
dnl int swprintf(wchar_t *s, size_t n, const wchar_t *format, ...);
dnl or rather as:
dnl int swprintf(wchar_t *s, const wchar_t *format, ...);
AC_CHECK_FUNCS(swprintf)
if test "$ac_cv_func_swprintf" = "yes"; then
AC_CACHE_CHECK([if swprintf declaration is broken], wx_cv_func_broken_swprintf_decl,
[
AC_TRY_COMPILE(
[
#include <stdio.h>
#include <stdarg.h>
#include <wchar.h>
],
[
wchar_t *buf;
const wchar_t *fmt = L"test";
swprintf(buf, 10u, fmt);
],
wx_cv_func_broken_swprintf_decl=no,
wx_cv_func_broken_swprintf_decl=yes
)
]
)
if test "$wx_cv_func_broken_swprintf_decl" = "yes"; then
AC_DEFINE(HAVE_BROKEN_SWPRINTF_DECL)
fi
fi
dnl also look if we have wide char IO functions, notice that [f]putws are dnl also look if we have wide char IO functions, notice that [f]putws are
dnl declared in special widec.h under Solaris dnl declared in special widec.h under Solaris
wchar_headers="#include <stdio.h> wchar_headers="#include <stdio.h>
@ -4349,7 +4287,7 @@ if test "$wxUSE_UNICODE" = yes; then
fi fi
esac esac
WX_CHECK_FUNCS(wputc wputchar putws fputws wprintf vswprintf,,, WX_CHECK_FUNCS(putws fputws wprintf vswprintf,,,
[$wchar_headers]) [$wchar_headers])
dnl MinGW has a vswprintf with a different prototype, and dnl MinGW has a vswprintf with a different prototype, and
@ -4363,10 +4301,6 @@ if test "$wxUSE_UNICODE" = yes; then
[AC_MSG_RESULT([no])]); [AC_MSG_RESULT([no])]);
fi fi
if test "x$ac_cv_header_fnmatch_h" = "xyes"; then
WX_CHECK_FUNCS(fnmatch,,,[#include <fnmatch.h>])
fi
if test "$wxUSE_FILE" = "yes"; then if test "$wxUSE_FILE" = "yes"; then
WX_CHECK_FUNCS(fsync) WX_CHECK_FUNCS(fsync)
fi fi
@ -4611,9 +4545,6 @@ if test "$wxUSE_SNGLINST_CHECKER" = "yes"; then
fi fi
fi fi
dnl check for timegm() used by datetime.cpp
AC_CHECK_FUNCS(timegm)
dnl look for a function to modify the environment dnl look for a function to modify the environment
AC_CHECK_FUNCS(setenv putenv, break) AC_CHECK_FUNCS(setenv putenv, break)
if test "$ac_cv_func_setenv" = "yes"; then if test "$ac_cv_func_setenv" = "yes"; then
@ -5080,7 +5011,6 @@ fi
AC_CHECK_FUNC(localtime_r, [ AC_DEFINE(HAVE_LOCALTIME_R) ]) AC_CHECK_FUNC(localtime_r, [ AC_DEFINE(HAVE_LOCALTIME_R) ])
AC_CHECK_FUNC(gmtime_r, [ AC_DEFINE(HAVE_GMTIME_R) ]) AC_CHECK_FUNC(gmtime_r, [ AC_DEFINE(HAVE_GMTIME_R) ])
AC_CHECK_FUNC(readdir_r, [ AC_DEFINE(HAVE_READDIR_R) ])
dnl By preference, we probably should use getaddrinfo which avoids thread dnl By preference, we probably should use getaddrinfo which avoids thread
dnl safety issues and supports IPv6, however there currently is no code dnl safety issues and supports IPv6, however there currently is no code
dnl for it, so testing for it is temporarily disabled and we are restricted dnl for it, so testing for it is temporarily disabled and we are restricted

9
include/wx/mac/carbon/config_xcode.h
View File

@ -40,14 +40,11 @@
#define HAVE_PW_GECOS 1 #define HAVE_PW_GECOS 1
#define HAVE_GETTIMEOFDAY 1 #define HAVE_GETTIMEOFDAY 1
#define HAVE_FSYNC 1 #define HAVE_FSYNC 1
#define HAVE_LARGEFILE_SUPPORT 1
#define HAVE_LOCALTIME 1
#define HAVE_SCHED_YIELD 1 #define HAVE_SCHED_YIELD 1
#define HAVE_PTHREAD_MUTEXATTR_T 1 #define HAVE_PTHREAD_MUTEXATTR_T 1
#define HAVE_PTHREAD_MUTEXATTR_SETTYPE_DECL 1 #define HAVE_PTHREAD_MUTEXATTR_SETTYPE_DECL 1
#define HAVE_PTHREAD_CANCEL 1 #define HAVE_PTHREAD_CANCEL 1
#define HAVE_PTHREAD_ATTR_SETSTACKSIZE 1 #define HAVE_PTHREAD_ATTR_SETSTACKSIZE 1
#define HAVE_SIGACTION 1
#define HAVE_SNPRINTF 1 #define HAVE_SNPRINTF 1
#define HAVE_SNPRINTF_DECL 1 #define HAVE_SNPRINTF_DECL 1
#define HAVE_UNIX98_PRINTF 1 #define HAVE_UNIX98_PRINTF 1
@ -56,7 +53,6 @@
#define HAVE_STRPTIME 1 #define HAVE_STRPTIME 1
#define HAVE_STRPTIME_DECL 1 #define HAVE_STRPTIME_DECL 1
#define HAVE_THREAD_PRIORITY_FUNCTIONS 1 #define HAVE_THREAD_PRIORITY_FUNCTIONS 1
#define HAVE_TIMEGM 1
#define HAVE_VSNPRINTF 1 #define HAVE_VSNPRINTF 1
#define HAVE_VSNPRINTF_DECL 1 #define HAVE_VSNPRINTF_DECL 1
#define HAVE_USLEEP 1 #define HAVE_USLEEP 1
@ -85,14 +81,10 @@
#define HAVE_LOCALTIME_R 1 #define HAVE_LOCALTIME_R 1
#define HAVE_MKSTEMP 1 #define HAVE_MKSTEMP 1
#define HAVE_PUTENV 1 #define HAVE_PUTENV 1
#define HAVE_READDIR_R 1
#define HAVE_STRTOK_R 1 #define HAVE_STRTOK_R 1
#define HAVE_UNAME 1 #define HAVE_UNAME 1
#define HAVE_USLEEP 1 #define HAVE_USLEEP 1
#define HAVE_X11_XKBLIB_H 1 #define HAVE_X11_XKBLIB_H 1
#define HAVE_FNMATCH 1
#define HAVE_FNMATCH_H 1
#define HAVE_IOSTREAM 1
#define HAVE_SCHED_H 1 #define HAVE_SCHED_H 1
#define HAVE_UNISTD_H 1 #define HAVE_UNISTD_H 1
#define HAVE_WCHAR_H 1 #define HAVE_WCHAR_H 1
@ -107,7 +99,6 @@
#define HAVE_FPUTWS 1 #define HAVE_FPUTWS 1
#define HAVE_STRCASECMP_IN_STRING_H 1 #define HAVE_STRCASECMP_IN_STRING_H 1
#define HAVE_WPRINTF 1 #define HAVE_WPRINTF 1
#define HAVE_SWPRINTF 1
#define HAVE_VSWPRINTF 1 #define HAVE_VSWPRINTF 1
#define HAVE_FSEEKO 1 #define HAVE_FSEEKO 1
#define HAVE_SYS_SELECT_H 1 #define HAVE_SYS_SELECT_H 1

56
setup.h.in
View File

@ -828,12 +828,6 @@
/* Define if you have ftime() */ /* Define if you have ftime() */
#undef HAVE_FTIME #undef HAVE_FTIME
/* Define if you have support for large (64 bit size) files */
#undef HAVE_LARGEFILE_SUPPORT
/* Define if you have localtime() */
#undef HAVE_LOCALTIME
/* Define if you have nanosleep() */ /* Define if you have nanosleep() */
#undef HAVE_NANOSLEEP #undef HAVE_NANOSLEEP
@ -858,12 +852,6 @@
/* Define if you have pthread_attr_setstacksize */ /* Define if you have pthread_attr_setstacksize */
#undef HAVE_PTHREAD_ATTR_SETSTACKSIZE #undef HAVE_PTHREAD_ATTR_SETSTACKSIZE
/* Define if you have sigaction() */
#undef HAVE_SIGACTION
/* Define if you have sigemptyset() */
#undef HAVE_SIGEMPTYSET
/* Define if you have shl_load() */ /* Define if you have shl_load() */
#undef HAVE_SHL_LOAD #undef HAVE_SHL_LOAD
@ -873,10 +861,6 @@
/* Define if you have snprintf() declaration in the header */ /* Define if you have snprintf() declaration in the header */
#undef HAVE_SNPRINTF_DECL #undef HAVE_SNPRINTF_DECL
/* Define if you have a _broken_ snprintf() declaration in the header,
* with 'char*' for the 3rd parameter instead of 'const char*' */
#undef HAVE_BROKEN_SNPRINTF_DECL
/* Define if you have a snprintf() which supports positional arguments /* Define if you have a snprintf() which supports positional arguments
(defined in the unix98 standard) */ (defined in the unix98 standard) */
#undef HAVE_UNIX98_PRINTF #undef HAVE_UNIX98_PRINTF
@ -902,9 +886,6 @@
/* Define if you have all functions to set thread priority */ /* Define if you have all functions to set thread priority */
#undef HAVE_THREAD_PRIORITY_FUNCTIONS #undef HAVE_THREAD_PRIORITY_FUNCTIONS
/* Define if you have timegm() function */
#undef HAVE_TIMEGM
/* Define if you have vsnprintf() */ /* Define if you have vsnprintf() */
#undef HAVE_VSNPRINTF #undef HAVE_VSNPRINTF
@ -927,9 +908,6 @@
/* Define if you have wcstoull() and wcstoll() */ /* Define if you have wcstoull() and wcstoll() */
#undef HAVE_WCSTOULL #undef HAVE_WCSTOULL
/* define if you have vsscanf function */
#undef HAVE_VSSCANF
/* The number of bytes in a wchar_t. */ /* The number of bytes in a wchar_t. */
#undef SIZEOF_WCHAR_T #undef SIZEOF_WCHAR_T
@ -1020,9 +998,6 @@
/* Define if you have the putenv function. */ /* Define if you have the putenv function. */
#undef HAVE_PUTENV #undef HAVE_PUTENV
/* Define if you have the readdir_r function. */
#undef HAVE_READDIR_R
/* Define if you have the setenv function. */ /* Define if you have the setenv function. */
#undef HAVE_SETENV #undef HAVE_SETENV
@ -1044,18 +1019,6 @@
/* Define if you have the <X11/extensions/xf86vmode.h> header file. */ /* Define if you have the <X11/extensions/xf86vmode.h> header file. */
#undef HAVE_X11_EXTENSIONS_XF86VMODE_H #undef HAVE_X11_EXTENSIONS_XF86VMODE_H
/* Define if you have the fnmatch() function */
#undef HAVE_FNMATCH
/* Define if you have the <fnmatch.h> header file. */
#undef HAVE_FNMATCH_H
/* Define if you have the <iostream> header file. */
#undef HAVE_IOSTREAM
/* Define if you have the <linux/joystick.h> header file. */
#undef HAVE_LINUX_JOYSTICK_H
/* Define if you have the <sched.h> header file. */ /* Define if you have the <sched.h> header file. */
#undef HAVE_SCHED_H #undef HAVE_SCHED_H
@ -1071,9 +1034,6 @@
/* Define if you have the <wcstr.h> header file. */ /* Define if you have the <wcstr.h> header file. */
#undef HAVE_WCSTR_H #undef HAVE_WCSTR_H
/* Define if you have the <wctype.h> header file. */
#undef HAVE_WCTYPE_H
/* Define if you have <widec.h> (Solaris only) */ /* Define if you have <widec.h> (Solaris only) */
#undef HAVE_WIDEC_H #undef HAVE_WIDEC_H
@ -1095,12 +1055,6 @@
/* Define if you have wcsrtombs() function */ /* Define if you have wcsrtombs() function */
#undef HAVE_WCSRTOMBS #undef HAVE_WCSRTOMBS
/* Define this if you have wputc() */
#undef HAVE_WPUTC
/* Define this if you have wputchar() */
#undef HAVE_WPUTCHAR
/* Define this if you have putws() */ /* Define this if you have putws() */
#undef HAVE_PUTWS #undef HAVE_PUTWS
@ -1116,13 +1070,6 @@
/* Define this if you have wprintf() and related functions */ /* Define this if you have wprintf() and related functions */
#undef HAVE_WPRINTF #undef HAVE_WPRINTF
/* Define this if you have swprintf() */
#undef HAVE_SWPRINTF
/* Define if you have a _broken_ swprintf() declaration in the header,
* without a 'size_t max' parameter as second argument */
#undef HAVE_BROKEN_SWPRINTF_DECL
/* Define this if you have vswprintf() and related functions */ /* Define this if you have vswprintf() and related functions */
#undef HAVE_VSWPRINTF #undef HAVE_VSWPRINTF
@ -1153,9 +1100,6 @@
/* Define if you have the <sys/select.h> header file. */ /* Define if you have the <sys/select.h> header file. */
#undef HAVE_SYS_SELECT_H #undef HAVE_SYS_SELECT_H
/* Define if you have the <sys/epoll.h> header file. */
#undef HAVE_SYS_EPOLL_H
/* Define if fdopen is available. */ /* Define if fdopen is available. */
#undef HAVE_FDOPEN #undef HAVE_FDOPEN