From: kloczek Date: Wed, 24 Apr 2002 21:04:38 +0000 (+0000) Subject: - updated for 1.11a21. X-Git-Tag: cdrtools-1_11a21-0~2 X-Git-Url: http://git.pld-linux.org/?a=commitdiff_plain;h=4ac6d9e0d3f01ea8092c4fc92e2197e1ced66476;hp=385dd52824a4f7485bcb1da1fc16bfa2c1c9178e;p=packages%2Fcdrtools.git - updated for 1.11a21. Changed files: cdrtools-ac250.patch -> 1.2 --- diff --git a/cdrtools-ac250.patch b/cdrtools-ac250.patch index 4e35237..c024a5c 100644 --- a/cdrtools-ac250.patch +++ b/cdrtools-ac250.patch @@ -1,105 +1,6 @@ ---- cdrtools-1.10/conf/aclocal.m4.orig Thu Aug 2 23:54:08 2001 -+++ cdrtools-1.10/conf/aclocal.m4 Fri Aug 3 00:00:43 2001 -@@ -1331,96 +1331,6 @@ - - #serial 18 - --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 -- --dnl Written by Paul Eggert . -- --dnl Internal subroutine of AC_SYS_LARGEFILE. --dnl AC_SYS_LARGEFILE_TEST_INCLUDES --AC_DEFUN(AC_SYS_LARGEFILE_TEST_INCLUDES, -- [[#include -- /* Check that off_t can represent 2**63 - 1 correctly. -- We can't simply "#define LARGE_OFF_T 9223372036854775807", -- since some C++ compilers masquerading as C compilers -- incorrectly reject 9223372036854775807. */ --# define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) -- int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 -- && LARGE_OFF_T % 2147483647 == 1) -- ? 1 : -1]; -- ]]) -- --dnl Internal subroutine of AC_SYS_LARGEFILE. --dnl AC_SYS_LARGEFILE_MACRO_VALUE(C-MACRO, VALUE, CACHE-VAR, COMMENT, INCLUDES, FUNCTION-BODY) --AC_DEFUN(AC_SYS_LARGEFILE_MACRO_VALUE, -- [AC_CACHE_CHECK([for $1 value needed for large files], $3, -- [$3=no -- AC_TRY_COMPILE([$5], -- [$6], -- , -- [AC_TRY_COMPILE([#define $1 $2] --[$5] -- , -- [$6], -- [$3=$2])])]) -- if test "[$]$3" != no; then -- AC_DEFINE_UNQUOTED([$1], [$]$3, [$4]) -- fi]) -- --AC_DEFUN(AC_SYS_LARGEFILE, -- [AC_ARG_ENABLE(largefile, -- [ --disable-largefile omit support for large files]) -- if test "$enable_largefile" != no; then -- -- AC_CACHE_CHECK([for special C compiler options needed for large files], -- ac_cv_sys_largefile_CC, -- [ac_cv_sys_largefile_CC=no -- if test "$GCC" != yes; then -- # IRIX 6.2 and later do not support large files by default, -- # so use the C compiler's -n32 option if that helps. -- AC_TRY_COMPILE(AC_SYS_LARGEFILE_TEST_INCLUDES, , , -- [ac_save_CC="${CC-cc}" -- CC="$CC -n32" -- AC_TRY_COMPILE(AC_SYS_LARGEFILE_TEST_INCLUDES, , -- ac_cv_sys_largefile_CC=' -n32') -- CC="$ac_save_CC"]) -- fi]) -- if test "$ac_cv_sys_largefile_CC" != no; then -- CC="$CC$ac_cv_sys_largefile_CC" -- fi -- -- AC_SYS_LARGEFILE_MACRO_VALUE(_FILE_OFFSET_BITS, 64, -- ac_cv_sys_file_offset_bits, -- [Number of bits in a file offset, on hosts where this is settable.], -- AC_SYS_LARGEFILE_TEST_INCLUDES) -- AC_SYS_LARGEFILE_MACRO_VALUE(_LARGE_FILES, 1, -- ac_cv_sys_large_files, -- [Define for large files, on AIX-style hosts.], -- AC_SYS_LARGEFILE_TEST_INCLUDES) -- fi -- ]) -- -- --AC_DEFUN(AC_FUNC_FSEEKO, -- [AC_SYS_LARGEFILE_MACRO_VALUE(_LARGEFILE_SOURCE, 1, -- ac_cv_sys_largefile_source, -- [Define to make fseeko visible on some hosts (e.g. glibc 2.2).], -- [#include ], [return !fseeko;]) -- # We used to try defining _XOPEN_SOURCE=500 too, to work around a bug -- # in glibc 2.1.3, but that breaks too many other things. -- # If you want fseeko and ftello with glibc, upgrade to a fixed glibc. -- -- AC_CACHE_CHECK([for fseeko], ac_cv_func_fseeko, -- [ac_cv_func_fseeko=no -- AC_TRY_LINK([#include ], -- [return fseeko && fseeko (stdin, 0, 0);], -- [ac_cv_func_fseeko=yes])]) -- if test $ac_cv_func_fseeko != no; then -- AC_DEFINE(HAVE_FSEEKO, 1, -- [Define if fseeko (and presumably ftello) exists and is declared.]) -- fi]) - - - dnl XXXXXXXXXXXXXXXXXX End Stolen from GNU tar XXXXXXXXXXXXXXXXXXXXXXXXXXXXX ---- cdrtools-1.10/conf/xconfig.h.in.orig Thu Apr 12 18:10:41 2001 -+++ cdrtools-1.10/conf/xconfig.h.in Fri Aug 3 11:31:38 2001 -@@ -8,79 +8,79 @@ +--- cdrtools-1.11/conf/xconfig.h.in.orig Sat Mar 23 21:39:26 2002 ++++ cdrtools-1.11/conf/xconfig.h.in Wed Apr 24 21:32:02 2002 +@@ -8,95 +8,95 @@ /* * Header Files */ @@ -126,6 +27,10 @@ -#undef HAVE_MALLOC_H /* if malloc.h exists */ -#undef HAVE_TERMIOS_H /* to use POSIX termios.h */ -#undef HAVE_TERMIO_H /* to use SVR4 termio.h */ +-#undef HAVE_PWD_H /* if pwd.h exists */ +-#undef HAVE_GRP_H /* if grp.h exists */ +-#undef HAVE_SYS_ACL_H /* to use for ACL definitions */ +-#undef HAVE_ACLLIB_H /* if HP-UX is present */ -#undef HAVE_SHADOW_H /* if shadow.h exists */ -#undef HAVE_SYSLOG_H /* if syslog.h exists */ -#undef HAVE_SYS_TIME_H /* may include sys/time.h for struct timeval */ @@ -150,6 +55,7 @@ -#undef HAVE_SYS_UTSNAME_H /* to use uname() */ -#undef HAVE_SYS_PRIOCNTL_H /* to use SVr4 priocntl() instead of nice()/setpriority() */ -#undef HAVE_SYS_RTPRIOCNTL_H /* if the system supports SVr4 real time classes */ +-#undef HAVE_SYS_SYSCALL_H /* to use syscall() */ -#undef HAVE_SYS_MTIO_H /* to use mtio definitions from sys/mtio.h */ -#undef HAVE_SYS_MMAN_H /* to use definitions for mmap()/madvise()... from sys/mman.h */ -#undef HAVE_SYS_SHM_H /* to use definitions for shmget() ... from sys/shm.h */ @@ -160,10 +66,17 @@ -#undef HAVE_SYS_DKLABEL_H /* if we may include sys/dklabel.h for disk label */ -#undef HAVE_SUN_DKIO_H /* if we may include sun/dkio.h for disk ioctls */ -#undef HAVE_SUN_DKLABEL_H /* if we may include sun/dklabel.h for disk label */ +-#undef HAVE_SYS_TYPES_H /* if we may include sys/types.h (the standard) */ +-#undef HAVE_SYS_STAT_H /* if we may include sys/stat.h (the standard) */ +-#undef HAVE_TYPES_H /* if we may include types.h (rare cases e.g. ATARI TOS) */ +-#undef HAVE_STAT_H /* if we may include stat.h (rare cases e.g. ATARI TOS) */ -#undef HAVE_POLL_H /* if we may include poll.h to use poll() */ -#undef HAVE_SYS_POLL_H /* if we may include sys/poll.h to use poll() */ -#undef HAVE_SYS_SELECT_H /* if we may have sys/select.h nonstandard use for select() on some systems*/ -#undef NEED_SYS_SELECT_H /* if we need sys/select.h to use select() (this is nonstandard) */ +-#undef HAVE_NETDB_H /* if we have netdb.h for get*by*() and rcmd() */ +-#undef HAVE_SYS_SOCKET_H /* if we have sys/socket.h for socket() */ +-#undef NEED_SYS_SOCKET_H /* if we need sys/socket.h to use select() (this is nonstandard) */ -#undef HAVE_LINUX_PG_H /* if we may include linux/pg.h for PP ATAPI sypport */ -#undef HAVE_CAMLIB_H /* if we may include camlib.h for CAM SCSI transport definitions */ -#undef HAVE_IEEEFP_H /* if we may include ieeefp.h for finite()/isnand() */ @@ -175,7 +88,11 @@ -#undef HAVE_USG_STDIO /* if we have USG derived STDIO */ -#undef HAVE_ERRNO_DEF /* if we have errno definition in */ -#undef HAVE_VFORK_H /* if we should include vfork.h for vfork() definitions */ +-#undef HAVE_ARPA_INET_H /* if we have arpa/inet.h (missing on BeOS) */ +- /* BeOS has inet_ntoa() in */ -#undef HAVE_BSD_DEV_SCSIREG_H /* if we have a NeXT Step compatible sg driver */ +-#undef HAVE_SYS_BSDTTY_H /* if we have sys/bsdtty.h on HP-UX for TIOCGPGRP */ +-#undef HAVE_OS_H /* if we have the BeOS kernel definitions in OS.h */ +#undef PROTOTYPES +#undef HAVE_STDARG_H +#undef HAVE_VARARGS_H @@ -199,6 +116,10 @@ +#undef HAVE_MALLOC_H +#undef HAVE_TERMIOS_H +#undef HAVE_TERMIO_H ++#undef HAVE_PWD_H ++#undef HAVE_GRP_H ++#undef HAVE_SYS_ACL_H ++#undef HAVE_ACLLIB_H +#undef HAVE_SHADOW_H +#undef HAVE_SYSLOG_H +#undef HAVE_SYS_TIME_H @@ -223,6 +144,7 @@ +#undef HAVE_SYS_UTSNAME_H +#undef HAVE_SYS_PRIOCNTL_H +#undef HAVE_SYS_RTPRIOCNTL_H ++#undef HAVE_SYS_SYSCALL_H +#undef HAVE_SYS_MTIO_H +#undef HAVE_SYS_MMAN_H +#undef HAVE_SYS_SHM_H @@ -233,10 +155,17 @@ +#undef HAVE_SYS_DKLABEL_H +#undef HAVE_SUN_DKIO_H +#undef HAVE_SUN_DKLABEL_H ++#undef HAVE_SYS_TYPES_H ++#undef HAVE_SYS_STAT_H ++#undef HAVE_TYPES_H ++#undef HAVE_STAT_H +#undef HAVE_POLL_H +#undef HAVE_SYS_POLL_H +#undef HAVE_SYS_SELECT_H +#undef NEED_SYS_SELECT_H ++#undef HAVE_NETDB_H ++#undef HAVE_SYS_SOCKET_H ++#undef NEED_SYS_SOCKET_H +#undef HAVE_LINUX_PG_H +#undef HAVE_CAMLIB_H +#undef HAVE_IEEEFP_H @@ -248,16 +177,39 @@ +#undef HAVE_USG_STDIO +#undef HAVE_ERRNO_DEF +#undef HAVE_VFORK_H ++#undef HAVE_ARPA_INET_H ++ +#undef HAVE_BSD_DEV_SCSIREG_H ++#undef HAVE_SYS_BSDTTY_H ++#undef HAVE_OS_H /* * Convert to SCHILY name -@@ -106,99 +106,99 @@ +@@ -108,13 +108,13 @@ + #endif + + #ifdef HAVE_ELF_H +-#define HAVE_ELF /* This system uses ELF */ ++#define HAVE_ELF + #else + # ifdef HAVE_AOUTHDR_H +-# define HAVE_COFF /* This system uses COFF */ ++# define HAVE_COFF + # else + # ifdef HAVE_A_OUT_H +-# define HAVE_AOUT /* This system uses AOUT */ ++# define HAVE_AOUT + # endif + # endif + #endif +@@ -122,122 +122,122 @@ /* * Library Functions */ -#undef HAVE_STRERROR /* strerror() is present in libc */ -#undef HAVE_MEMMOVE /* memmove() is present in libc */ +-#undef HAVE_MADVISE /* madvise() is present in libc */ +-#undef HAVE_MLOCK /* mlock() is present in libc */ -#undef HAVE_MLOCKALL /* working mlockall() is present in libc */ -#undef HAVE_MMAP /* working mmap() is present in libc */ -#undef _MMAP_WITH_SIZEP /* mmap() needs address of size parameter */ @@ -294,7 +246,15 @@ -#undef HAVE_GETHOSTNAME /* gethostname() is present in libc */ -#undef HAVE_GETDOMAINNAME /* getdomainname() is present in libc */ -#undef HAVE_GETPAGESIZE /* getpagesize() is present in libc */ +-#undef HAVE_GETDTABLESIZE /* getdtablesize() is present in libc */ -#undef HAVE_GETRUSAGE /* getrusage() is present in libc */ +-#undef HAVE_GETRLIMIT /* getrlimit() is present in libc */ +-#undef HAVE_SETRLIMIT /* setrlimit() is present in libc */ +-#undef HAVE_ULIMIT /* ulimit() is present in libc */ +-#undef HAVE_GETTIMEOFDAY /* gettimeofday() is present in libc */ +-#undef HAVE_SETTIMEOFDAY /* settimeofday() is present in libc */ +-#undef HAVE_TIME /* time() is present in libc */ +-#undef HAVE_STIME /* stime() is present in libc */ -#undef HAVE_POLL /* poll() is present in libc */ -#undef HAVE_SELECT /* select() is present in libc */ -#undef HAVE_LCHOWN /* lchown() is present in libc */ @@ -337,6 +297,7 @@ -#undef HAVE_UNAME /* uname() is present in libc */ -#undef HAVE_SNPRINTF /* snprintf() is present in libc */ -#undef HAVE_STRCASECMP /* strcasecmp() is present in libc */ +-#undef HAVE_STRDUP /* strdup() is present in libc */ -#undef HAVE_STRSIGNAL /* strsignal() is present in libc */ -#undef HAVE_STR2SIG /* str2sig() is present in libc */ -#undef HAVE_SIG2STR /* sig2str() is present in libc */ @@ -344,13 +305,21 @@ -#undef HAVE_SIGRELSE /* sigrelse() is present in libc */ -#undef HAVE_SIGPROCMASK /* sigprocmask() is present in libc (POSIX) */ -#undef HAVE_SIGSETMASK /* sigsetmask() is present in libc (BSD) */ +-#undef HAVE_SIGSET /* sigset() is present in libc (POSIX) */ -#undef HAVE_SYS_SIGLIST /* char *sys_siglist[] is present in libc */ -#undef HAVE_NANOSLEEP /* nanosleep() is present in libc */ -#undef HAVE_USLEEP /* usleep() is present in libc */ -#undef HAVE_FORK /* fork() is present in libc */ +-#undef HAVE_EXECL /* execl() is present in libc */ +-#undef HAVE_EXECLE /* execle() is present in libc */ +-#undef HAVE_EXECV /* execv() is present in libc */ +-#undef HAVE_EXECVE /* execve() is present in libc */ +-#undef HAVE_EXECVP /* execvp() is present in libc */ -#undef HAVE_VALLOC /* valloc() is present in libc (else use malloc())*/ +#undef HAVE_STRERROR +#undef HAVE_MEMMOVE ++#undef HAVE_MADVISE ++#undef HAVE_MLOCK +#undef HAVE_MLOCKALL +#undef HAVE_MMAP +#undef _MMAP_WITH_SIZEP @@ -387,7 +356,15 @@ +#undef HAVE_GETHOSTNAME +#undef HAVE_GETDOMAINNAME +#undef HAVE_GETPAGESIZE ++#undef HAVE_GETDTABLESIZE +#undef HAVE_GETRUSAGE ++#undef HAVE_GETRLIMIT ++#undef HAVE_SETRLIMIT ++#undef HAVE_ULIMIT ++#undef HAVE_GETTIMEOFDAY ++#undef HAVE_SETTIMEOFDAY ++#undef HAVE_TIME ++#undef HAVE_STIME +#undef HAVE_POLL +#undef HAVE_SELECT +#undef HAVE_LCHOWN @@ -430,6 +407,7 @@ +#undef HAVE_UNAME +#undef HAVE_SNPRINTF +#undef HAVE_STRCASECMP ++#undef HAVE_STRDUP +#undef HAVE_STRSIGNAL +#undef HAVE_STR2SIG +#undef HAVE_SIG2STR @@ -437,15 +415,71 @@ +#undef HAVE_SIGRELSE +#undef HAVE_SIGPROCMASK +#undef HAVE_SIGSETMASK ++#undef HAVE_SIGSET +#undef HAVE_SYS_SIGLIST +#undef HAVE_NANOSLEEP +#undef HAVE_USLEEP +#undef HAVE_FORK ++#undef HAVE_EXECL ++#undef HAVE_EXECLE ++#undef HAVE_EXECV ++#undef HAVE_EXECVE ++#undef HAVE_EXECVP +#undef HAVE_VALLOC #undef vfork +-#undef HAVE_CHFLAGS /* chflags() is present in libc */ +-#undef HAVE_FCHFLAGS /* fchflags() is present in libc */ +-#undef HAVE_FFLAGSTOSTR /* fflagstostr() is present in libc */ +-#undef HAVE_STRTOFFLAGS /* strtofflags() is present in libc */ ++#undef HAVE_CHFLAGS ++#undef HAVE_FCHFLAGS ++#undef HAVE_FFLAGSTOSTR ++#undef HAVE_STRTOFFLAGS + + /* + * Important: This must be a result from a check _before_ the Large File test +@@ -249,14 +249,14 @@ + * Instead use the tests AC_SMALL_FSEEKO/AC_SMALL/STELLO and make sure + * they are placed before the large file tests. + */ +-#undef HAVE_FSEEKO /* fseeko() is present in default compile mode */ +-#undef HAVE_FTELLO /* ftello() is present in default compile mode */ ++#undef HAVE_FSEEKO ++#undef HAVE_FTELLO + +-#undef HAVE_RCMD /* rcmd() is present in libc/libsocket */ +-#undef HAVE_INET_NTOA /* inet_ntoa() is present in libc/libsocket */ ++#undef HAVE_RCMD ++#undef HAVE_INET_NTOA + #if defined(HAVE_QUOTACTL) || defined(HAVE_QUOTAIOCTL) -@@ -227,35 +227,35 @@ +-# define HAVE_QUOTA /* The system inludes quota */ ++# define HAVE_QUOTA + #endif + + /* +@@ -265,52 +265,52 @@ + * from the BSD compile environment. + */ + #if defined(HAVE_SHMAT) && defined(HAVE_SYS_SHM_H) && defined(HAVE_SYS_IPC_H) +-# define HAVE_USGSHM /* USG shared memory is present */ ++# define HAVE_USGSHM + #endif + #if defined(HAVE_SEMGET) && defined(HAVE_SYS_SHM_H) && defined(HAVE_SYS_IPC_H) +-# define HAVE_USGSEM /* USG semaphores are present */ ++# define HAVE_USGSEM + #endif + + #if defined(HAVE_GETPGRP) && !defined(HAVE_BSD_GETPGRP) +-#define HAVE_POSIX_GETPGRP 1 /* getpgrp() in libc is POSIX compliant */ ++#define HAVE_POSIX_GETPGRP 1 + #endif + #if defined(HAVE_SETPGRP) && !defined(HAVE_BSD_SETPGRP) +-#define HAVE_POSIX_SETPGRP 1 /* setpgrp() in libc is POSIX compliant */ ++#define HAVE_POSIX_SETPGRP 1 + #endif + /* * Structures */ @@ -465,6 +499,7 @@ -#undef HAVE_ST_BLKSIZE /* if struct stat contains st_blksize */ -#undef HAVE_ST_BLOCKS /* if struct stat contains st_blocks */ -#undef HAVE_ST_RDEV /* if struct stat contains st_rdev */ +-#undef HAVE_ST_FLAGS /* if struct stat contains st_flags */ -#undef STAT_MACROS_BROKEN /* if the macros S_ISDIR, S_ISREG .. don't work */ +#undef HAVE_MTGET_TYPE +#undef HAVE_MTGET_DSREG @@ -482,6 +517,7 @@ +#undef HAVE_ST_BLKSIZE +#undef HAVE_ST_BLOCKS +#undef HAVE_ST_RDEV ++#undef HAVE_ST_FLAGS +#undef STAT_MACROS_BROKEN -#undef DEV_MINOR_BITS /* # if bits needed to hold minor device number */ @@ -504,7 +540,7 @@ /* * Types/Keywords -@@ -273,20 +273,20 @@ +@@ -328,24 +328,24 @@ #undef SIZEOF_UNSIGNED_LONG_LONG #undef SIZEOF_UNSIGNED_CHAR_P @@ -515,7 +551,9 @@ -#undef const /* Define to empty if const doesn't work */ -#undef uid_t /* To be used if uid_t is not present */ +-#undef gid_t /* To be used if gid_t is not present */ -#undef size_t /* To be used if size_t is not present */ +-#undef ssize_t /* To be used if ssize_t is not present */ -#undef pid_t /* To be used if pid_t is not present */ -#undef off_t /* To be used if off_t is not present */ -#undef mode_t /* To be used if mode_t is not present */ @@ -523,10 +561,14 @@ -#undef caddr_t /* To be used if caddr_t is not present */ -#undef daddr_t /* To be used if daddr_t is not present */ -#undef dev_t /* To be used if dev_t is not present */ +-#undef ino_t /* To be used if ino_t is not present */ +-#undef nlink_t /* To be used if nlink_t is not present */ -#undef socklen_t /* To be used if socklen_t is not present */ +#undef const +#undef uid_t ++#undef gid_t +#undef size_t ++#undef ssize_t +#undef pid_t +#undef off_t +#undef mode_t @@ -534,11 +576,13 @@ +#undef caddr_t +#undef daddr_t +#undef dev_t ++#undef ino_t ++#undef nlink_t +#undef socklen_t /* * These types are present on all UNIX systems but should be avoided -@@ -295,14 +295,14 @@ +@@ -354,14 +354,14 @@ * * Better include and use Uchar, Uint & Ulong */ @@ -558,7 +602,7 @@ #undef GETGROUPS_T #define GID_T GETGROUPS_T -@@ -318,18 +318,18 @@ +@@ -377,74 +377,74 @@ #undef HAVE_LARGEFILES @@ -583,7 +627,97 @@ /* defined, we have fseeko() */ #endif /* HAVE_LARGEFILES */ -@@ -338,13 +338,13 @@ + #endif /* USE_LARGEFILES */ + +-#ifdef USE_ACL /* Enable/disable ACL support */ ++#ifdef USE_ACL + /* + * POSIX ACL support + */ +-#undef HAVE_ACL_GET_FILE /* acl_get_file() function */ +-#undef HAVE_ACL_SET_FILE /* acl_set_file() function */ +-#undef HAVE_ACL_FROM_TEXT /* acl_from_text() function */ +-#undef HAVE_ACL_TO_TEXT /* acl_to_text() function */ +-#undef HAVE_ACL_FREE /* acl_free() function */ +-#undef HAVE_ACL_DELETE_DEF_FILE /* acl_delete_def_file() function */ ++#undef HAVE_ACL_GET_FILE ++#undef HAVE_ACL_SET_FILE ++#undef HAVE_ACL_FROM_TEXT ++#undef HAVE_ACL_TO_TEXT ++#undef HAVE_ACL_FREE ++#undef HAVE_ACL_DELETE_DEF_FILE + + #if defined(HAVE_ACL_GET_FILE) && defined(HAVE_ACL_SET_FILE) && \ + defined(HAVE_ACL_FROM_TEXT) && defined(HAVE_ACL_TO_TEXT) && \ + defined(HAVE_ACL_FREE) +-# define HAVE_POSIX_ACL 1 /* POSIX ACL's present */ ++# define HAVE_POSIX_ACL 1 + #endif + + /* + * Sun ACL support. + * Note: unfortunately, HP-UX has an (undocumented) acl() function in libc. + */ +-#undef HAVE_ACL /* acl() function */ +-#undef HAVE_FACL /* facl() function */ +-#undef HAVE_ACLFROMTEXT /* aclfromtext() function */ +-#undef HAVE_ACLTOTEXT /* acltotext() function */ ++#undef HAVE_ACL ++#undef HAVE_FACL ++#undef HAVE_ACLFROMTEXT ++#undef HAVE_ACLTOTEXT + + #if defined(HAVE_ACL) && defined(HAVE_FACL) && \ + defined(HAVE_ACLFROMTEXT) && defined(HAVE_ACLTOTEXT) +-# define HAVE_SUN_ACL 1 /* Sun ACL's present */ ++# define HAVE_SUN_ACL 1 + #endif + + /* + * HP-UX ACL support. + * Note: unfortunately, HP-UX has an (undocumented) acl() function in libc. + */ +-#undef HAVE_GETACL /* getacl() function */ +-#undef HAVE_FGETACL /* fgetacl() function */ +-#undef HAVE_SETACL /* setacl() function */ +-#undef HAVE_FSETACL /* fsetacl() function */ +-#undef HAVE_STRTOACL /* strtoacl() function */ +-#undef HAVE_ACLTOSTR /* acltostr() function */ +-#undef HAVE_CPACL /* cpacl() function */ +-#undef HAVE_FCPACL /* fcpacl() function */ +-#undef HAVE_CHOWNACL /* chownacl() function */ +-#undef HAVE_SETACLENTRY /* setaclentry() function */ +-#undef HAVE_FSETACLENTRY /* fsetaclentry() function */ ++#undef HAVE_GETACL ++#undef HAVE_FGETACL ++#undef HAVE_SETACL ++#undef HAVE_FSETACL ++#undef HAVE_STRTOACL ++#undef HAVE_ACLTOSTR ++#undef HAVE_CPACL ++#undef HAVE_FCPACL ++#undef HAVE_CHOWNACL ++#undef HAVE_SETACLENTRY ++#undef HAVE_FSETACLENTRY + + #if defined(HAVE_GETACL) && defined(HAVE_FGETACL) && \ + defined(HAVE_SETACL) && defined(HAVE_FSETACL) && \ + defined(HAVE_STRTOACL) && defined(HAVE_ACLTOTEXT) +-# define HAVE_HP_ACL 1 /* HP-UX ACL's present */ ++# define HAVE_HP_ACL 1 + #endif + + /* +@@ -453,7 +453,7 @@ + * included in HAVE_ANY_ACL. + */ + #if defined(HAVE_POSIX_ACL) || defined(HAVE_SUN_ACL) +-# define HAVE_ANY_ACL 1 /* Any ACL implementation present */ ++# define HAVE_ANY_ACL 1 + #endif + + #endif /* USE_ACL */ +@@ -461,16 +461,16 @@ /* * Misc CC / LD related stuff */ @@ -603,3 +737,594 @@ +#undef HOST_CPU +#undef HOST_VENDOR +#undef HOST_OS + + + /* +--- cdrtools-1.11/conf/aclocal.m4.orig Sat Mar 23 21:39:26 2002 ++++ cdrtools-1.11/conf/aclocal.m4 Wed Apr 24 22:39:46 2002 +@@ -17,7 +17,7 @@ + + dnl Checks if structure 'stat' have field 'st_spare1'. + dnl Defines HAVE_ST_SPARE1 on success. +-AC_DEFUN(AC_STRUCT_ST_SPARE1, ++AC_DEFUN([AC_STRUCT_ST_SPARE1], + [AC_CACHE_CHECK([if struct stat contains st_spare1], ac_cv_struct_st_spare1, + [AC_TRY_COMPILE([#include + #include ], +@@ -30,7 +30,7 @@ + + dnl Checks if structure 'stat' have field 'st_atim.tv_nsec'. + dnl Defines HAVE_ST_NSEC on success. +-AC_DEFUN(AC_STRUCT_ST_NSEC, ++AC_DEFUN([AC_STRUCT_ST_NSEC], + [AC_CACHE_CHECK([if struct stat contains st_atim.tv_nsec], ac_cv_struct_st_nsec, + [AC_TRY_COMPILE([#include + #include ], +@@ -43,7 +43,7 @@ + + dnl Checks if structure 'stat' have field 'st_flags'. + dnl Defines HAVE_ST_FLAGS on success. +-AC_DEFUN(AC_STRUCT_ST_FLAGS, ++AC_DEFUN([AC_STRUCT_ST_FLAGS], + [AC_CACHE_CHECK([if struct stat contains st_flags], ac_cv_struct_st_flags, + [AC_TRY_COMPILE([#include + #include ], +@@ -56,7 +56,7 @@ + + dnl Checks if structure 'mtget' have field 'mt_type'. + dnl Defines HAVE_MTGET_TYPE on success. +-AC_DEFUN(AC_STRUCT_MTGET_TYPE, ++AC_DEFUN([AC_STRUCT_MTGET_TYPE], + [AC_CACHE_CHECK([if struct mtget contains mt_type], ac_cv_struct_mtget_type, + [AC_TRY_COMPILE([#include + #include ], +@@ -69,7 +69,7 @@ + + dnl Checks if structure 'mtget' have field 'mt_dsreg'. + dnl Defines HAVE_MTGET_DSREG on success. +-AC_DEFUN(AC_STRUCT_MTGET_DSREG, ++AC_DEFUN([AC_STRUCT_MTGET_DSREG], + [AC_CACHE_CHECK([if struct mtget contains mt_dsreg], ac_cv_struct_mtget_dsreg, + [AC_TRY_COMPILE([#include + #include ], +@@ -82,7 +82,7 @@ + + dnl Checks if structure 'mtget' have field 'mt_erreg'. + dnl Defines HAVE_MTGET_ERREG on success. +-AC_DEFUN(AC_STRUCT_MTGET_ERREG, ++AC_DEFUN([AC_STRUCT_MTGET_ERREG], + [AC_CACHE_CHECK([if struct mtget contains mt_erreg], ac_cv_struct_mtget_erreg, + [AC_TRY_COMPILE([#include + #include ], +@@ -95,7 +95,7 @@ + + dnl Checks if structure 'mtget' have field 'mt_resid'. + dnl Defines HAVE_MTGET_RESID on success. +-AC_DEFUN(AC_STRUCT_MTGET_RESID, ++AC_DEFUN([AC_STRUCT_MTGET_RESID], + [AC_CACHE_CHECK([if struct mtget contains mt_resid], ac_cv_struct_mtget_resid, + [AC_TRY_COMPILE([#include + #include ], +@@ -108,7 +108,7 @@ + + dnl Checks if structure 'mtget' have field 'mt_fileno'. + dnl Defines HAVE_MTGET_FILENO on success. +-AC_DEFUN(AC_STRUCT_MTGET_FILENO, ++AC_DEFUN([AC_STRUCT_MTGET_FILENO], + [AC_CACHE_CHECK([if struct mtget contains mt_fileno], + ac_cv_struct_mtget_fileno, + [AC_TRY_COMPILE([#include +@@ -122,7 +122,7 @@ + + dnl Checks if structure 'mtget' have field 'mt_blkno'. + dnl Defines HAVE_MTGET_BLKNO on success. +-AC_DEFUN(AC_STRUCT_MTGET_BLKNO, ++AC_DEFUN([AC_STRUCT_MTGET_BLKNO], + [AC_CACHE_CHECK([if struct mtget contains mt_blkno], ac_cv_struct_mtget_blkno, + [AC_TRY_COMPILE([#include + #include ], +@@ -135,7 +135,7 @@ + + dnl Checks if structure 'mtget' have field 'mt_flags'. + dnl Defines HAVE_MTGET_FLAGS on success. +-AC_DEFUN(AC_STRUCT_MTGET_FLAGS, ++AC_DEFUN([AC_STRUCT_MTGET_FLAGS], + [AC_CACHE_CHECK([if struct mtget contains mt_flags], ac_cv_struct_mtget_flags, + [AC_TRY_COMPILE([#include + #include ], +@@ -148,7 +148,7 @@ + + dnl Checks if structure 'mtget' have field 'mt_bf'. + dnl Defines HAVE_MTGET_BF on success. +-AC_DEFUN(AC_STRUCT_MTGET_BF, ++AC_DEFUN([AC_STRUCT_MTGET_BF], + [AC_CACHE_CHECK([if struct mtget contains mt_bf], ac_cv_struct_mtget_bf, + [AC_TRY_COMPILE([#include + #include ], +@@ -161,7 +161,7 @@ + + dnl Checks for illegal declaration of 'union semun' in sys/sem.h. + dnl Defines HAVE_UNION_SEMUN on success. +-AC_DEFUN(AC_STRUCT_UNION_SEMUN, ++AC_DEFUN([AC_STRUCT_UNION_SEMUN], + [AC_CACHE_CHECK([if an illegal declaration for union semun in sys/sem.h exists], ac_cv_struct_union_semun, + [AC_TRY_COMPILE([#include + #include +@@ -174,7 +174,7 @@ + + dnl Checks if 'union wait' is declared in 'wait.h' or 'sys/wait.h'. + dnl Defines HAVE_UNION_WAIT on success. +-AC_DEFUN(AC_STRUCT_UNION_WAIT, ++AC_DEFUN([AC_STRUCT_UNION_WAIT], + [AC_CACHE_CHECK([if union wait is declared in wait.h or sys/wait.h], ac_cv_struct_union_wait, + [AC_TRY_COMPILE([#include + #if defined(HAVE_WAIT_H) +@@ -190,7 +190,7 @@ + + dnl Checks if 'struct rusage' is declared in sys/resource.h. + dnl Defines HAVE_STRUCT_RUSAGE on success. +-AC_DEFUN(AC_STRUCT_RUSAGE, ++AC_DEFUN([AC_STRUCT_RUSAGE], + [AC_CACHE_CHECK([if struct rusage is declared in sys/resource.h], ac_cv_struct_rusage, + [AC_TRY_COMPILE([#include + #include ], [struct rusage r;], +@@ -203,7 +203,7 @@ + dnl Checks wether major(), minor() and makedev() are defined in + dnl 'sys/mkdev.h' or in 'sys/sysmacros.h. Defines MAJOR_IN_MKDEV or + dnl MAJOR_IN_SYSMACROS or nothing. +-AC_DEFUN(AC_HEADER_MAKEDEV, ++AC_DEFUN([AC_HEADER_MAKEDEV], + [AC_CACHE_CHECK([for header file containing major(), minor() and makedev()], + ac_cv_header_makedev, + [ac_cv_header_makedev=none +@@ -226,7 +226,7 @@ + + dnl Checks for USG derived STDIO that uses _filbuf() + dnl Defines HAVE__FILBUF on success. +-AC_DEFUN(AC_HEADER__FILBUF, ++AC_DEFUN([AC_HEADER__FILBUF], + [AC_CACHE_CHECK([for _filbuf()], ac_cv_func__filbuf, + [AC_TRY_LINK([#include ], + [FILE *f; +@@ -251,7 +251,7 @@ + + dnl Checks for USG derived STDIO that uses __filbuf() + dnl Defines HAVE___FILBUF on success. +-AC_DEFUN(AC_HEADER___FILBUF, ++AC_DEFUN([AC_HEADER___FILBUF], + [AC_CACHE_CHECK([for __filbuf()], ac_cv_func___filbuf, + [AC_TRY_LINK([#include ], + [FILE *f; +@@ -276,7 +276,7 @@ + + dnl Checks for USG derived STDIO + dnl Defines HAVE_USG_STDIO on success. +-AC_DEFUN(AC_HEADER_USG_STDIO, ++AC_DEFUN([AC_HEADER_USG_STDIO], + [AC_REQUIRE([AC_HEADER__FILBUF])AC_REQUIRE([AC_HEADER___FILBUF])dnl + AC_CACHE_CHECK([for USG derived STDIO], ac_cv_header_usg_stdio, + [AC_TRY_LINK([#include ], +@@ -311,7 +311,7 @@ + + dnl Checks for errno definition in + dnl Defines HAVE_ERRNO_DEF on success. +-AC_DEFUN(AC_HEADER_ERRNO_DEF, ++AC_DEFUN([AC_HEADER_ERRNO_DEF], + [AC_CACHE_CHECK([for errno definition in errno.h], ac_cv_header_errno_def, + [AC_TRY_COMPILE([#include ], + [errno = 0;], +@@ -323,7 +323,7 @@ + + dnl Checks for UNIX-98 compliant + dnl Defines HAVE_INTTYPES_H on success. +-AC_DEFUN(AC_HEADER_INTTYPES, ++AC_DEFUN([AC_HEADER_INTTYPES], + [AC_CACHE_CHECK([for UNIX-98 compliant inttypes.h], ac_cv_header_inttypes, + [AC_TRY_COMPILE([#include ], + [int8_t c; uint8_t uc; int16_t s; uint16_t us; int32_t i; uint32_t ui; +@@ -337,7 +337,7 @@ + + dnl Checks for type time_t + dnl Defines time_t to long on failure. +-AC_DEFUN(AC_TYPE_TIME_T, ++AC_DEFUN([AC_TYPE_TIME_T], + [AC_REQUIRE([AC_HEADER_TIME])dnl + AC_CACHE_CHECK([for time_t], ac_cv_type_time_t, + [AC_TRY_COMPILE([ +@@ -360,7 +360,7 @@ + + dnl Checks for type socklen_t + dnl Defines socklen_t to int on failure. +-AC_DEFUN(AC_TYPE_SOCKLEN_T, ++AC_DEFUN([AC_TYPE_SOCKLEN_T], + [AC_REQUIRE([AC_HEADER_STDC])dnl + AC_MSG_CHECKING(for socklen_t) + AC_CACHE_VAL(ac_cv_type_socklen_t, +@@ -380,7 +380,7 @@ + + dnl Checks for type long long + dnl Defines HAVE_LONGLONG on success. +-AC_DEFUN(AC_TYPE_LONGLONG, ++AC_DEFUN([AC_TYPE_LONGLONG], + [AC_CACHE_CHECK([for type long long], ac_cv_type_longlong, + [AC_TRY_COMPILE([], [long long i;], + [ac_cv_type_longlong=yes], +@@ -391,7 +391,7 @@ + + dnl Checks if C-compiler orders bitfields htol + dnl Defines BITFIELDS_HTOL on success. +-AC_DEFUN(AC_C_BITFIELDS, ++AC_DEFUN([AC_C_BITFIELDS], + [AC_CACHE_CHECK([whether bitorder in bitfields is htol], ac_cv_c_bitfields_htol, + [AC_TRY_RUN([ + struct { +@@ -414,7 +414,7 @@ + + dnl Checks if C-compiler understands prototypes + dnl Defines PROTOTYPES on success. +-AC_DEFUN(AC_TYPE_PROTOTYPES, ++AC_DEFUN([AC_TYPE_PROTOTYPES], + [AC_CACHE_CHECK([for prototypes], ac_cv_type_prototypes, + [AC_TRY_RUN([ + doit(int i, ...) +@@ -431,7 +431,7 @@ + + dnl Checks for type size_t + dnl Defines HAVE_SIZE_T_ on success. +-AC_DEFUN(AC_TYPE_SIZE_T_, ++AC_DEFUN([AC_TYPE_SIZE_T_], + [AC_CACHE_CHECK([for type size_t], ac_cv_type_size_t_, + [AC_TRY_COMPILE([#include ], [size_t s;], + [ac_cv_type_size_t_=yes], +@@ -444,7 +444,7 @@ + + dnl Checks if type char is unsigned + dnl Defines CHAR_IS_UNSIGNED on success. +-AC_DEFUN(AC_TYPE_CHAR, ++AC_DEFUN([AC_TYPE_CHAR], + [AC_CACHE_CHECK([if char is unsigned], ac_cv_type_char_unsigned, + [AC_TRY_RUN([ + int +@@ -463,7 +463,7 @@ + + dnl Checks if function/macro va_copy() is available + dnl Defines HAVE_VA_COPY on success. +-AC_DEFUN(AC_FUNC_VA_COPY, ++AC_DEFUN([AC_FUNC_VA_COPY], + [AC_CACHE_CHECK([for va_copy], ac_cv_func_va_copy, + [AC_TRY_LINK([ + #ifdef HAVE_STDARG_H +@@ -483,7 +483,7 @@ + + dnl Checks if function/macro __va_copy() is available + dnl Defines HAVE__VA_COPY on success. +-AC_DEFUN(AC_FUNC__VA_COPY, ++AC_DEFUN([AC_FUNC__VA_COPY], + [AC_CACHE_CHECK([for __va_copy], ac_cv_func__va_copy, + [AC_TRY_LINK([ + #ifdef HAVE_STDARG_H +@@ -504,7 +504,7 @@ + + dnl Checks if va_list is an array + dnl Defines VA_LIST_IS_ARRAY on success. +-AC_DEFUN(AC_TYPE_VA_LIST, ++AC_DEFUN([AC_TYPE_VA_LIST], + [AC_CACHE_CHECK([if va_list is an array], ac_cv_type_va_list_array, + [AC_TRY_LINK([ + #ifdef HAVE_STDARG_H +@@ -525,7 +525,7 @@ + + dnl Checks if quotactl is present as ioctl + dnl Defines HAVE_QUOTAIOCTL on success. +-AC_DEFUN(AC_FUNC_QUOTAIOCTL, ++AC_DEFUN([AC_FUNC_QUOTAIOCTL], + [AC_CACHE_CHECK([if quotactl is an ioctl], ac_cv_func_quotaioctl, + [AC_TRY_LINK([#include + #include ], +@@ -538,7 +538,7 @@ + + dnl Checks if function __dtoa() is available + dnl Defines HAVE_DTOA on success. +-AC_DEFUN(AC_FUNC_DTOA, ++AC_DEFUN([AC_FUNC_DTOA], + [AC_CACHE_CHECK([for __dtoa], ac_cv_func_dtoa, + [AC_TRY_LINK([extern char *__dtoa();], + [int decpt; int sign; char *ep; char *bp; +@@ -551,7 +551,7 @@ + + dnl Checks if reentrant __dtoa() exists (needs a result prt) + dnl Defines HAVE_DTOA_R on success. +-AC_DEFUN(AC_FUNC_DTOA_R, ++AC_DEFUN([AC_FUNC_DTOA_R], + [AC_REQUIRE([AC_FUNC_DTOA])dnl + AC_CACHE_CHECK([for __dtoa that needs result ptr], ac_cv_func_dtoa_r, + [AC_TRY_RUN([ +@@ -580,7 +580,7 @@ + + dnl Checks if working ecvt() exists + dnl Defines HAVE_ECVT on success. +-AC_DEFUN(AC_FUNC_ECVT, ++AC_DEFUN([AC_FUNC_ECVT], + [AC_CACHE_CHECK([for working ecvt() ], ac_cv_func_ecvt, + [AC_TRY_RUN([ + extern char *ecvt(); +@@ -607,7 +607,7 @@ + + dnl Checks if working fcvt() exists + dnl Defines HAVE_FCVT on success. +-AC_DEFUN(AC_FUNC_FCVT, ++AC_DEFUN([AC_FUNC_FCVT], + [AC_CACHE_CHECK([for working fcvt() ], ac_cv_func_fcvt, + [AC_TRY_RUN([ + extern char *fcvt(); +@@ -634,7 +634,7 @@ + + dnl Checks if working gcvt() exists + dnl Defines HAVE_GCVT on success. +-AC_DEFUN(AC_FUNC_GCVT, ++AC_DEFUN([AC_FUNC_GCVT], + [AC_CACHE_CHECK([for working gcvt() ], ac_cv_func_gcvt, + [AC_TRY_RUN([ + extern char *gcvt(); +@@ -661,7 +661,7 @@ + + dnl Checks if function uname() is available + dnl Defines HAVE_UNAME on success. +-AC_DEFUN(AC_FUNC_UNAME, ++AC_DEFUN([AC_FUNC_UNAME], + [AC_CACHE_CHECK([for uname], ac_cv_func_uname, + [AC_TRY_LINK([#include ], + [struct utsname un; +@@ -675,7 +675,7 @@ + dnl Checks if function mlockall() is available + dnl beware HP-UX 10.x it contains a bad mlockall() in libc + dnl Defines HAVE_MLOCKALL on success. +-AC_DEFUN(AC_FUNC_MLOCKALL, ++AC_DEFUN([AC_FUNC_MLOCKALL], + [AC_CACHE_CHECK([for mlockall], ac_cv_func_mlockall, + [AC_TRY_RUN([ + #include +@@ -699,7 +699,7 @@ + AC_DEFINE(HAVE_MLOCKALL) + fi]) + +-AC_DEFUN(jsAC_FUNC_MMAP, ++AC_DEFUN([jsAC_FUNC_MMAP], + [AC_REQUIRE([AC_MMAP_SIZEP])dnl + AC_CHECK_HEADERS(unistd.h) + AC_CHECK_FUNCS(getpagesize) +@@ -856,7 +856,7 @@ + fi + ]) + +-AC_DEFUN(AC_MMAP_SIZEP, ++AC_DEFUN([AC_MMAP_SIZEP], + [AC_CHECK_HEADERS(unistd.h) + AC_CHECK_FUNCS(getpagesize) + AC_CACHE_CHECK(for mmap that needs ptr to size, ac_cv_func_mmap_sizep, +@@ -1006,7 +1006,7 @@ + + dnl Checks if mmap() works to get shared memory + dnl Defines HAVE_SMMAP on success. +-AC_DEFUN(AC_FUNC_SMMAP, ++AC_DEFUN([AC_FUNC_SMMAP], + [AC_CACHE_CHECK([if mmap works to get shared memory], ac_cv_func_smmap, + [AC_TRY_RUN([ + #include +@@ -1086,7 +1089,7 @@ + + dnl Checks if sys_siglist[] exists + dnl Defines HAVE_SYS_SIGLIST on success. +-AC_DEFUN(AC_FUNC_SYS_SIGLIST, ++AC_DEFUN([AC_FUNC_SYS_SIGLIST], + [AC_CACHE_CHECK([for sys_siglist], ac_cv_func_sys_siglist, + [AC_TRY_RUN([ + int +@@ -1102,7 +1105,7 @@ + fi]) + + dnl Checks for maximum number of bits in minor device number +-AC_DEFUN(AC_CHECK_MINOR_BITS, ++AC_DEFUN([AC_CHECK_MINOR_BITS], + [AC_REQUIRE([AC_HEADER_MAKEDEV])dnl + changequote(<<, >>)dnl + define(<>, DEV_MINOR_BITS)dnl +@@ -1169,7 +1172,7 @@ + + dnl Checks for maximum number of bits in minor device numbers are non contiguous + dnl Defines DEV_MINOR_NONCONTIG on success. +-AC_DEFUN(AC_CHECK_MINOR_NONCONTIG, ++AC_DEFUN([AC_CHECK_MINOR_NONCONTIG], + [AC_REQUIRE([AC_HEADER_MAKEDEV])dnl + AC_CACHE_CHECK([whether bits in minor device numbers are non contiguous], ac_cv_dev_minor_noncontig, + [AC_TRY_RUN([ +@@ -1225,7 +1228,7 @@ + + dnl Checks if we may not define our own malloc() + dnl Defines NO_USER_MALLOC if we cannot. +-AC_DEFUN(AC_USER_MALLOC, ++AC_DEFUN([AC_USER_MALLOC], + [AC_CACHE_CHECK([if we may not define our own malloc()], ac_cv_no_user_malloc, + [AC_TRY_LINK([ + char * malloc(x) +@@ -1242,7 +1245,7 @@ + + dnl Checks if BSD-4.2 compliant getpgrp() exists + dnl Defines HAVE_BSD_GETPGRP on success. +-AC_DEFUN(AC_FUNC_BSD_GETPGRP, ++AC_DEFUN([AC_FUNC_BSD_GETPGRP], + [AC_CACHE_CHECK([for BSD compliant getpgrp], ac_cv_func_bsd_getpgrp, + [AC_TRY_RUN([ + int +@@ -1263,7 +1266,7 @@ + + dnl Checks if BSD-4.2 compliant setpgrp() exists + dnl Defines HAVE_BSD_SETPGRP on success. +-AC_DEFUN(AC_FUNC_BSD_SETPGRP, ++AC_DEFUN([AC_FUNC_BSD_SETPGRP], + [AC_REQUIRE([AC_HEADER_ERRNO_DEF])dnl + AC_CACHE_CHECK([for BSD compliant setpgrp], ac_cv_func_bsd_setpgrp, + [AC_TRY_RUN([ +@@ -1288,7 +1291,7 @@ + + dnl Checks if select() needs more than sys/time.h & sys/types.h + dnl Defines SELECT_NONSTD_HDR on success. +-AC_DEFUN(AC_HEADER_SELECT_NONSTD, ++AC_DEFUN([AC_HEADER_SELECT_NONSTD], + [AC_CACHE_CHECK([if select needs nonstd include files], ac_cv_header_slect_nonstd_hdr, + [AC_TRY_COMPILE([#include + #include ], +@@ -1301,7 +1304,7 @@ + + dnl Checks if select() needs sys/select.h + dnl Defines NEED_SYS_SELECT_H on success. +-AC_DEFUN(AC_HEADER_SYS_SELECT, ++AC_DEFUN([AC_HEADER_SYS_SELECT], + [AC_REQUIRE([AC_HEADER_SELECT_NONSTD])dnl + AC_CACHE_CHECK([if sys/select.h is needed for select], ac_cv_header_need_sys_select_h, + [AC_TRY_COMPILE([#include +@@ -1319,7 +1322,7 @@ + + dnl Checks if select() needs sys/socket.h + dnl Defines NEED_SYS_SOCKET_H on success. +-AC_DEFUN(AC_HEADER_SELECT2, ++AC_DEFUN([AC_HEADER_SELECT2], + [AC_REQUIRE([AC_HEADER_SELECT_NONSTD])dnl + AC_CACHE_CHECK([if sys/socket.h is needed for select], ac_cv_header_need_sys_socket_h, + [AC_TRY_COMPILE([#include +@@ -1337,7 +1340,7 @@ + + dnl Checks if file locking via fcntl() is available + dnl Defines HAVE_FCNTL_LOCKF on success. +-AC_DEFUN(AC_FUNC_FCNTL_LOCKF, ++AC_DEFUN([AC_FUNC_FCNTL_LOCKF], + [AC_CACHE_CHECK([for file locking via fcntl], ac_cv_func_fcntl_lock, + [AC_TRY_LINK([ + #include +@@ -1366,107 +1369,9 @@ + + #serial 18 + +-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 +- +-dnl Written by Paul Eggert . +- +-dnl Internal subroutine of AC_SYS_LARGEFILE. +-dnl AC_SYS_LARGEFILE_TEST_INCLUDES +-AC_DEFUN(AC_SYS_LARGEFILE_TEST_INCLUDES, +- [[#include +- /* Check that off_t can represent 2**63 - 1 correctly. +- We can't simply "#define LARGE_OFF_T 9223372036854775807", +- since some C++ compilers masquerading as C compilers +- incorrectly reject 9223372036854775807. */ +-# define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) +- int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 +- && LARGE_OFF_T % 2147483647 == 1) +- ? 1 : -1]; +- ]]) +- +-dnl Internal subroutine of AC_SYS_LARGEFILE. +-dnl AC_SYS_LARGEFILE_MACRO_VALUE(C-MACRO, VALUE, CACHE-VAR, COMMENT, INCLUDES, FUNCTION-BODY) +-AC_DEFUN(AC_SYS_LARGEFILE_MACRO_VALUE, +- [AC_CACHE_CHECK([for $1 value needed for large files], $3, +- [$3=no +- AC_TRY_COMPILE([$5], +- [$6], +- , +- [AC_TRY_COMPILE([#define $1 $2] +-[$5] +- , +- [$6], +- [$3=$2])])]) +- if test "[$]$3" != no; then +- AC_DEFINE_UNQUOTED([$1], [$]$3, [$4]) +- fi]) +- +-AC_DEFUN(AC_SYS_LARGEFILE, +- [AC_ARG_ENABLE(largefile, +- [ --disable-largefile omit support for large files]) +- if test "$enable_largefile" != no; then +- +- AC_CACHE_CHECK([for special C compiler options needed for large files], +- ac_cv_sys_largefile_CC, +- [ac_cv_sys_largefile_CC=no +- largefile_cc_opt="" +- if test "$GCC" != yes; then +- # IRIX 6.2 and later do not support large files by default, +- # so use the C compiler's -n32 option if that helps. +- AC_TRY_COMPILE(AC_SYS_LARGEFILE_TEST_INCLUDES, , , +- [ac_save_CC="${CC-cc}" +- CC="$CC -n32" +- AC_TRY_COMPILE(AC_SYS_LARGEFILE_TEST_INCLUDES, , +- ac_cv_sys_largefile_CC=' -n32') +- CC="$ac_save_CC"]) +- fi]) +- if test "$ac_cv_sys_largefile_CC" != no; then +- CC="$CC$ac_cv_sys_largefile_CC" +- largefile_cc_opt="$ac_cv_sys_largefile_CC" +- fi +- +- AC_SYS_LARGEFILE_MACRO_VALUE(_FILE_OFFSET_BITS, 64, +- ac_cv_sys_file_offset_bits, +- [Number of bits in a file offset, on hosts where this is settable.], +- AC_SYS_LARGEFILE_TEST_INCLUDES) +- AC_SYS_LARGEFILE_MACRO_VALUE(_LARGE_FILES, 1, +- ac_cv_sys_large_files, +- [Define for large files, on AIX-style hosts.], +- AC_SYS_LARGEFILE_TEST_INCLUDES) +- AC_SYS_LARGEFILE_MACRO_VALUE(_LARGEFILE_SOURCE, 1, +- ac_cv_sys_largefile_source, +- [Define to make fseeko visible on some hosts (e.g. glibc 2.2).], +- [#include ], [return !fseeko;]) +- fi +- ]) +- +- +-AC_DEFUN(AC_FUNC_FSEEKO, +- [AC_SYS_LARGEFILE_MACRO_VALUE(_LARGEFILE_SOURCE, 1, +- ac_cv_sys_largefile_source, +- [Define to make fseeko visible on some hosts (e.g. glibc 2.2).], +- [#include ], [return !fseeko;]) +- # We used to try defining _XOPEN_SOURCE=500 too, to work around a bug +- # in glibc 2.1.3, but that breaks too many other things. +- # If you want fseeko and ftello with glibc, upgrade to a fixed glibc. +- +- AC_CACHE_CHECK([for fseeko], ac_cv_func_fseeko, +- [ac_cv_func_fseeko=no +- AC_TRY_LINK([#include ], +- [return fseeko && fseeko (stdin, 0, 0);], +- [ac_cv_func_fseeko=yes])]) +- if test $ac_cv_func_fseeko != no; then +- AC_DEFINE(HAVE_FSEEKO, 1, +- [Define if fseeko (and presumably ftello) exists and is declared.]) +- fi]) +- +- + dnl XXXXXXXXXXXXXXXXXX End Stolen (but modified) from GNU tar XXXXXXXXXXXXXXXXXXXXXXXXXXXXX + +-AC_DEFUN(AC_HAVE_LARGEFILES, ++AC_DEFUN([AC_HAVE_LARGEFILES], + [AC_CACHE_CHECK([if system supports Large Files at all], ac_cv_largefiles, + [AC_TRY_COMPILE([#include + #include ], +@@ -1492,7 +1397,7 @@ + dnl Checks for whether fseeko() is available in non large file mode + dnl and whether there is a prototype for fseeko() + dnl Defines HAVE_FSEEKO on success. +-AC_DEFUN(AC_SMALL_FSEEKO, ++AC_DEFUN([AC_SMALL_FSEEKO], + [AC_CACHE_CHECK([for fseeko()], ac_cv_func_fseeko, + [AC_TRY_LINK([#include ], + [return !fseeko;], +@@ -1505,7 +1410,7 @@ + dnl Checks for whether ftello() is available in non large file mode + dnl and whether there is a prototype for ftello() + dnl Defines HAVE_FTELLO on success. +-AC_DEFUN(AC_SMALL_FTELLO, ++AC_DEFUN([AC_SMALL_FTELLO], + [AC_CACHE_CHECK([for ftello()], ac_cv_func_ftello, + [AC_TRY_LINK([#include ], + [return !ftello;],