github
/
aria2
mirror of https://github.com/aria2/aria2
1
0
Fork 0
Code Issues Releases Wiki Activity

2010-07-26 Tatsuhiro Tsujikawa <t-tujikawa@users.sourceforge.net> 

Fixed the bug that HAVE_SOME_FALLOCATE gets undefined if fallocate
	is not available even if posix_fallocate is available. This causes
	FallocFileAllocationIterator.cc is out of compile targets and
	linker error.
	* configure.ac
pull/1/head
Tatsuhiro Tsujikawa 2010-07-26 12:20:19 +00:00
parent 6d054eb74f
commit 253c0ba353
3 changed files with 18 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -1,3 +1,11 @@
2010-07-26 Tatsuhiro Tsujikawa <t-tujikawa@users.sourceforge.net>
Fixed the bug that HAVE_SOME_FALLOCATE gets undefined if fallocate
is not available even if posix_fallocate is available. This causes
FallocFileAllocationIterator.cc is out of compile targets and
linker error.
* configure.ac
2010-07-19 Tatsuhiro Tsujikawa <t-tujikawa@users.sourceforge.net> 2010-07-19 Tatsuhiro Tsujikawa <t-tujikawa@users.sourceforge.net>
Release 1.10.0 Release 1.10.0

27
configure vendored
View File

@ -14793,15 +14793,6 @@ _ACEOF
fi fi
done done
if test "x$have_posix_fallocate" = "xyes"; then
HAVE_SOME_FALLOCATE_TRUE=
HAVE_SOME_FALLOCATE_FALSE='#'
else
HAVE_SOME_FALLOCATE_TRUE='#'
HAVE_SOME_FALLOCATE_FALSE=
fi
for ac_func in fallocate for ac_func in fallocate
do : do :
ac_fn_cxx_check_func "$LINENO" "fallocate" "ac_cv_func_fallocate" ac_fn_cxx_check_func "$LINENO" "fallocate" "ac_cv_func_fallocate"
@ -14813,7 +14804,13 @@ _ACEOF
fi fi
done done
if test "x$have_fallocate" = "xyes"; then if test "x$have_posix_fallocate" = "xyes" ||
test "x$have_fallocate" = "xyes"; then
$as_echo "#define HAVE_SOME_FALLOCATE 1" >>confdefs.h
fi
if test "x$have_posix_fallocate" = "xyes" || test "x$have_fallocate" = "xyes"; then
HAVE_SOME_FALLOCATE_TRUE= HAVE_SOME_FALLOCATE_TRUE=
HAVE_SOME_FALLOCATE_FALSE='#' HAVE_SOME_FALLOCATE_FALSE='#'
else else
@ -14822,12 +14819,6 @@ else
fi fi
if test "x$have_posix_fallocate" = "xyes" ||
test "x$have_fallocate" = "xyes"; then
$as_echo "#define HAVE_SOME_FALLOCATE 1" >>confdefs.h
fi
for ac_func in asctime_r for ac_func in asctime_r
do : do :
@ -15512,10 +15503,6 @@ if test -z "${HAVE_SOME_FALLOCATE_TRUE}" && test -z "${HAVE_SOME_FALLOCATE_FALSE
as_fn_error "conditional \"HAVE_SOME_FALLOCATE\" was never defined. as_fn_error "conditional \"HAVE_SOME_FALLOCATE\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5 Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi fi
if test -z "${HAVE_SOME_FALLOCATE_TRUE}" && test -z "${HAVE_SOME_FALLOCATE_FALSE}"; then
as_fn_error "conditional \"HAVE_SOME_FALLOCATE\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${HAVE_ASCTIME_R_TRUE}" && test -z "${HAVE_ASCTIME_R_FALSE}"; then if test -z "${HAVE_ASCTIME_R_TRUE}" && test -z "${HAVE_ASCTIME_R_FALSE}"; then
as_fn_error "conditional \"HAVE_ASCTIME_R\" was never defined. as_fn_error "conditional \"HAVE_ASCTIME_R\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5 Usually this means the macro was only invoked conditionally." "$LINENO" 5

7
configure.ac
View File

@ -356,16 +356,15 @@ fi
AM_CONDITIONAL([HAVE_EPOLL], [test "x$have_epoll" = "xyes"]) AM_CONDITIONAL([HAVE_EPOLL], [test "x$have_epoll" = "xyes"])
AC_CHECK_FUNCS([posix_fallocate],[have_posix_fallocate=yes]) AC_CHECK_FUNCS([posix_fallocate],[have_posix_fallocate=yes])
AM_CONDITIONAL([HAVE_SOME_FALLOCATE], [test "x$have_posix_fallocate" = "xyes"])
AC_CHECK_FUNCS([fallocate], [have_fallocate=yes]) AC_CHECK_FUNCS([fallocate], [have_fallocate=yes])
AM_CONDITIONAL([HAVE_SOME_FALLOCATE], [test "x$have_fallocate" = "xyes"])
if test "x$have_posix_fallocate" = "xyes" || if test "x$have_posix_fallocate" = "xyes" ||
test "x$have_fallocate" = "xyes"; then test "x$have_fallocate" = "xyes"; then
AC_DEFINE([HAVE_SOME_FALLOCATE], [1], AC_DEFINE([HAVE_SOME_FALLOCATE], [1],
[Define to 1 if *_fallocate is available.]) [Define to 1 if *_fallocate is available.])
fi fi
AM_CONDITIONAL([HAVE_SOME_FALLOCATE],
[test "x$have_posix_fallocate" = "xyes" || test "x$have_fallocate" = "xyes"])
AC_CHECK_FUNCS([asctime_r], AC_CHECK_FUNCS([asctime_r],
[AM_CONDITIONAL([HAVE_ASCTIME_R], true)], [AM_CONDITIONAL([HAVE_ASCTIME_R], true)],