-diff -urN cdrtools-1.11.org/cdda2wav/aclocal.m4 cdrtools-1.11/cdda2wav/aclocal.m4
---- cdrtools-1.11.org/cdda2wav/aclocal.m4 Fri May 17 13:33:04 2002
-+++ cdrtools-1.11/cdda2wav/aclocal.m4 Fri May 17 13:33:29 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 <sys/types.h>
- #include <sys/stat.h>],
-@@ -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 <sys/types.h>
- #include <sys/stat.h>],
-@@ -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 <sys/types.h>
- #include <sys/stat.h>],
-@@ -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 <sys/types.h>
- #include <sys/mtio.h>],
-@@ -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 <sys/types.h>
- #include <sys/mtio.h>],
-@@ -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 <sys/types.h>
- #include <sys/mtio.h>],
-@@ -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 <sys/types.h>
- #include <sys/mtio.h>],
-@@ -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 <sys/types.h>
-@@ -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 <sys/types.h>
- #include <sys/mtio.h>],
-@@ -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 <sys/types.h>
- #include <sys/mtio.h>],
-@@ -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 <sys/types.h>
- #include <sys/mtio.h>],
-@@ -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 <sys/types.h>
- #include <sys/ipc.h>
-@@ -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 <sys/types.h>
- #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 <sys/time.h>
- #include <sys/resource.h>], [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 <stdio.h>],
- [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 <stdio.h>],
- [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 <stdio.h>],
-@@ -311,7 +311,7 @@
-
- dnl Checks for errno definition in <errno.h>
- 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.h>],
- [errno = 0;],
-@@ -323,7 +323,7 @@
-
- dnl Checks for UNIX-98 compliant <inttypes.h>
- 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 <inttypes.h>],
- [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 <sys/types.h>], [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 <sys/types.h>
- #include <sys/fs/ufs_quota.h>],
-@@ -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 <sys/utsname.h>],
- [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 <sys/types.h>
-@@ -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 <sys/types.h>
-@@ -1086,7 +1086,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 +1102,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(<<AC_MACRO_NAME>>, DEV_MINOR_BITS)dnl
-@@ -1169,7 +1169,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 +1225,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 +1242,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 +1263,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 +1288,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 <sys/types.h>
- #include <sys/time.h>],
-@@ -1301,7 +1301,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 <sys/types.h>
-@@ -1319,7 +1319,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 <sys/types.h>
-@@ -1337,7 +1337,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 <sys/types.h>
-@@ -1366,107 +1366,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 <eggert@twinsun.com>.
--
--dnl Internal subroutine of AC_SYS_LARGEFILE.
--dnl AC_SYS_LARGEFILE_TEST_INCLUDES
--AC_DEFUN(AC_SYS_LARGEFILE_TEST_INCLUDES,
-- [[#include <sys/types.h>
-- /* 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 <stdio.h>], [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 <stdio.h>], [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 <stdio.h>],
-- [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 <stdio.h>
- #include <sys/types.h>],
-@@ -1492,7 +1394,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 <stdio.h>],
- [return !fseeko;],
-@@ -1505,7 +1407,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 <stdio.h>],
- [return !ftello;],
-diff -urN cdrtools-1.11.org/conf/aclocal.m4 cdrtools-1.11/conf/aclocal.m4
---- cdrtools-1.11.org/conf/aclocal.m4 Fri May 17 13:33:04 2002
-+++ cdrtools-1.11/conf/aclocal.m4 Fri May 17 13:33:29 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 <sys/types.h>
- #include <sys/stat.h>],
-@@ -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 <sys/types.h>
- #include <sys/stat.h>],
-@@ -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 <sys/types.h>
- #include <sys/stat.h>],
-@@ -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 <sys/types.h>
- #include <sys/mtio.h>],
-@@ -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 <sys/types.h>
- #include <sys/mtio.h>],
-@@ -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 <sys/types.h>
- #include <sys/mtio.h>],
-@@ -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 <sys/types.h>
- #include <sys/mtio.h>],
-@@ -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 <sys/types.h>
-@@ -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 <sys/types.h>
- #include <sys/mtio.h>],
-@@ -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 <sys/types.h>
- #include <sys/mtio.h>],
-@@ -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 <sys/types.h>
- #include <sys/mtio.h>],
-@@ -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 <sys/types.h>
- #include <sys/ipc.h>
-@@ -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 <sys/types.h>
- #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 <sys/time.h>
- #include <sys/resource.h>], [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 <stdio.h>],
- [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 <stdio.h>],
- [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 <stdio.h>],
-@@ -311,7 +311,7 @@
-
- dnl Checks for errno definition in <errno.h>
- 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.h>],
- [errno = 0;],
-@@ -323,7 +323,7 @@
-
- dnl Checks for UNIX-98 compliant <inttypes.h>
- 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 <inttypes.h>],
- [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 <sys/types.h>], [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 <sys/types.h>
- #include <sys/fs/ufs_quota.h>],
-@@ -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 <sys/utsname.h>],
- [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 <sys/types.h>
-@@ -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 <sys/types.h>
-@@ -1086,7 +1086,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 +1102,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(<<AC_MACRO_NAME>>, DEV_MINOR_BITS)dnl
-@@ -1169,7 +1169,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 +1225,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 +1242,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 +1263,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 +1288,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 <sys/types.h>
- #include <sys/time.h>],
-@@ -1301,7 +1301,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 <sys/types.h>
-@@ -1319,7 +1319,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 <sys/types.h>
-@@ -1337,7 +1337,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 <sys/types.h>
-@@ -1366,107 +1366,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 <eggert@twinsun.com>.
--
--dnl Internal subroutine of AC_SYS_LARGEFILE.
--dnl AC_SYS_LARGEFILE_TEST_INCLUDES
--AC_DEFUN(AC_SYS_LARGEFILE_TEST_INCLUDES,
-- [[#include <sys/types.h>
-- /* 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 <stdio.h>], [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 <stdio.h>], [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 <stdio.h>],
-- [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 <stdio.h>
- #include <sys/types.h>],
-@@ -1492,7 +1394,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 <stdio.h>],
- [return !fseeko;],
-@@ -1505,7 +1407,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 <stdio.h>],
- [return !ftello;],
diff -urN cdrtools-1.11.org/conf/xconfig.h.in cdrtools-1.11/conf/xconfig.h.in
---- cdrtools-1.11.org/conf/xconfig.h.in Fri May 17 13:33:04 2002
-+++ cdrtools-1.11/conf/xconfig.h.in Fri May 17 13:34:24 2002
+--- cdrtools-1.11.org/conf/xconfig.h.in Sun Aug 25 13:59:44 2002
++++ cdrtools-1.11/conf/xconfig.h.in Sun Aug 25 14:05:52 2002
@@ -1,4 +1,4 @@
--/* @(#)xconfig.h.in 1.50 02/04/21 Copyright 1998 J. Schilling */
+-/* @(#)xconfig.h.in 1.55 02/08/06 Copyright 1998 J. Schilling */
+
/*
* Dynamic autoconf C-include code.
*
-@@ -8,96 +8,96 @@
+@@ -8,98 +8,98 @@
/*
* Header Files
*/
-#undef HAVE_STDARG_H /* to use stdarg.h, else use varargs.h NOTE: SaberC on a Sun has prototypes but no stdarg.h */
-#undef HAVE_VARARGS_H /* to use use varargs.h NOTE: The free HP-UX C-compiler has stdarg.h but no PROTOTYPES */
-#undef HAVE_STDLIB_H /* to use general utility defines (malloc(), size_t ...) and general C library prototypes */
+-#undef HAVE_STDDEF_H /* to use offsetof(), ptrdiff_t, wchar>t, size_t */
-#undef HAVE_STRING_H /* to get NULL and ANSI C string function prototypes */
-#undef HAVE_STRINGS_H /* to get BSD string function prototypes */
-#undef STDC_HEADERS /* if ANSI compliant stdlib.h, stdarg.h, string.h, float.h are present */
-#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_TAPE_H /* to use mtio definitions from AIX sys/tape.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 */
-#undef HAVE_SYS_IPC_H /* to use definitions for shmget() ... from sys/ipc.h */
+#undef HAVE_STDARG_H
+#undef HAVE_VARARGS_H
+#undef HAVE_STDLIB_H
++#undef HAVE_STDDEF_H
+#undef HAVE_STRING_H
+#undef HAVE_STRINGS_H
+#undef STDC_HEADERS
+#undef HAVE_SYS_RTPRIOCNTL_H
+#undef HAVE_SYS_SYSCALL_H
+#undef HAVE_SYS_MTIO_H
++#undef HAVE_SYS_TAPE_H
+#undef HAVE_SYS_MMAN_H
+#undef HAVE_SYS_SHM_H
+#undef HAVE_SYS_IPC_H
/*
* Convert to SCHILY name
-@@ -109,13 +109,13 @@
+@@ -111,13 +111,13 @@
#endif
#ifdef HAVE_ELF_H
# endif
# endif
#endif
-@@ -123,123 +123,123 @@
+@@ -125,126 +125,126 @@
/*
* Library Functions
*/
-#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_CHOWN /* chown() is present in libc */
-#undef HAVE_LCHOWN /* lchown() is present in libc */
-#undef HAVE_BRK /* brk() is present in libc */
-#undef HAVE_SBRK /* sbrk() is present in libc */
-#undef HAVE_SEMGET /* semget() is present in libc */
-#undef HAVE_LSTAT /* lstat() is present in libc */
-#undef HAVE_READLINK /* readlink() is present in libc */
+-#undef HAVE_SYMLINK /* symlink() is present in libc */
-#undef HAVE_LINK /* link() is present in libc */
-#undef HAVE_RENAME /* rename() is present in libc */
-#undef HAVE_MKFIFO /* mkfifo() 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_EXECLP /* execlp() 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_STIME
+#undef HAVE_POLL
+#undef HAVE_SELECT
++#undef HAVE_CHOWN
+#undef HAVE_LCHOWN
+#undef HAVE_BRK
+#undef HAVE_SBRK
+#undef HAVE_SEMGET
+#undef HAVE_LSTAT
+#undef HAVE_READLINK
++#undef HAVE_SYMLINK
+#undef HAVE_LINK
+#undef HAVE_RENAME
+#undef HAVE_MKFIFO
+#undef HAVE_FORK
+#undef HAVE_EXECL
+#undef HAVE_EXECLE
++#undef HAVE_EXECLP
+#undef HAVE_EXECV
+#undef HAVE_EXECVE
+#undef HAVE_EXECVP
/*
* Important: This must be a result from a check _before_ the Large File test
-@@ -251,14 +251,14 @@
+@@ -256,14 +256,14 @@
* Instead use the tests AC_SMALL_FSEEKO/AC_SMALL/STELLO and make sure
* they are placed before the large file tests.
*/
#endif
/*
-@@ -267,52 +267,52 @@
+@@ -272,56 +272,56 @@
* from the BSD compile environment.
*/
#if defined(HAVE_SHMAT) && defined(HAVE_SYS_SHM_H) && defined(HAVE_SYS_IPC_H)
* Structures
*/
-#undef HAVE_MTGET_TYPE /* if struct mtget contains mt_type (drive type) */
+-#undef HAVE_MTGET_MODEL /* if struct mtget contains mt_model (drive type) */
-#undef HAVE_MTGET_DSREG /* if struct mtget contains mt_dsreg (drive status) */
+-#undef HAVE_MTGET_DSREG1 /* if struct mtget contains mt_dsreg1 (drive status msb) */
+-#undef HAVE_MTGET_DSREG2 /* if struct mtget contains mt_dsreg2 (drive status lsb) */
+-#undef HAVE_MTGET_GSTAT /* if struct mtget contains mt_gstat (generic status) */
-#undef HAVE_MTGET_ERREG /* if struct mtget contains mt_erreg (error register) */
-#undef HAVE_MTGET_RESID /* if struct mtget contains mt_resid (residual count) */
-#undef HAVE_MTGET_FILENO /* if struct mtget contains mt_fileno (file #) */
-#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_MODEL
+#undef HAVE_MTGET_DSREG
++#undef HAVE_MTGET_DSREG1
++#undef HAVE_MTGET_DSREG2
++#undef HAVE_MTGET_GSTAT
+#undef HAVE_MTGET_ERREG
+#undef HAVE_MTGET_RESID
+#undef HAVE_MTGET_FILENO
/*
* Types/Keywords
-@@ -330,24 +330,24 @@
+@@ -339,24 +339,24 @@
#undef SIZEOF_UNSIGNED_LONG_LONG
#undef SIZEOF_UNSIGNED_CHAR_P
/*
* These types are present on all UNIX systems but should be avoided
-@@ -356,14 +356,14 @@
+@@ -365,14 +365,14 @@
*
* Better include <utypes.h> and use Uchar, Uint & Ulong
*/
#undef GETGROUPS_T
#define GID_T GETGROUPS_T
-@@ -379,74 +379,74 @@
+@@ -388,74 +388,74 @@
#undef HAVE_LARGEFILES
#endif
/*
-@@ -455,25 +455,25 @@
+@@ -464,25 +464,25 @@
* included in HAVE_ANY_ACL.
*/
#if defined(HAVE_POSIX_ACL) || defined(HAVE_SUN_ACL)
projects / packages / cdrtools.git / commitdiff