fix for the last commit
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35292 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
60
configure
vendored
60
configure
vendored
@@ -32802,13 +32802,61 @@ echo $ECHO_N "checking for statfs declaration... $ECHO_C" >&6
|
|||||||
if test "${wx_cv_func_statfs_decl+set}" = set; then
|
if test "${wx_cv_func_statfs_decl+set}" = set; then
|
||||||
echo $ECHO_N "(cached) $ECHO_C" >&6
|
echo $ECHO_N "(cached) $ECHO_C" >&6
|
||||||
else
|
else
|
||||||
|
cat >conftest.$ac_ext <<_ACEOF
|
||||||
|
/* confdefs.h. */
|
||||||
|
_ACEOF
|
||||||
|
cat confdefs.h >>conftest.$ac_ext
|
||||||
|
cat >>conftest.$ac_ext <<_ACEOF
|
||||||
|
/* end confdefs.h. */
|
||||||
|
|
||||||
#if defined(__BSD__)
|
#if defined(__BSD__)
|
||||||
#include <sys/param.h>
|
#include <sys/param.h>
|
||||||
#include <sys/mount.h>
|
#include <sys/mount.h>
|
||||||
#else
|
#else
|
||||||
#include <sys/vfs.h>
|
#include <sys/vfs.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
int
|
||||||
|
main ()
|
||||||
|
{
|
||||||
|
|
||||||
|
struct statfs fs;
|
||||||
|
statfs("", &fs);
|
||||||
|
|
||||||
|
;
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
_ACEOF
|
||||||
|
rm -f conftest.$ac_objext
|
||||||
|
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&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); } &&
|
||||||
|
{ ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
|
||||||
|
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
||||||
|
(eval $ac_try) 2>&5
|
||||||
|
ac_status=$?
|
||||||
|
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||||
|
(exit $ac_status); }; } &&
|
||||||
|
{ ac_try='test -s conftest.$ac_objext'
|
||||||
|
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
||||||
|
(eval $ac_try) 2>&5
|
||||||
|
ac_status=$?
|
||||||
|
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||||
|
(exit $ac_status); }; }; then
|
||||||
|
wx_cv_func_statfs_decl=yes
|
||||||
|
else
|
||||||
|
echo "$as_me: failed program was:" >&5
|
||||||
|
sed 's/^/| /' conftest.$ac_ext >&5
|
||||||
|
|
||||||
|
wx_cv_func_statfs_decl=no
|
||||||
|
|
||||||
|
fi
|
||||||
|
rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
|
||||||
|
|
||||||
fi
|
fi
|
||||||
echo "$as_me:$LINENO: result: $wx_cv_func_statfs_decl" >&5
|
echo "$as_me:$LINENO: result: $wx_cv_func_statfs_decl" >&5
|
||||||
|
30
configure.in
30
configure.in
@@ -4159,20 +4159,22 @@ if test "$wx_cv_func_statfs" = "yes"; then
|
|||||||
AC_LANG_SAVE
|
AC_LANG_SAVE
|
||||||
AC_LANG_CPLUSPLUS
|
AC_LANG_CPLUSPLUS
|
||||||
AC_CACHE_CHECK(for statfs declaration, wx_cv_func_statfs_decl,
|
AC_CACHE_CHECK(for statfs declaration, wx_cv_func_statfs_decl,
|
||||||
[
|
AC_TRY_COMPILE(
|
||||||
#if defined(__BSD__)
|
[
|
||||||
#include <sys/param.h>
|
#if defined(__BSD__)
|
||||||
#include <sys/mount.h>
|
#include <sys/param.h>
|
||||||
#else
|
#include <sys/mount.h>
|
||||||
#include <sys/vfs.h>
|
#else
|
||||||
#endif
|
#include <sys/vfs.h>
|
||||||
],
|
#endif
|
||||||
[
|
],
|
||||||
struct statfs fs;
|
[
|
||||||
statfs("", &fs);
|
struct statfs fs;
|
||||||
],
|
statfs("", &fs);
|
||||||
wx_cv_func_statfs_decl=yes,
|
],
|
||||||
wx_cv_func_statfs_decl=no
|
wx_cv_func_statfs_decl=yes,
|
||||||
|
wx_cv_func_statfs_decl=no
|
||||||
|
)
|
||||||
)
|
)
|
||||||
AC_LANG_RESTORE
|
AC_LANG_RESTORE
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user