diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | aczsh.m4 | 51 | ||||
| -rw-r--r-- | configure.ac | 2 |
3 files changed, 6 insertions, 52 deletions
diff --git a/ChangeLog b/ChangeLog index f9fa3c414..da2e655d4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2008-05-31 Clint Adams <clint@zsh.org> + + * 25122: aczsh.m4, configure.ac: use AC_SYS_LARGEFILE for better + LFS detection. + 2008-05-29 Peter Stephenson <pws@csr.com> * unposted: Doc/Zsh/tcpsys.yo, Functions/TCP/tcp_fd_handler: diff --git a/aczsh.m4 b/aczsh.m4 index b5b720458..c36276131 100644 --- a/aczsh.m4 +++ b/aczsh.m4 @@ -25,57 +25,6 @@ dnl support, updates, enhancements, or modifications. dnl dnl -dnl Code from the configure system for bash 2.03 (not zsh copyright). -dnl If available, use support for large files unless the user specified -dnl one of the CPPFLAGS, LDFLAGS, or LIBS variables (<eggert@twinsun.com> -dnl via GNU patch 2.5) -dnl -AC_DEFUN(zsh_LARGE_FILE_SUPPORT, -[AC_MSG_CHECKING(whether large file support needs explicit enabling) -ac_getconfs='' -ac_result=yes -ac_set='' -ac_shellvars='CPPFLAGS LDFLAGS LIBS' -for ac_shellvar in $ac_shellvars; do - case $ac_shellvar in - CPPFLAGS) ac_lfsvar=LFS_CFLAGS ;; - *) ac_lfsvar=LFS_$ac_shellvar ;; - esac - (getconf $ac_lfsvar) >/dev/null 2>&1 || { ac_result=no; break; } - ac_getconf=`getconf $ac_lfsvar` - if test -n "$ac_getconf" && test "$ac_getconf" != "undefined"; then - eval test '"${'$ac_shellvar'+set}"' = set && ac_set=$ac_shellvar - ac_getconfs=$ac_getconfs$ac_getconf - eval ac_test_$ac_shellvar="\$ac_getconf" - else - eval ac_test_$ac_shellvar="\$$ac_shellvar" - fi -done -case "$ac_result$ac_getconfs" in -yes) ac_result=no ;; -esac -case "$ac_result$ac_set" in -yes?*) test "x$ac_set" != "xLDFLAGS" -o "x$auto_ldflags" = x && { - ac_result="yes, but $ac_set is already set, so use its settings" -} -esac -AC_MSG_RESULT($ac_result) -case $ac_result in -yes) - for ac_shellvar in $ac_shellvars; do - case "`eval echo $ac_shellvar-\\\$ac_test_$ac_shellvar`" in - CPPFLAGS*-D_LARGEFILE_SOURCE*) eval $ac_shellvar=\$ac_test_$ac_shellvar - ;; - CPPFLAGS*) - eval $ac_shellvar="\"-D_LARGEFILE_SOURCE \$ac_test_$ac_shellvar\"" - ;; - *) eval $ac_shellvar=\$ac_test_$ac_shellvar - esac - done ;; -esac -]) - -dnl dnl zsh_64_BIT_TYPE dnl Check whether the first argument works as a 64-bit type. dnl If there is a non-zero third argument, we just assume it works diff --git a/configure.ac b/configure.ac index 0cf75fe2d..932d99de5 100644 --- a/configure.ac +++ b/configure.ac @@ -375,7 +375,7 @@ dnl Any takers? if test "$host" = mips-sni-sysv4 && test -n "$GCC"; then : else - zsh_LARGE_FILE_SUPPORT + AC_SYS_LARGEFILE fi fi |