From 1be39db94193c8a6af4737b1d1498598b99af889 Mon Sep 17 00:00:00 2001 From: rocky Date: Sun, 8 Jan 2006 21:44:14 +0000 Subject: [PATCH] Go back to using standard autoconf-suppled AC_SYS_LARGEFILE --- Makefile.am | 26 +++++++++++++--------- largefile.m4 | 63 ---------------------------------------------------- 2 files changed, 16 insertions(+), 73 deletions(-) delete mode 100644 largefile.m4 diff --git a/Makefile.am b/Makefile.am index 72b3e184..098c1bee 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,6 +1,6 @@ -# $Id: Makefile.am,v 1.36 2005/10/05 09:48:11 rocky Exp $ +# $Id: Makefile.am,v 1.37 2006/01/08 21:44:14 rocky Exp $ # -# Copyright (C) 2003, 2004 Rocky Bernstein +# Copyright (C) 2003, 2004, 2006 Rocky Bernstein # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -20,14 +20,20 @@ ## which configure then turns into a Makefile ... ## which make can then use to produce stuff. Isn't configuration simple? -EXTRA_DIST = THANKS README.libcdio \ - package/libcdio.spec.in package/libcdio.spec \ - libcdio.pc.in libcdio.pc \ - libcdio_cdda.pc.in libcdio_cdda.pc \ - libiso9660.pc.in libiso9660.pc \ - example/README \ - MSVC/config.h MSVC/README MSVC/cd-info.vcproj \ - MSVC/libcdio.sln MSVC/libcdio.vcproj +EXTRA_DIST = + MSVC/README MSVC/cd-info.vcproj \ + MSVC/config.h \ + MSVC/libcdio.sln \ + MSVC/libcdio.vcproj \ + README.libcdio \ + THANKS \ + example/README \ + libcdio.pc.in libcdio.pc \ + libcdio_cdda.pc \ + libcdio_cdda.pc.in \ + libiso9660.pc.in libiso9660.pc \ + package/libcdio.spec \ + package/libcdio.spec.in SUBDIRS = doc include lib src test example diff --git a/largefile.m4 b/largefile.m4 deleted file mode 100644 index b7fb16cb..00000000 --- a/largefile.m4 +++ /dev/null @@ -1,63 +0,0 @@ -dnl --------------------------------------------------------------------------- -dnl AC_SYS_LARGEFILE from wxWidgets code which is partly based on the code from -dnl autoconf 2.5x) -dnl --------------------------------------------------------------------------- - -dnl WX_SYS_LARGEFILE_TEST -dnl -dnl NB: original autoconf test was checking if compiler supported 6 bit off_t -dnl arithmetic properly but this failed miserably with gcc under Linux -dnl whereas the system still supports 64 bit files, so now simply check -dnl that off_t is big enough -define(WX_SYS_LARGEFILE_TEST, -[typedef struct { - unsigned int field: sizeof(off_t) == 8; -} wxlf; -]) - - -dnl WX_SYS_LARGEFILE_MACRO_VALUE(C-MACRO, VALUE, CACHE-VAR) -define(WX_SYS_LARGEFILE_MACRO_VALUE, -[ - AC_CACHE_CHECK([for $1 value needed for large files], [$3], - [ - AC_TRY_COMPILE([#define $1 $2 - #include ], - WX_SYS_LARGEFILE_TEST, - [$3=$2], - [$3=no]) - ] - ) - - if test "$$3" != no; then - ac_cv_sys_largefiles=yes - AC_DEFINE_UNQUOTED([$1], [$$3]) - fi -]) - - -dnl AC_SYS_LARGEFILE -dnl ---------------- -dnl By default, many hosts won't let programs access large files; -dnl one must use special compiler options to get large-file access to work. -dnl For more details about this brain damage please see: -dnl http://www.sas.com/standards/large.file/x_open.20Mar96.html -AC_DEFUN([AC_SYS_LARGEFILE], -[AC_ARG_ENABLE(largefile, - [ --disable-largefile omit support for large files]) -if test "$enable_largefile" != no; then - dnl _FILE_OFFSET_BITS==64 is needed for Linux, Solaris, ... - dnl _LARGE_FILES -- for AIX - ac_cv_sys_largefiles=no - WX_SYS_LARGEFILE_MACRO_VALUE(_FILE_OFFSET_BITS, 64, ac_cv_sys_file_offset_bits) - if test "x$ac_cv_sys_largefiles" != "xyes"; then - WX_SYS_LARGEFILE_MACRO_VALUE(_LARGE_FILES, 1, ac_cv_sys_large_files) - fi - - AC_MSG_CHECKING(if large file support is available) - if test "x$ac_cv_sys_largefiles" = "xyes"; then - AC_DEFINE(HAVE_LARGEFILE_SUPPORT) - fi - AC_MSG_RESULT($ac_cv_sys_largefiles) -fi -])