[Box Backup-commit] COMMIT r2494 - box/trunk/infrastructure/m4
boxbackup-dev at boxbackup.org
boxbackup-dev at boxbackup.org
Sat Apr 4 15:02:58 BST 2009
Author: chris
Date: 2009-04-04 15:02:57 +0100 (Sat, 04 Apr 2009)
New Revision: 2494
Modified:
box/trunk/infrastructure/m4/ax_check_dirent_d_type.m4
box/trunk/infrastructure/m4/ax_check_syscall_lseek.m4
Log:
Blind fix for autoconf problems introduced by earlier attempt to support
cross-compiling.
Modified: box/trunk/infrastructure/m4/ax_check_dirent_d_type.m4
===================================================================
--- box/trunk/infrastructure/m4/ax_check_dirent_d_type.m4 2009-04-03 10:52:32 UTC (rev 2493)
+++ box/trunk/infrastructure/m4/ax_check_dirent_d_type.m4 2009-04-04 14:02:57 UTC (rev 2494)
@@ -17,15 +17,17 @@
if test "x$ac_cv_member_struct_dirent_d_type" = "xyes"; then
AC_CACHE_CHECK([[whether struct dirent.d_type is valid]], [box_cv_have_valid_dirent_d_type],
[AC_TRY_RUN(
- [AC_LANG_PROGRAM([[
+ [
$ac_includes_default
#include <dirent.h>
- ]], [[
+ int main()
+ {
DIR* dir = opendir(".");
struct dirent* res = NULL;
if(dir) res = readdir(dir);
return res ? (res->d_type != DT_FILE && res->d_type != DT_DIR) : 1;
- ]])],
+ }
+ ],
[box_cv_have_valid_dirent_d_type=yes],
[box_cv_have_valid_dirent_d_type=no],
[box_cv_have_valid_dirent_d_type=cross]
Modified: box/trunk/infrastructure/m4/ax_check_syscall_lseek.m4
===================================================================
--- box/trunk/infrastructure/m4/ax_check_syscall_lseek.m4 2009-04-03 10:52:32 UTC (rev 2493)
+++ box/trunk/infrastructure/m4/ax_check_syscall_lseek.m4 2009-04-04 14:02:57 UTC (rev 2494)
@@ -17,7 +17,7 @@
if test "x$ac_cv_header_sys_syscall_h" = "xyes"; then
AC_CACHE_CHECK([[whether syscall lseek requires dummy parameter]], [box_cv_have_lseek_dummy_param],
[AC_TRY_RUN(
- [AC_LANG_PROGRAM([[
+ [
$ac_includes_default
#include <fcntl.h>
#include <sys/syscall.h>
@@ -28,7 +28,8 @@
#undef syscall
#define syscall __syscall
#endif
- ]], [[
+ int main()
+ {
int fh = creat("lseektest", 0600);
int res = 0;
if(fh>=0)
@@ -49,7 +50,8 @@
}
unlink("lseektest");
return res!=-1;
- ]])],
+ }
+ ],
[box_cv_have_lseek_dummy_param=yes],
[box_cv_have_lseek_dummy_param=no],
[box_cv_have_lseek_dummy_param=no # assume not for cross-compiling]
More information about the Boxbackup-commit
mailing list