From 253c0ba353206de9b7ece57a7da534fccb36cc4a Mon Sep 17 00:00:00 2001 From: Tatsuhiro Tsujikawa Date: Mon, 26 Jul 2010 12:20:19 +0000 Subject: [PATCH] 2010-07-26 Tatsuhiro Tsujikawa 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 --- ChangeLog | 8 ++++++++ configure | 27 +++++++-------------------- configure.ac | 7 +++---- 3 files changed, 18 insertions(+), 24 deletions(-) diff --git a/ChangeLog b/ChangeLog index efc48ccf..4e561b32 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2010-07-26 Tatsuhiro Tsujikawa + + 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 Release 1.10.0 diff --git a/configure b/configure index c591ee88..5a1d1905 100755 --- a/configure +++ b/configure @@ -14793,15 +14793,6 @@ _ACEOF fi 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 do : ac_fn_cxx_check_func "$LINENO" "fallocate" "ac_cv_func_fallocate" @@ -14813,7 +14804,13 @@ _ACEOF fi 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_FALSE='#' else @@ -14822,12 +14819,6 @@ else 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 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. Usually this means the macro was only invoked conditionally." "$LINENO" 5 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 as_fn_error "conditional \"HAVE_ASCTIME_R\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 diff --git a/configure.ac b/configure.ac index 45cf3a13..0176547c 100644 --- a/configure.ac +++ b/configure.ac @@ -356,16 +356,15 @@ fi AM_CONDITIONAL([HAVE_EPOLL], [test "x$have_epoll" = "xyes"]) 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]) -AM_CONDITIONAL([HAVE_SOME_FALLOCATE], [test "x$have_fallocate" = "xyes"]) - if test "x$have_posix_fallocate" = "xyes" || test "x$have_fallocate" = "xyes"; then AC_DEFINE([HAVE_SOME_FALLOCATE], [1], [Define to 1 if *_fallocate is available.]) fi +AM_CONDITIONAL([HAVE_SOME_FALLOCATE], + [test "x$have_posix_fallocate" = "xyes" || test "x$have_fallocate" = "xyes"]) + AC_CHECK_FUNCS([asctime_r], [AM_CONDITIONAL([HAVE_ASCTIME_R], true)],