From f86bd4438348a45ae26eb8365fb8ffacad95cbac Mon Sep 17 00:00:00 2001 From: mbr Date: Tue, 6 Jul 2004 13:16:49 +0000 Subject: Resolve conflicts for am-utils-6.0-10p1 (am-utils-6.0-20040513) import: - Fix typo in amd/nfs_prot_svc.c - Manpage change in scripts/amd.conf.5 - Remove unneeded configure files - Remove unneeded m4/macros --- contrib/amd/MIRRORS | 59 - contrib/amd/amd/amd.8 | 4 +- contrib/amd/amd/amd.c | 4 +- contrib/amd/amd/amq_subr.c | 12 +- contrib/amd/amd/get_args.c | 6 +- contrib/amd/amd/nfs_prot_svc.c | 3 +- contrib/amd/amd/srvr_nfs.c | 4 +- contrib/amd/amq/amq.8 | 5 +- contrib/amd/amq/amq.c | 8 +- contrib/amd/amq/pawd.1 | 4 +- contrib/amd/commit | 233 - contrib/amd/conf/hn_dref/hn_dref_default.h | 2 - contrib/amd/conf/mount/mount_default.c | 46 - contrib/amd/conf/nfs_prot/nfs_prot_freebsd2.h | 4 +- contrib/amd/conf/nfs_prot/nfs_prot_freebsd3.h | 4 +- contrib/amd/conf/trap/trap_default.h | 2 - contrib/amd/config.guess | 1325 ------ contrib/amd/config.guess.long | 47 - contrib/amd/config.sub | 1445 ------ contrib/amd/configure.in | 1107 ----- contrib/amd/cvs-server.txt | 43 - contrib/amd/depcomp | 411 -- contrib/amd/doc/mdate-sh | 97 - contrib/amd/fixmount/fixmount.8 | 4 +- contrib/amd/fixmount/fixmount.c | 4 +- contrib/amd/fsinfo/fsinfo.8 | 4 +- contrib/amd/fsinfo/fsinfo.c | 8 +- contrib/amd/hlfsd/hlfsd.8 | 4 +- contrib/amd/hlfsd/hlfsd.c | 6 +- contrib/amd/hlfsd/hlfsd.h | 4 +- contrib/amd/hlfsd/homedir.c | 4 +- contrib/amd/include/am_defs.h | 45 +- contrib/amd/install-sh | 251 - contrib/amd/libamu/mount_fs.c | 4 +- contrib/amd/ltmain.sh | 4984 -------------------- contrib/amd/m4/macros/c_void_p.m4 | 22 - contrib/amd/m4/macros/cache_check_dynamic.m4 | 26 - contrib/amd/m4/macros/check_amu_fs.m4 | 40 - contrib/amd/m4/macros/check_checkmount_style.m4 | 28 - contrib/amd/m4/macros/check_extern.m4 | 98 - contrib/amd/m4/macros/check_fhandle.m4 | 25 - contrib/amd/m4/macros/check_field.m4 | 110 - contrib/amd/m4/macros/check_fs_headers.m4 | 53 - contrib/amd/m4/macros/check_fs_mntent.m4 | 176 - contrib/amd/m4/macros/check_gnu_getopt.m4 | 42 - contrib/amd/m4/macros/check_hide_mount_type.m4 | 31 - contrib/amd/m4/macros/check_lib2.m4 | 66 - contrib/amd/m4/macros/check_map_funcs.m4 | 47 - contrib/amd/m4/macros/check_mnt2_cdfs_opt.m4 | 92 - contrib/amd/m4/macros/check_mnt2_gen_opt.m4 | 85 - contrib/amd/m4/macros/check_mnt2_nfs_opt.m4 | 59 - contrib/amd/m4/macros/check_mnttab_file_name.m4 | 57 - contrib/amd/m4/macros/check_mnttab_location.m4 | 26 - contrib/amd/m4/macros/check_mnttab_opt.m4 | 52 - contrib/amd/m4/macros/check_mnttab_style.m4 | 33 - contrib/amd/m4/macros/check_mnttab_type.m4 | 143 - contrib/amd/m4/macros/check_mount_style.m4 | 42 - contrib/amd/m4/macros/check_mount_trap.m4 | 47 - contrib/amd/m4/macros/check_mount_type.m4 | 164 - contrib/amd/m4/macros/check_mtype_printf_type.m4 | 22 - contrib/amd/m4/macros/check_mtype_type.m4 | 19 - .../amd/m4/macros/check_network_transport_type.m4 | 27 - contrib/amd/m4/macros/check_nfs_fh_dref.m4 | 47 - contrib/amd/m4/macros/check_nfs_hn_dref.m4 | 21 - contrib/amd/m4/macros/check_nfs_prot_headers.m4 | 94 - contrib/amd/m4/macros/check_nfs_sa_dref.m4 | 33 - .../amd/m4/macros/check_nfs_socket_connection.m4 | 28 - contrib/amd/m4/macros/check_os_libs.m4 | 28 - .../m4/macros/check_restartable_signal_handler.m4 | 22 - contrib/amd/m4/macros/check_umount_style.m4 | 24 - contrib/amd/m4/macros/check_unmount_args.m4 | 21 - contrib/amd/m4/macros/check_unmount_call.m4 | 27 - contrib/amd/m4/macros/expand_cpp_hex.m4 | 40 - contrib/amd/m4/macros/expand_cpp_int.m4 | 42 - contrib/amd/m4/macros/expand_cpp_string.m4 | 40 - contrib/amd/m4/macros/expand_run_string.m4 | 25 - contrib/amd/m4/macros/extern_optarg.m4 | 36 - contrib/amd/m4/macros/extern_sys_errlist.m4 | 30 - .../m4/macros/field_mntent_t_mnt_time_string.m4 | 36 - contrib/amd/m4/macros/func_bad_memcmp.m4 | 11 - contrib/amd/m4/macros/func_bad_yp_all.m4 | 27 - contrib/amd/m4/macros/header_templates.m4 | 917 ---- contrib/amd/m4/macros/host_macros.m4 | 91 - contrib/amd/m4/macros/linux_headers.m4 | 42 - contrib/amd/m4/macros/localconfig.m4 | 13 - contrib/amd/m4/macros/mount_headers.m4 | 12 - contrib/amd/m4/macros/name_package.m4 | 8 - contrib/amd/m4/macros/name_version.m4 | 8 - contrib/amd/m4/macros/opt_amu_cflags.m4 | 24 - contrib/amd/m4/macros/opt_cppflags.m4 | 22 - contrib/amd/m4/macros/opt_debug.m4 | 30 - contrib/amd/m4/macros/opt_ldflags.m4 | 22 - contrib/amd/m4/macros/opt_libs.m4 | 22 - contrib/amd/m4/macros/os_cflags.m4 | 80 - contrib/amd/m4/macros/os_cppflags.m4 | 18 - contrib/amd/m4/macros/os_ldflags.m4 | 22 - contrib/amd/m4/macros/package_bugreport.m4 | 8 - contrib/amd/m4/macros/package_name.m4 | 8 - contrib/amd/m4/macros/package_version.m4 | 8 - contrib/amd/m4/macros/save_state.m4 | 12 - contrib/amd/m4/macros/struct_field_nfs_fh.m4 | 35 - contrib/amd/m4/macros/struct_mntent.m4 | 21 - contrib/amd/m4/macros/struct_mnttab.m4 | 21 - contrib/amd/m4/macros/struct_nfs_args.m4 | 55 - contrib/amd/m4/macros/struct_nfs_fh.m4 | 63 - contrib/amd/m4/macros/struct_nfs_fh3.m4 | 62 - contrib/amd/m4/macros/struct_nfs_gfs_mount.m4 | 22 - contrib/amd/m4/macros/try_compile_anyfs.m4 | 172 - contrib/amd/m4/macros/try_compile_nfs.m4 | 13 - contrib/amd/m4/macros/try_compile_rpc.m4 | 23 - contrib/amd/m4/macros/type_auth_create_gidlist.m4 | 18 - contrib/amd/m4/macros/type_cachefs_args.m4 | 23 - contrib/amd/m4/macros/type_cdfs_args.m4 | 57 - contrib/amd/m4/macros/type_efs_args.m4 | 25 - contrib/amd/m4/macros/type_lofs_args.m4 | 30 - contrib/amd/m4/macros/type_mfs_args.m4 | 23 - contrib/amd/m4/macros/type_pcfs_args.m4 | 50 - contrib/amd/m4/macros/type_recvfrom_fromlen.m4 | 20 - contrib/amd/m4/macros/type_rfs_args.m4 | 23 - contrib/amd/m4/macros/type_svc_in_arg.m4 | 39 - contrib/amd/m4/macros/type_time_t.m4 | 5 - contrib/amd/m4/macros/type_tmpfs_args.m4 | 23 - contrib/amd/m4/macros/type_ufs_args.m4 | 41 - contrib/amd/m4/macros/type_xdrproc_t.m4 | 20 - contrib/amd/m4/macros/type_xfs_args.m4 | 25 - contrib/amd/m4/macros/type_yp_order_outorder.m4 | 23 - contrib/amd/m4/macros/with_addon.m4 | 26 - contrib/amd/missing | 283 -- contrib/amd/mk-amd-map/mk-amd-map.8 | 4 +- contrib/amd/mk-amd-map/mk-amd-map.c | 4 +- contrib/amd/mkinstalldirs | 40 - contrib/amd/scripts/amd.conf.5 | 16 +- contrib/amd/scripts/lostaltmail.conf-sample | 84 - contrib/amd/scripts/lostaltmail.in | 658 --- contrib/amd/wire-test/wire-test.8 | 4 +- contrib/amd/wire-test/wire-test.c | 4 +- 136 files changed, 102 insertions(+), 15781 deletions(-) delete mode 100644 contrib/amd/MIRRORS delete mode 100755 contrib/amd/commit delete mode 100644 contrib/amd/conf/hn_dref/hn_dref_default.h delete mode 100644 contrib/amd/conf/mount/mount_default.c delete mode 100644 contrib/amd/conf/trap/trap_default.h delete mode 100755 contrib/amd/config.guess delete mode 100755 contrib/amd/config.guess.long delete mode 100755 contrib/amd/config.sub delete mode 100644 contrib/amd/configure.in delete mode 100644 contrib/amd/cvs-server.txt delete mode 100755 contrib/amd/depcomp delete mode 100755 contrib/amd/doc/mdate-sh delete mode 100755 contrib/amd/install-sh delete mode 100644 contrib/amd/ltmain.sh delete mode 100644 contrib/amd/m4/macros/c_void_p.m4 delete mode 100644 contrib/amd/m4/macros/cache_check_dynamic.m4 delete mode 100644 contrib/amd/m4/macros/check_amu_fs.m4 delete mode 100644 contrib/amd/m4/macros/check_checkmount_style.m4 delete mode 100644 contrib/amd/m4/macros/check_extern.m4 delete mode 100644 contrib/amd/m4/macros/check_fhandle.m4 delete mode 100644 contrib/amd/m4/macros/check_field.m4 delete mode 100644 contrib/amd/m4/macros/check_fs_headers.m4 delete mode 100644 contrib/amd/m4/macros/check_fs_mntent.m4 delete mode 100644 contrib/amd/m4/macros/check_gnu_getopt.m4 delete mode 100644 contrib/amd/m4/macros/check_hide_mount_type.m4 delete mode 100644 contrib/amd/m4/macros/check_lib2.m4 delete mode 100644 contrib/amd/m4/macros/check_map_funcs.m4 delete mode 100644 contrib/amd/m4/macros/check_mnt2_cdfs_opt.m4 delete mode 100644 contrib/amd/m4/macros/check_mnt2_gen_opt.m4 delete mode 100644 contrib/amd/m4/macros/check_mnt2_nfs_opt.m4 delete mode 100644 contrib/amd/m4/macros/check_mnttab_file_name.m4 delete mode 100644 contrib/amd/m4/macros/check_mnttab_location.m4 delete mode 100644 contrib/amd/m4/macros/check_mnttab_opt.m4 delete mode 100644 contrib/amd/m4/macros/check_mnttab_style.m4 delete mode 100644 contrib/amd/m4/macros/check_mnttab_type.m4 delete mode 100644 contrib/amd/m4/macros/check_mount_style.m4 delete mode 100644 contrib/amd/m4/macros/check_mount_trap.m4 delete mode 100644 contrib/amd/m4/macros/check_mount_type.m4 delete mode 100644 contrib/amd/m4/macros/check_mtype_printf_type.m4 delete mode 100644 contrib/amd/m4/macros/check_mtype_type.m4 delete mode 100644 contrib/amd/m4/macros/check_network_transport_type.m4 delete mode 100644 contrib/amd/m4/macros/check_nfs_fh_dref.m4 delete mode 100644 contrib/amd/m4/macros/check_nfs_hn_dref.m4 delete mode 100644 contrib/amd/m4/macros/check_nfs_prot_headers.m4 delete mode 100644 contrib/amd/m4/macros/check_nfs_sa_dref.m4 delete mode 100644 contrib/amd/m4/macros/check_nfs_socket_connection.m4 delete mode 100644 contrib/amd/m4/macros/check_os_libs.m4 delete mode 100644 contrib/amd/m4/macros/check_restartable_signal_handler.m4 delete mode 100644 contrib/amd/m4/macros/check_umount_style.m4 delete mode 100644 contrib/amd/m4/macros/check_unmount_args.m4 delete mode 100644 contrib/amd/m4/macros/check_unmount_call.m4 delete mode 100644 contrib/amd/m4/macros/expand_cpp_hex.m4 delete mode 100644 contrib/amd/m4/macros/expand_cpp_int.m4 delete mode 100644 contrib/amd/m4/macros/expand_cpp_string.m4 delete mode 100644 contrib/amd/m4/macros/expand_run_string.m4 delete mode 100644 contrib/amd/m4/macros/extern_optarg.m4 delete mode 100644 contrib/amd/m4/macros/extern_sys_errlist.m4 delete mode 100644 contrib/amd/m4/macros/field_mntent_t_mnt_time_string.m4 delete mode 100644 contrib/amd/m4/macros/func_bad_memcmp.m4 delete mode 100644 contrib/amd/m4/macros/func_bad_yp_all.m4 delete mode 100644 contrib/amd/m4/macros/header_templates.m4 delete mode 100644 contrib/amd/m4/macros/host_macros.m4 delete mode 100644 contrib/amd/m4/macros/linux_headers.m4 delete mode 100644 contrib/amd/m4/macros/localconfig.m4 delete mode 100644 contrib/amd/m4/macros/mount_headers.m4 delete mode 100644 contrib/amd/m4/macros/name_package.m4 delete mode 100644 contrib/amd/m4/macros/name_version.m4 delete mode 100644 contrib/amd/m4/macros/opt_amu_cflags.m4 delete mode 100644 contrib/amd/m4/macros/opt_cppflags.m4 delete mode 100644 contrib/amd/m4/macros/opt_debug.m4 delete mode 100644 contrib/amd/m4/macros/opt_ldflags.m4 delete mode 100644 contrib/amd/m4/macros/opt_libs.m4 delete mode 100644 contrib/amd/m4/macros/os_cflags.m4 delete mode 100644 contrib/amd/m4/macros/os_cppflags.m4 delete mode 100644 contrib/amd/m4/macros/os_ldflags.m4 delete mode 100644 contrib/amd/m4/macros/package_bugreport.m4 delete mode 100644 contrib/amd/m4/macros/package_name.m4 delete mode 100644 contrib/amd/m4/macros/package_version.m4 delete mode 100644 contrib/amd/m4/macros/save_state.m4 delete mode 100644 contrib/amd/m4/macros/struct_field_nfs_fh.m4 delete mode 100644 contrib/amd/m4/macros/struct_mntent.m4 delete mode 100644 contrib/amd/m4/macros/struct_mnttab.m4 delete mode 100644 contrib/amd/m4/macros/struct_nfs_args.m4 delete mode 100644 contrib/amd/m4/macros/struct_nfs_fh.m4 delete mode 100644 contrib/amd/m4/macros/struct_nfs_fh3.m4 delete mode 100644 contrib/amd/m4/macros/struct_nfs_gfs_mount.m4 delete mode 100644 contrib/amd/m4/macros/try_compile_anyfs.m4 delete mode 100644 contrib/amd/m4/macros/try_compile_nfs.m4 delete mode 100644 contrib/amd/m4/macros/try_compile_rpc.m4 delete mode 100644 contrib/amd/m4/macros/type_auth_create_gidlist.m4 delete mode 100644 contrib/amd/m4/macros/type_cachefs_args.m4 delete mode 100644 contrib/amd/m4/macros/type_cdfs_args.m4 delete mode 100644 contrib/amd/m4/macros/type_efs_args.m4 delete mode 100644 contrib/amd/m4/macros/type_lofs_args.m4 delete mode 100644 contrib/amd/m4/macros/type_mfs_args.m4 delete mode 100644 contrib/amd/m4/macros/type_pcfs_args.m4 delete mode 100644 contrib/amd/m4/macros/type_recvfrom_fromlen.m4 delete mode 100644 contrib/amd/m4/macros/type_rfs_args.m4 delete mode 100644 contrib/amd/m4/macros/type_svc_in_arg.m4 delete mode 100644 contrib/amd/m4/macros/type_time_t.m4 delete mode 100644 contrib/amd/m4/macros/type_tmpfs_args.m4 delete mode 100644 contrib/amd/m4/macros/type_ufs_args.m4 delete mode 100644 contrib/amd/m4/macros/type_xdrproc_t.m4 delete mode 100644 contrib/amd/m4/macros/type_xfs_args.m4 delete mode 100644 contrib/amd/m4/macros/type_yp_order_outorder.m4 delete mode 100644 contrib/amd/m4/macros/with_addon.m4 delete mode 100755 contrib/amd/missing delete mode 100755 contrib/amd/mkinstalldirs delete mode 100644 contrib/amd/scripts/lostaltmail.conf-sample delete mode 100755 contrib/amd/scripts/lostaltmail.in (limited to 'contrib/amd') diff --git a/contrib/amd/MIRRORS b/contrib/amd/MIRRORS deleted file mode 100644 index ca3f08e..0000000 --- a/contrib/amd/MIRRORS +++ /dev/null @@ -1,59 +0,0 @@ -# -*- text -*- - - AM-UTILS-6.x MIRRORS - -Note: in case of any problems accessing the individual FTP sites, please -contact their respective maintainers. If you wish to be added to the -official mirror list, please send mail to amd-dev@cs.columbia.edu with the -full URL, maintainer's email, and geographical location. - -U.S.A: - New York (Primary Site): - ftp://shekel.mcl.cs.columbia.edu/pub/am-utils - Maintainer: ezk@cs.columbia.edu - Minnesota: - ftp://ftp.cs.umn.edu/pub/am-utils - Maintainer: dokas@cs.umn.edu - Virginia (Newport News): - ftp://ftp.ferginc.com/pub/unix/am-utils - Maintainer: Branson.Matheson@FergInc.com - Avoid for now: empty directory - Ohio (Kent State University): - ftp://info.mcs.kent.edu/pub/am-utils - Maintainer: root@mcs.kent.edu - Florida (University of Florida) - ftp://ftp.cise.ufl.edu/pub/mirrors/am-utils - Maintainer: mirror@cise.ufl.edu - -Europe: - Germany: - ftp://ftp.fu-berlin.de/pub/unix/network/am-utils - Maintainer: ftp-adm@ftp.fu-berlin.de - Germany: - ftp://ftp.tu-darmstadt.de/pub/networking/filesystems/am-utils/ - Maintainer: networking@ftp.tu-darmstadt.de - Sweden: - ftp://ftp.sunet.se/pub/unix/admin/am-utils - Maintainer: archive@ftp.sunet.se - Sweden (Stockholm University, Math Depat): - ftp://mirror.matematik.su.se/pub/am-utils - Maintainer: leifj@matematik.su.se - UK: - ftp://sunsite.org.uk/packages/am-utils - Maintainer: lmjm@icparc.ic.ac.uk - -Asia: - Japan: - ftp://ftp.u-aizu.ac.jp/pub/net/amd/am-utils - Maintainer: ftp-admin@u-aizu.ac.jp - Japan: - ftp://core.ring.gr.jp/pub/net/am-utils/ - Maintainer: ftpadmin@ring.gr.jp - Japan: - ftp://ftp.ring.gr.jp/pub/net/am-utils/ - Maintainer: ftpadmin@ring.gr.jp - -Australia: - Melbourne: - ftp://ftp.sage-au.org.au/pub/network/filesystem/am-utils - Maintainer: mirror@ftp.sage-au.org.au diff --git a/contrib/amd/amd/amd.8 b/contrib/amd/amd/amd.8 index f98bae7..d09fb5a 100644 --- a/contrib/amd/amd/amd.8 +++ b/contrib/amd/amd/amd.8 @@ -1,5 +1,5 @@ .\" -.\" Copyright (c) 1997-2003 Erez Zadok +.\" Copyright (c) 1997-2004 Erez Zadok .\" Copyright (c) 1989 Jan-Simon Pendry .\" Copyright (c) 1989 Imperial College of Science, Technology & Medicine .\" Copyright (c) 1989 The Regents of the University of California. @@ -38,7 +38,7 @@ .\" .\" %W% (Berkeley) %G% .\" -.\" $Id: amd.8,v 1.4.2.4 2003/03/16 01:46:59 ezk Exp $ +.\" $Id: amd.8,v 1.4.2.5 2004/01/06 03:15:16 ezk Exp $ .\" $FreeBSD$ .\" .Dd April 19, 1994 diff --git a/contrib/amd/amd/amd.c b/contrib/amd/amd/amd.c index 1cc97b7..f724bd8 100644 --- a/contrib/amd/amd/amd.c +++ b/contrib/amd/amd/amd.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997-2003 Erez Zadok + * Copyright (c) 1997-2004 Erez Zadok * Copyright (c) 1989 Jan-Simon Pendry * Copyright (c) 1989 Imperial College of Science, Technology & Medicine * Copyright (c) 1989 The Regents of the University of California. @@ -38,7 +38,7 @@ * * %W% (Berkeley) %G% * - * $Id: amd.c,v 1.8.2.5 2002/12/27 22:44:29 ezk Exp $ + * $Id: amd.c,v 1.8.2.6 2004/01/06 03:15:16 ezk Exp $ * $FreeBSD$ * */ diff --git a/contrib/amd/amd/amq_subr.c b/contrib/amd/amd/amq_subr.c index 6ce7bfa..a5c7f24 100644 --- a/contrib/amd/amd/amq_subr.c +++ b/contrib/amd/amd/amq_subr.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997-2003 Erez Zadok + * Copyright (c) 1997-2004 Erez Zadok * Copyright (c) 1990 Jan-Simon Pendry * Copyright (c) 1990 Imperial College of Science, Technology & Medicine * Copyright (c) 1990 The Regents of the University of California. @@ -38,7 +38,7 @@ * * %W% (Berkeley) %G% * - * $Id: amq_subr.c,v 1.6.2.4 2002/12/27 22:44:33 ezk Exp $ + * $Id: amq_subr.c,v 1.6.2.6 2004/01/19 00:25:55 ezk Exp $ * $FreeBSD$ * */ @@ -75,7 +75,7 @@ amqproc_mnttree_1_svc(voidp argp, struct svc_req *rqstp) static am_node *mp; mp = find_ap(*(char **) argp); - return (amq_mount_tree_p *) ∓ + return (amq_mount_tree_p *) ((void *)&mp); } @@ -101,7 +101,7 @@ amqproc_umnt_1_svc(voidp argp, struct svc_req *rqstp) amq_mount_stats * amqproc_stats_1_svc(voidp argp, struct svc_req *rqstp) { - return (amq_mount_stats *) &amd_stats; + return (amq_mount_stats *) ((void *)&amd_stats); } @@ -169,7 +169,7 @@ amqproc_setopt_1_svc(voidp argp, struct svc_req *rqstp) amq_mount_info_list * amqproc_getmntfs_1_svc(voidp argp, struct svc_req *rqstp) { - return (amq_mount_info_list *) &mfhead; /* XXX */ + return (amq_mount_info_list *) ((void *)&mfhead); /* XXX */ } @@ -286,7 +286,7 @@ xdr_amq_mount_tree(XDR *xdrs, amq_mount_tree *objp) if (!xdr_amq_mount_tree_node(xdrs, objp)) { return (FALSE); } - if (!xdr_pointer(xdrs, (char **) &mnil, sizeof(amq_mount_tree), (XDRPROC_T_TYPE) xdr_amq_mount_subtree)) { + if (!xdr_pointer(xdrs, (char **) ((void *)&mnil), sizeof(amq_mount_tree), (XDRPROC_T_TYPE) xdr_amq_mount_subtree)) { return (FALSE); } if (!xdr_pointer(xdrs, (char **) &mp->am_child, sizeof(amq_mount_tree), (XDRPROC_T_TYPE) xdr_amq_mount_subtree)) { diff --git a/contrib/amd/amd/get_args.c b/contrib/amd/amd/get_args.c index cc9847d..e5c3edf 100644 --- a/contrib/amd/amd/get_args.c +++ b/contrib/amd/amd/get_args.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997-2003 Erez Zadok + * Copyright (c) 1997-2004 Erez Zadok * Copyright (c) 1990 Jan-Simon Pendry * Copyright (c) 1990 Imperial College of Science, Technology & Medicine * Copyright (c) 1990 The Regents of the University of California. @@ -38,7 +38,7 @@ * * %W% (Berkeley) %G% * - * $Id: get_args.c,v 1.7.2.5 2002/12/27 22:44:34 ezk Exp $ + * $Id: get_args.c,v 1.7.2.6 2004/01/06 03:15:16 ezk Exp $ * $FreeBSD$ * */ @@ -86,7 +86,7 @@ get_version_string(void) vers = xmalloc(2048 + wire_buf_len); sprintf(vers, "%s\n%s\n%s\n%s\n", - "Copyright (c) 1997-2003 Erez Zadok", + "Copyright (c) 1997-2004 Erez Zadok", "Copyright (c) 1990 Jan-Simon Pendry", "Copyright (c) 1990 Imperial College of Science, Technology & Medicine", "Copyright (c) 1990 The Regents of the University of California."); diff --git a/contrib/amd/amd/nfs_prot_svc.c b/contrib/amd/amd/nfs_prot_svc.c index 39d1d45..8d67d1b 100644 --- a/contrib/amd/amd/nfs_prot_svc.c +++ b/contrib/amd/amd/nfs_prot_svc.c @@ -39,6 +39,7 @@ * %W% (Berkeley) %G% * * $Id: nfs_prot_svc.c,v 1.5.2.6 2004/01/21 04:04:58 ib42 Exp $ + * $FreeBSD$ * */ @@ -104,7 +105,7 @@ nfs_program_2(struct svc_req *rqstp, SVCXPRT *transp) sinp = amu_svc_getcaller(rqstp->rq_xprt); #ifdef MNT2_NFS_OPT_RESVPORT /* Verify that the request comes from a reserved port */ - if (ntohs(sinp->sin_port) >= IPPORT_RESERVED) && + if ((ntohs(sinp->sin_port) >= IPPORT_RESERVED) && !(gopt.flags & CFM_NFS_INSECURE_PORT)) { plog(XLOG_WARNING, "ignoring request from %s:%u, port not reserved", inet_dquad(dq, sinp->sin_addr.s_addr), diff --git a/contrib/amd/amd/srvr_nfs.c b/contrib/amd/amd/srvr_nfs.c index d745519..67d1724 100644 --- a/contrib/amd/amd/srvr_nfs.c +++ b/contrib/amd/amd/srvr_nfs.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997-2003 Erez Zadok + * Copyright (c) 1997-2004 Erez Zadok * Copyright (c) 1990 Jan-Simon Pendry * Copyright (c) 1990 Imperial College of Science, Technology & Medicine * Copyright (c) 1990 The Regents of the University of California. @@ -38,7 +38,7 @@ * * %W% (Berkeley) %G% * - * $Id: srvr_nfs.c,v 1.7.2.10 2002/12/29 01:55:43 ib42 Exp $ + * $Id: srvr_nfs.c,v 1.7.2.11 2004/01/06 03:15:16 ezk Exp $ * $FreeBSD$ * */ diff --git a/contrib/amd/amq/amq.8 b/contrib/amd/amq/amq.8 index e1dc13e..6145508 100644 --- a/contrib/amd/amq/amq.8 +++ b/contrib/amd/amq/amq.8 @@ -1,5 +1,5 @@ .\" -.\" Copyright (c) 1997-2003 Erez Zadok +.\" Copyright (c) 1997-2004 Erez Zadok .\" Copyright (c) 1990 Jan-Simon Pendry .\" Copyright (c) 1990 Imperial College of Science, Technology & Medicine .\" Copyright (c) 1990 The Regents of the University of California. @@ -38,8 +38,7 @@ .\" .\" %W% (Berkeley) %G% .\" -.\" $Id: amq.8,v 1.2 1999/01/10 21:53:58 ezk Exp $ -.\" $Id: amq.8,v 1.3.2.7 2002/12/27 22:44:45 ezk Exp $ +.\" $Id: amq.8,v 1.3.2.8 2004/01/06 03:15:16 ezk Exp $ .\" $FreeBSD$ .\" .Dd March 16, 1991 diff --git a/contrib/amd/amq/amq.c b/contrib/amd/amq/amq.c index 56692b9..d9828ac 100644 --- a/contrib/amd/amq/amq.c +++ b/contrib/amd/amq/amq.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997-2003 Erez Zadok + * Copyright (c) 1997-2004 Erez Zadok * Copyright (c) 1990 Jan-Simon Pendry * Copyright (c) 1990 Imperial College of Science, Technology & Medicine * Copyright (c) 1990 The Regents of the University of California. @@ -38,7 +38,7 @@ * * %W% (Berkeley) %G% * - * $Id: amq.c,v 1.7.2.8 2002/12/27 22:44:45 ezk Exp $ + * $Id: amq.c,v 1.7.2.9 2004/01/06 03:15:16 ezk Exp $ * */ @@ -51,13 +51,13 @@ __FBSDID("$FreeBSD$"); #ifndef lint char copyright[] = "\ -@(#)Copyright (c) 1997-2003 Erez Zadok\n\ +@(#)Copyright (c) 1997-2004 Erez Zadok\n\ @(#)Copyright (c) 1990 Jan-Simon Pendry\n\ @(#)Copyright (c) 1990 Imperial College of Science, Technology & Medicine\n\ @(#)Copyright (c) 1990 The Regents of the University of California.\n\ @(#)All rights reserved.\n"; #if __GNUC__ < 2 -static char rcsid[] = "$Id: amq.c,v 1.7.2.8 2002/12/27 22:44:45 ezk Exp $"; +static char rcsid[] = "$Id: amq.c,v 1.7.2.9 2004/01/06 03:15:16 ezk Exp $"; static char sccsid[] = "%W% (Berkeley) %G%"; #endif /* __GNUC__ < 2 */ #endif /* not lint */ diff --git a/contrib/amd/amq/pawd.1 b/contrib/amd/amq/pawd.1 index e4471f3..393836a 100644 --- a/contrib/amd/amq/pawd.1 +++ b/contrib/amd/amq/pawd.1 @@ -1,5 +1,5 @@ .\" -.\" Copyright (c) 1997-2003 Erez Zadok +.\" Copyright (c) 1997-2004 Erez Zadok .\" Copyright (c) 1990 Jan-Simon Pendry .\" Copyright (c) 1990 Imperial College of Science, Technology & Medicine .\" Copyright (c) 1990 The Regents of the University of California. @@ -38,7 +38,7 @@ .\" .\" %W% (Berkeley) %G% .\" -.\" $Id: pawd.1,v 1.3.2.3 2002/12/27 22:44:46 ezk Exp $ +.\" $Id: pawd.1,v 1.3.2.4 2004/01/06 03:15:16 ezk Exp $ .\" $FreeBSD$ .\" .Dd January 6, 1998 diff --git a/contrib/amd/commit b/contrib/amd/commit deleted file mode 100755 index 591aa10..0000000 --- a/contrib/amd/commit +++ /dev/null @@ -1,233 +0,0 @@ -#! /bin/sh - -# commit version 0.9.2 - -# Copyright (C) 1999, Free Software Foundation - -# This script is Free Software, and it can be copied, distributed and -# modified as defined in the GNU General Public License. A copy of -# its license can be downloaded from http://www.gnu.org/copyleft/gpl.html - -# Originally by Gary V. Vaughan -# Heavily modified by Alexandre Oliva - -# This scripts eases checking in changes to CVS-maintained projects -# with ChangeLog files. It will check that there have been no -# conflicting commits in the CVS repository and print which files it -# is going to commit to stderr. A list of files to compare and to -# check in can be given in the command line. If it is not given, all -# files in the current directory (and below, unless `-l' is given) are -# considered for check in. - -# The commit message will be extracted from the differences between -# the local ChangeLog and the one in the repository (unless a message -# was specified with `-m' or `-F'). An empty message is not accepted -# (but a blank line is). If the message is acceptable, it will be -# presented for verification (and possible edition) using the $PAGER -# environment variable (or `more', if it is not set, or `cat', if the -# `-f' switch is given). If $PAGER exits successfully, the modified -# files (at that moment) are checked in, unless `-n' was specified, in -# which case nothing is checked in. - -# usage: commit [-v] [-h] [-f] [-l] [-n] [-q] [-z N] -# [-m msg|-F msg_file] [--] [file|dir ...] - -# -f --fast don't check (unless *followed* by -n), and just -# --force display commit message instead of running $PAGER -# -l --local don't descend into subdirectories -# -m msg --message=msg set commit message -# --msg=msg same as -m -# -F file --file=file read commit message from file -# -n --dry-run don't commit anything -# -q --quiet run cvs in quiet mode -# -zN --compress=N set compression level (0-9, 0=none, 9=max) -# -v --version print version information -# -h,-? --help print short or long help message - -name=commit -cvsopt= -updateopt= -commitopt= -dry_run=false -commit=: -update=: -log_file="${TMPDIR-/tmp}/commitlog.$$" - -rm -f "$log_file" -trap 'rm -f "$log_file"; exit 1' 1 2 15 - -# this just eases exit handling -main_repeat=":" -while $main_repeat; do - -repeat="test $# -gt 0" -while $repeat; do - case "$1" in - -f|--force|--fast) - update=false - PAGER=cat - shift - ;; - -l|--local) - updateopt="$updateopt -l" - commitopt="$commitopt -l" - shift - ;; - -m|--message|--msg) - if test $# = 1; then - echo "$name: missing argument for $1" >&2 - break - fi - if test -f "$log_file"; then - echo "$name: you can have at most one of -m and -F" >&2 - break - fi - shift - echo "$1" > "$log_file" - shift - ;; - -F|--file) - if test -f "$log_file"; then - echo "$name: you can have at most one of -m and -F" >&2 - break - fi - if test $# = 1; then - echo "$name: missing argument for $1" >&2 - break - fi - shift - if cat < "$1" > "$log_file"; then :; else - break - fi - shift - ;; - -n|--dry-run) - commit=false - update=true - shift - ;; - -q|--quiet) - cvsopt="$cvsopt -q" - shift - ;; - -z|--compress) - if test $# = 1; then - echo "$name: missing argument for $1" >&2 - break - fi - case "$2" in - [0-9]) :;; - *) echo "$name: invalid argument for $1" >&2 - break - ;; - esac - cvsopt="$cvsopt -z$2" - shift - shift - ;; - - -m*|-F*|-z*) - opt=`echo "$1" | sed '1s/^\(..\).*$/\1/;q'` - arg=`echo "$1" | sed '1s/^-[a-zA-Z0-9]//'` - shift - set -- "$opt" "$arg" ${1+"$@"} - ;; - --message=*|--msg=*|--file=*|--compress=*) - opt=`echo "$1" | sed '1s/^\(--[^=]*\)=.*/\1/;q'` - arg=`echo "$1" | sed '1s/^--[^=]*=//'` - shift - set -- "$opt" "$arg" ${1+"$@"} - ;; - - -v|--version) - sed '/^# '$name' version /,/^# Heavily modified by/ { s/^# //; p; }; d' < $0 - exit 0 - ;; - -\?|-h) - sed '/^# usage:/,/# -h/ { s/^# //; p; }; d' < $0 && - echo - echo "run \`$name --help | more' for full usage" - exit 0 - ;; - --help) - sed '/^# '$name' version /,/^[^#]/ { /^[^#]/ d; s/^# //; p; }; d' < $0 - exit 0 - ;; - --) - shift - repeat=false - ;; - -*) - echo "$name: invalid flag $1" >&2 - break - ;; - *) - repeat=false - ;; - esac -done -# might have used break 2 within the previous loop, but so what -$repeat && break - -$update && \ -if echo "$name: checking for conflicts..." >&2 - (cvs $cvsopt -q -n update $updateopt ${1+"$@"} 2>/dev/null \ - | while read line; do - echo "$line" - echo "$line" >&3 - done | grep '^C') 3>&1 >/dev/null; then - echo "$name: some conflicts were found, aborting..." >&2 - break -fi - -if test ! -f "$log_file"; then - echo "$name: checking commit message..." >&2 - cvs $cvsopt diff -u ChangeLog \ - | while read line; do - case "$line" in - "--- ChangeLog"*) :;; - "-"*) - echo "$name: *** Warning: the following line in ChangeLog diff is suspicious:" >&2 - echo "$line" | sed 's/^.//' >&2;; - "+ "*) - echo "$name: *** Warning: lines should start with tabs, not spaces; ignoring line:" >&2 - echo "$line" | sed 's/^.//' >&2;; - "+") echo;; - "+ "*) echo "$line";; - esac - done \ - | sed -e 's,\+ ,,' -e '/./p' -e '/./d' -e '1d' -e '$d' > "$log_file" \ - || break -# The sed script above removes "+TAB" from the beginning of a line, then -# deletes the first and/or the last line, when they happen to be empty -fi - -if grep '[^ ]' < "$log_file" > /dev/null; then :; else - echo "$name: empty commit message, aborting" >&2 - break -fi - -if grep '^$' < "$log_file" > /dev/null; then - echo "$name: *** Warning: blank lines should not appear within a commit messages." >&2 - echo "$name: *** They should be used to separate distinct commits." >&2 -fi - -${PAGER-more} "$log_file" || break - -sleep 1 # give the user some time for a ^C - -# Do not check for empty $log_file again, even though the user might have -# zeroed it out. If s/he did, it was probably intentional. - -if $commit; then - cvs $cvsopt commit $commitopt -F $log_file ${1+"$@"} || break -fi - -main_repeat=false -done - -rm -f "$log_file" - -# if main_repeat was not set to `false', we failed -$main_repeat && exit 1 -exit 0 diff --git a/contrib/amd/conf/hn_dref/hn_dref_default.h b/contrib/amd/conf/hn_dref/hn_dref_default.h deleted file mode 100644 index d495ea8..0000000 --- a/contrib/amd/conf/hn_dref/hn_dref_default.h +++ /dev/null @@ -1,2 +0,0 @@ -/* $srcdir/conf/hn_dref/hn_dref_default.h */ -#define NFS_HN_DREF(dst, src) (dst) = (src) diff --git a/contrib/amd/conf/mount/mount_default.c b/contrib/amd/conf/mount/mount_default.c deleted file mode 100644 index 1bdf522..0000000 --- a/contrib/amd/conf/mount/mount_default.c +++ /dev/null @@ -1,46 +0,0 @@ -/* - * Copyright (c) 1997-2003 Erez Zadok - * Copyright (c) 1990 Jan-Simon Pendry - * Copyright (c) 1990 Imperial College of Science, Technology & Medicine - * Copyright (c) 1990 The Regents of the University of California. - * All rights reserved. - * - * This code is derived from software contributed to Berkeley by - * Jan-Simon Pendry at Imperial College, London. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgment: - * This product includes software developed by the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * %W% (Berkeley) %G% - * - * $Id: mount_default.c,v 1.1.2.3 2002/12/27 22:44:48 ezk Exp $ - */ - -/* - * Default mount helper (currently empty) - */ diff --git a/contrib/amd/conf/nfs_prot/nfs_prot_freebsd2.h b/contrib/amd/conf/nfs_prot/nfs_prot_freebsd2.h index b0a66c3..24bc9b3 100644 --- a/contrib/amd/conf/nfs_prot/nfs_prot_freebsd2.h +++ b/contrib/amd/conf/nfs_prot/nfs_prot_freebsd2.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997-2003 Erez Zadok + * Copyright (c) 1997-2004 Erez Zadok * Copyright (c) 1990 Jan-Simon Pendry * Copyright (c) 1990 Imperial College of Science, Technology & Medicine * Copyright (c) 1990 The Regents of the University of California. @@ -38,7 +38,7 @@ * * %W% (Berkeley) %G% * - * $Id: nfs_prot_freebsd2.h,v 1.3.2.3 2002/12/27 22:44:54 ezk Exp $ + * $Id: nfs_prot_freebsd2.h,v 1.3.2.4 2004/01/06 03:15:19 ezk Exp $ * $FreeBSD$ * */ diff --git a/contrib/amd/conf/nfs_prot/nfs_prot_freebsd3.h b/contrib/amd/conf/nfs_prot/nfs_prot_freebsd3.h index c392497..27c535d 100644 --- a/contrib/amd/conf/nfs_prot/nfs_prot_freebsd3.h +++ b/contrib/amd/conf/nfs_prot/nfs_prot_freebsd3.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997-2003 Erez Zadok + * Copyright (c) 1997-2004 Erez Zadok * Copyright (c) 1990 Jan-Simon Pendry * Copyright (c) 1990 Imperial College of Science, Technology & Medicine * Copyright (c) 1990 The Regents of the University of California. @@ -38,7 +38,7 @@ * * %W% (Berkeley) %G% * - * $Id: nfs_prot_freebsd3.h,v 1.5.2.6 2003/08/27 19:35:16 ib42 Exp $ + * $Id: nfs_prot_freebsd3.h,v 1.5.2.7 2004/01/06 03:15:19 ezk Exp $ * $FreeBSD$ * */ diff --git a/contrib/amd/conf/trap/trap_default.h b/contrib/amd/conf/trap/trap_default.h deleted file mode 100644 index a132b0e..0000000 --- a/contrib/amd/conf/trap/trap_default.h +++ /dev/null @@ -1,2 +0,0 @@ -/* $srcdir/conf/trap/trap_default.h */ -#define MOUNT_TRAP(type, mnt, flags, mnt_data) mount(type, mnt->mnt_dir, flags, mnt_data) diff --git a/contrib/amd/config.guess b/contrib/amd/config.guess deleted file mode 100755 index fb9a2ba..0000000 --- a/contrib/amd/config.guess +++ /dev/null @@ -1,1325 +0,0 @@ -#! /bin/sh -# Attempt to guess a canonical system name. -# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002 Free Software Foundation, Inc. - -timestamp='2002-05-29' - -# This file is free software; you can redistribute it and/or modify it -# under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -# -# As a special exception to the GNU General Public License, if you -# distribute this file as part of a program that contains a -# configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that program. - -# Originally written by Per Bothner . -# Please send patches to . Submit a context -# diff and a properly formatted ChangeLog entry. -# -# This script attempts to guess a canonical system name similar to -# config.sub. If it succeeds, it prints the system name on stdout, and -# exits with 0. Otherwise, it exits with 1. -# -# The plan is that this can be called by configure scripts if you -# don't specify an explicit build system type. - -me=`echo "$0" | sed -e 's,.*/,,'` - -usage="\ -Usage: $0 [OPTION] - -Output the configuration name of the system \`$me' is run on. - -Operation modes: - -h, --help print this help, then exit - -t, --time-stamp print date of last modification, then exit - -v, --version print version number, then exit - -Report bugs and patches to ." - -version="\ -GNU config.guess ($timestamp) - -Originally written by Per Bothner. -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 -Free Software Foundation, Inc. - -This is free software; see the source for copying conditions. There is NO -warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." - -help=" -Try \`$me --help' for more information." - -# Parse command line -while test $# -gt 0 ; do - case $1 in - --time-stamp | --time* | -t ) - echo "$timestamp" ; exit 0 ;; - --version | -v ) - echo "$version" ; exit 0 ;; - --help | --h* | -h ) - echo "$usage"; exit 0 ;; - -- ) # Stop option processing - shift; break ;; - - ) # Use stdin as input. - break ;; - -* ) - echo "$me: invalid option $1$help" >&2 - exit 1 ;; - * ) - break ;; - esac -done - -if test $# != 0; then - echo "$me: too many arguments$help" >&2 - exit 1 -fi - - -dummy=dummy-$$ -trap 'rm -f $dummy.c $dummy.o $dummy.rel $dummy; exit 1' 1 2 15 - -# CC_FOR_BUILD -- compiler used by this script. -# Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still -# use `HOST_CC' if defined, but it is deprecated. - -set_cc_for_build='case $CC_FOR_BUILD,$HOST_CC,$CC in - ,,) echo "int dummy(){}" > $dummy.c ; - for c in cc gcc c89 c99 ; do - ($c $dummy.c -c -o $dummy.o) >/dev/null 2>&1 ; - if test $? = 0 ; then - CC_FOR_BUILD="$c"; break ; - fi ; - done ; - rm -f $dummy.c $dummy.o $dummy.rel ; - if test x"$CC_FOR_BUILD" = x ; then - CC_FOR_BUILD=no_compiler_found ; - fi - ;; - ,,*) CC_FOR_BUILD=$CC ;; - ,*,*) CC_FOR_BUILD=$HOST_CC ;; -esac' - -# This is needed to find uname on a Pyramid OSx when run in the BSD universe. -# (ghazi@noc.rutgers.edu 1994-08-24) -if (test -f /.attbin/uname) >/dev/null 2>&1 ; then - PATH=$PATH:/.attbin ; export PATH -fi - -UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown -UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown -UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown -UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown - -# Note: order is significant - the case branches are not exclusive. - -case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in - *:NetBSD:*:*) - # NetBSD (nbsd) targets should (where applicable) match one or - # more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*, - # *-*-netbsdecoff* and *-*-netbsd*. For targets that recently - # switched to ELF, *-*-netbsd* would select the old - # object file format. This provides both forward - # compatibility and a consistent mechanism for selecting the - # object file format. - # - # Note: NetBSD doesn't particularly care about the vendor - # portion of the name. We always set it to "unknown". - sysctl="sysctl -n hw.machine_arch" - UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \ - /usr/sbin/$sysctl 2>/dev/null || echo unknown)` - case "${UNAME_MACHINE_ARCH}" in - armeb) machine=armeb-unknown ;; - arm*) machine=arm-unknown ;; - sh3el) machine=shl-unknown ;; - sh3eb) machine=sh-unknown ;; - *) machine=${UNAME_MACHINE_ARCH}-unknown ;; - esac - # The Operating System including object format, if it has switched - # to ELF recently, or will in the future. - case "${UNAME_MACHINE_ARCH}" in - arm*|i386|m68k|ns32k|sh3*|sparc|vax) - eval $set_cc_for_build - if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \ - | grep __ELF__ >/dev/null - then - # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout). - # Return netbsd for either. FIX? - os=netbsd - else - os=netbsdelf - fi - ;; - *) - os=netbsd - ;; - esac - # The OS release - release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'` - # Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM: - # contains redundant information, the shorter form: - # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. - echo "${machine}-${os}${release}" - exit 0 ;; - amiga:OpenBSD:*:*) - echo m68k-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - arc:OpenBSD:*:*) - echo mipsel-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - hp300:OpenBSD:*:*) - echo m68k-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - mac68k:OpenBSD:*:*) - echo m68k-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - macppc:OpenBSD:*:*) - echo powerpc-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - mvme68k:OpenBSD:*:*) - echo m68k-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - mvme88k:OpenBSD:*:*) - echo m88k-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - mvmeppc:OpenBSD:*:*) - echo powerpc-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - pmax:OpenBSD:*:*) - echo mipsel-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - sgi:OpenBSD:*:*) - echo mipseb-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - sun3:OpenBSD:*:*) - echo m68k-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - wgrisc:OpenBSD:*:*) - echo mipsel-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - *:OpenBSD:*:*) - echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - alpha:OSF1:*:*) - if test $UNAME_RELEASE = "V4.0"; then - UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'` - fi - # A Vn.n version is a released version. - # A Tn.n version is a released field test version. - # A Xn.n version is an unreleased experimental baselevel. - # 1.2 uses "1.2" for uname -r. - cat <$dummy.s - .data -\$Lformat: - .byte 37,100,45,37,120,10,0 # "%d-%x\n" - - .text - .globl main - .align 4 - .ent main -main: - .frame \$30,16,\$26,0 - ldgp \$29,0(\$27) - .prologue 1 - .long 0x47e03d80 # implver \$0 - lda \$2,-1 - .long 0x47e20c21 # amask \$2,\$1 - lda \$16,\$Lformat - mov \$0,\$17 - not \$1,\$18 - jsr \$26,printf - ldgp \$29,0(\$26) - mov 0,\$16 - jsr \$26,exit - .end main -EOF - eval $set_cc_for_build - $CC_FOR_BUILD $dummy.s -o $dummy 2>/dev/null - if test "$?" = 0 ; then - case `./$dummy` in - 0-0) - UNAME_MACHINE="alpha" - ;; - 1-0) - UNAME_MACHINE="alphaev5" - ;; - 1-1) - UNAME_MACHINE="alphaev56" - ;; - 1-101) - UNAME_MACHINE="alphapca56" - ;; - 2-303) - UNAME_MACHINE="alphaev6" - ;; - 2-307) - UNAME_MACHINE="alphaev67" - ;; - 2-1307) - UNAME_MACHINE="alphaev68" - ;; - esac - fi - rm -f $dummy.s $dummy - echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` - exit 0 ;; - Alpha\ *:Windows_NT*:*) - # How do we know it's Interix rather than the generic POSIX subsystem? - # Should we change UNAME_MACHINE based on the output of uname instead - # of the specific Alpha model? - echo alpha-pc-interix - exit 0 ;; - 21064:Windows_NT:50:3) - echo alpha-dec-winnt3.5 - exit 0 ;; - Amiga*:UNIX_System_V:4.0:*) - echo m68k-unknown-sysv4 - exit 0;; - *:[Aa]miga[Oo][Ss]:*:*) - echo ${UNAME_MACHINE}-unknown-amigaos - exit 0 ;; - *:[Mm]orph[Oo][Ss]:*:*) - echo ${UNAME_MACHINE}-unknown-morphos - exit 0 ;; - *:OS/390:*:*) - echo i370-ibm-openedition - exit 0 ;; - arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) - echo arm-acorn-riscix${UNAME_RELEASE} - exit 0;; - SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*) - echo hppa1.1-hitachi-hiuxmpp - exit 0;; - Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*) - # akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE. - if test "`(/bin/universe) 2>/dev/null`" = att ; then - echo pyramid-pyramid-sysv3 - else - echo pyramid-pyramid-bsd - fi - exit 0 ;; - NILE*:*:*:dcosx) - echo pyramid-pyramid-svr4 - exit 0 ;; - sun4H:SunOS:5.*:*) - echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit 0 ;; - sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*) - echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit 0 ;; - i86pc:SunOS:5.*:*) - echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit 0 ;; - sun4*:SunOS:6*:*) - # According to config.sub, this is the proper way to canonicalize - # SunOS6. Hard to guess exactly what SunOS6 will be like, but - # it's likely to be more like Solaris than SunOS4. - echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit 0 ;; - sun4*:SunOS:*:*) - case "`/usr/bin/arch -k`" in - Series*|S4*) - UNAME_RELEASE=`uname -v` - ;; - esac - # Japanese Language versions have a version number like `4.1.3-JL'. - echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'` - exit 0 ;; - sun3*:SunOS:*:*) - echo m68k-sun-sunos${UNAME_RELEASE} - exit 0 ;; - sun*:*:4.2BSD:*) - UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null` - test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3 - case "`/bin/arch`" in - sun3) - echo m68k-sun-sunos${UNAME_RELEASE} - ;; - sun4) - echo sparc-sun-sunos${UNAME_RELEASE} - ;; - esac - exit 0 ;; - aushp:SunOS:*:*) - echo sparc-auspex-sunos${UNAME_RELEASE} - exit 0 ;; - # The situation for MiNT is a little confusing. The machine name - # can be virtually everything (everything which is not - # "atarist" or "atariste" at least should have a processor - # > m68000). The system name ranges from "MiNT" over "FreeMiNT" - # to the lowercase version "mint" (or "freemint"). Finally - # the system name "TOS" denotes a system which is actually not - # MiNT. But MiNT is downward compatible to TOS, so this should - # be no problem. - atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*) - echo m68k-atari-mint${UNAME_RELEASE} - exit 0 ;; - atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*) - echo m68k-atari-mint${UNAME_RELEASE} - exit 0 ;; - *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*) - echo m68k-atari-mint${UNAME_RELEASE} - exit 0 ;; - milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*) - echo m68k-milan-mint${UNAME_RELEASE} - exit 0 ;; - hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*) - echo m68k-hades-mint${UNAME_RELEASE} - exit 0 ;; - *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) - echo m68k-unknown-mint${UNAME_RELEASE} - exit 0 ;; - powerpc:machten:*:*) - echo powerpc-apple-machten${UNAME_RELEASE} - exit 0 ;; - RISC*:Mach:*:*) - echo mips-dec-mach_bsd4.3 - exit 0 ;; - RISC*:ULTRIX:*:*) - echo mips-dec-ultrix${UNAME_RELEASE} - exit 0 ;; - VAX*:ULTRIX*:*:*) - echo vax-dec-ultrix${UNAME_RELEASE} - exit 0 ;; - 2020:CLIX:*:* | 2430:CLIX:*:*) - echo clipper-intergraph-clix${UNAME_RELEASE} - exit 0 ;; - mips:*:*:UMIPS | mips:*:*:RISCos) - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c -#ifdef __cplusplus -#include /* for printf() prototype */ - int main (int argc, char *argv[]) { -#else - int main (argc, argv) int argc; char *argv[]; { -#endif - #if defined (host_mips) && defined (MIPSEB) - #if defined (SYSTYPE_SYSV) - printf ("mips-mips-riscos%ssysv\n", argv[1]); exit (0); - #endif - #if defined (SYSTYPE_SVR4) - printf ("mips-mips-riscos%ssvr4\n", argv[1]); exit (0); - #endif - #if defined (SYSTYPE_BSD43) || defined(SYSTYPE_BSD) - printf ("mips-mips-riscos%sbsd\n", argv[1]); exit (0); - #endif - #endif - exit (-1); - } -EOF - $CC_FOR_BUILD $dummy.c -o $dummy \ - && ./$dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \ - && rm -f $dummy.c $dummy && exit 0 - rm -f $dummy.c $dummy - echo mips-mips-riscos${UNAME_RELEASE} - exit 0 ;; - Motorola:PowerMAX_OS:*:*) - echo powerpc-motorola-powermax - exit 0 ;; - Night_Hawk:*:*:PowerMAX_OS) - echo powerpc-harris-powermax - exit 0 ;; - Night_Hawk:Power_UNIX:*:*) - echo powerpc-harris-powerunix - exit 0 ;; - m88k:CX/UX:7*:*) - echo m88k-harris-cxux7 - exit 0 ;; - m88k:*:4*:R4*) - echo m88k-motorola-sysv4 - exit 0 ;; - m88k:*:3*:R3*) - echo m88k-motorola-sysv3 - exit 0 ;; - AViiON:dgux:*:*) - # DG/UX returns AViiON for all architectures - UNAME_PROCESSOR=`/usr/bin/uname -p` - if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ] - then - if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \ - [ ${TARGET_BINARY_INTERFACE}x = x ] - then - echo m88k-dg-dgux${UNAME_RELEASE} - else - echo m88k-dg-dguxbcs${UNAME_RELEASE} - fi - else - echo i586-dg-dgux${UNAME_RELEASE} - fi - exit 0 ;; - M88*:DolphinOS:*:*) # DolphinOS (SVR3) - echo m88k-dolphin-sysv3 - exit 0 ;; - M88*:*:R3*:*) - # Delta 88k system running SVR3 - echo m88k-motorola-sysv3 - exit 0 ;; - XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3) - echo m88k-tektronix-sysv3 - exit 0 ;; - Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD) - echo m68k-tektronix-bsd - exit 0 ;; - *:IRIX*:*:*) - echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'` - exit 0 ;; - ????????:AIX?:[12].1:2) # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX. - echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id - exit 0 ;; # Note that: echo "'`uname -s`'" gives 'AIX ' - i*86:AIX:*:*) - echo i386-ibm-aix - exit 0 ;; - ia64:AIX:*:*) - if [ -x /usr/bin/oslevel ] ; then - IBM_REV=`/usr/bin/oslevel` - else - IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} - fi - echo ${UNAME_MACHINE}-ibm-aix${IBM_REV} - exit 0 ;; - *:AIX:2:3) - if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c - #include - - main() - { - if (!__power_pc()) - exit(1); - puts("powerpc-ibm-aix3.2.5"); - exit(0); - } -EOF - $CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm -f $dummy.c $dummy && exit 0 - rm -f $dummy.c $dummy - echo rs6000-ibm-aix3.2.5 - elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then - echo rs6000-ibm-aix3.2.4 - else - echo rs6000-ibm-aix3.2 - fi - exit 0 ;; - *:AIX:*:[45]) - IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` - if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then - IBM_ARCH=rs6000 - else - IBM_ARCH=powerpc - fi - if [ -x /usr/bin/oslevel ] ; then - IBM_REV=`/usr/bin/oslevel` - else - IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} - fi - echo ${IBM_ARCH}-ibm-aix${IBM_REV} - exit 0 ;; - *:AIX:*:*) - echo rs6000-ibm-aix - exit 0 ;; - ibmrt:4.4BSD:*|romp-ibm:BSD:*) - echo romp-ibm-bsd4.4 - exit 0 ;; - ibmrt:*BSD:*|romp-ibm:BSD:*) # covers RT/PC BSD and - echo romp-ibm-bsd${UNAME_RELEASE} # 4.3 with uname added to - exit 0 ;; # report: romp-ibm BSD 4.3 - *:BOSX:*:*) - echo rs6000-bull-bosx - exit 0 ;; - DPX/2?00:B.O.S.:*:*) - echo m68k-bull-sysv3 - exit 0 ;; - 9000/[34]??:4.3bsd:1.*:*) - echo m68k-hp-bsd - exit 0 ;; - hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*) - echo m68k-hp-bsd4.4 - exit 0 ;; - 9000/[34678]??:HP-UX:*:*) - HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` - case "${UNAME_MACHINE}" in - 9000/31? ) HP_ARCH=m68000 ;; - 9000/[34]?? ) HP_ARCH=m68k ;; - 9000/[678][0-9][0-9]) - if [ -x /usr/bin/getconf ]; then - sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null` - sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` - case "${sc_cpu_version}" in - 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 - 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1 - 532) # CPU_PA_RISC2_0 - case "${sc_kernel_bits}" in - 32) HP_ARCH="hppa2.0n" ;; - 64) HP_ARCH="hppa2.0w" ;; - '') HP_ARCH="hppa2.0" ;; # HP-UX 10.20 - esac ;; - esac - fi - if [ "${HP_ARCH}" = "" ]; then - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c - - #define _HPUX_SOURCE - #include - #include - - int main () - { - #if defined(_SC_KERNEL_BITS) - long bits = sysconf(_SC_KERNEL_BITS); - #endif - long cpu = sysconf (_SC_CPU_VERSION); - - switch (cpu) - { - case CPU_PA_RISC1_0: puts ("hppa1.0"); break; - case CPU_PA_RISC1_1: puts ("hppa1.1"); break; - case CPU_PA_RISC2_0: - #if defined(_SC_KERNEL_BITS) - switch (bits) - { - case 64: puts ("hppa2.0w"); break; - case 32: puts ("hppa2.0n"); break; - default: puts ("hppa2.0"); break; - } break; - #else /* !defined(_SC_KERNEL_BITS) */ - puts ("hppa2.0"); break; - #endif - default: puts ("hppa1.0"); break; - } - exit (0); - } -EOF - (CCOPTS= $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null) && HP_ARCH=`./$dummy` - if test -z "$HP_ARCH"; then HP_ARCH=hppa; fi - rm -f $dummy.c $dummy - fi ;; - esac - echo ${HP_ARCH}-hp-hpux${HPUX_REV} - exit 0 ;; - ia64:HP-UX:*:*) - HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` - echo ia64-hp-hpux${HPUX_REV} - exit 0 ;; - 3050*:HI-UX:*:*) - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c - #include - int - main () - { - long cpu = sysconf (_SC_CPU_VERSION); - /* The order matters, because CPU_IS_HP_MC68K erroneously returns - true for CPU_PA_RISC1_0. CPU_IS_PA_RISC returns correct - results, however. */ - if (CPU_IS_PA_RISC (cpu)) - { - switch (cpu) - { - case CPU_PA_RISC1_0: puts ("hppa1.0-hitachi-hiuxwe2"); break; - case CPU_PA_RISC1_1: puts ("hppa1.1-hitachi-hiuxwe2"); break; - case CPU_PA_RISC2_0: puts ("hppa2.0-hitachi-hiuxwe2"); break; - default: puts ("hppa-hitachi-hiuxwe2"); break; - } - } - else if (CPU_IS_HP_MC68K (cpu)) - puts ("m68k-hitachi-hiuxwe2"); - else puts ("unknown-hitachi-hiuxwe2"); - exit (0); - } -EOF - $CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm -f $dummy.c $dummy && exit 0 - rm -f $dummy.c $dummy - echo unknown-hitachi-hiuxwe2 - exit 0 ;; - 9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* ) - echo hppa1.1-hp-bsd - exit 0 ;; - 9000/8??:4.3bsd:*:*) - echo hppa1.0-hp-bsd - exit 0 ;; - *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*) - echo hppa1.0-hp-mpeix - exit 0 ;; - hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* ) - echo hppa1.1-hp-osf - exit 0 ;; - hp8??:OSF1:*:*) - echo hppa1.0-hp-osf - exit 0 ;; - i*86:OSF1:*:*) - if [ -x /usr/sbin/sysversion ] ; then - echo ${UNAME_MACHINE}-unknown-osf1mk - else - echo ${UNAME_MACHINE}-unknown-osf1 - fi - exit 0 ;; - parisc*:Lites*:*:*) - echo hppa1.1-hp-lites - exit 0 ;; - C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*) - echo c1-convex-bsd - exit 0 ;; - C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*) - if getsysinfo -f scalar_acc - then echo c32-convex-bsd - else echo c2-convex-bsd - fi - exit 0 ;; - C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*) - echo c34-convex-bsd - exit 0 ;; - C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*) - echo c38-convex-bsd - exit 0 ;; - C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*) - echo c4-convex-bsd - exit 0 ;; - CRAY*Y-MP:*:*:*) - echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit 0 ;; - CRAY*[A-Z]90:*:*:*) - echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \ - | sed -e 's/CRAY.*\([A-Z]90\)/\1/' \ - -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \ - -e 's/\.[^.]*$/.X/' - exit 0 ;; - CRAY*TS:*:*:*) - echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit 0 ;; - CRAY*T3D:*:*:*) - echo alpha-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit 0 ;; - CRAY*T3E:*:*:*) - echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit 0 ;; - CRAY*SV1:*:*:*) - echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit 0 ;; - F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) - FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` - FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` - FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` - echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" - exit 0 ;; - i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) - echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE} - exit 0 ;; - sparc*:BSD/OS:*:*) - echo sparc-unknown-bsdi${UNAME_RELEASE} - exit 0 ;; - *:BSD/OS:*:*) - echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} - exit 0 ;; - *:FreeBSD:*:*) - echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` - exit 0 ;; - i*:CYGWIN*:*) - echo ${UNAME_MACHINE}-pc-cygwin - exit 0 ;; - i*:MINGW*:*) - echo ${UNAME_MACHINE}-pc-mingw32 - exit 0 ;; - i*:PW*:*) - echo ${UNAME_MACHINE}-pc-pw32 - exit 0 ;; - x86:Interix*:3*) - echo i386-pc-interix3 - exit 0 ;; - i*:Windows_NT*:* | Pentium*:Windows_NT*:*) - # How do we know it's Interix rather than the generic POSIX subsystem? - # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we - # UNAME_MACHINE based on the output of uname instead of i386? - echo i386-pc-interix - exit 0 ;; - i*:UWIN*:*) - echo ${UNAME_MACHINE}-pc-uwin - exit 0 ;; - p*:CYGWIN*:*) - echo powerpcle-unknown-cygwin - exit 0 ;; - prep*:SunOS:5.*:*) - echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit 0 ;; - *:GNU:*:*) - echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` - exit 0 ;; - i*86:Minix:*:*) - echo ${UNAME_MACHINE}-pc-minix - exit 0 ;; - arm*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu - exit 0 ;; - ia64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu - exit 0 ;; - m68*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu - exit 0 ;; - mips:Linux:*:*) - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c - #undef CPU - #undef mips - #undef mipsel - #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) - CPU=mipsel - #else - #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) - CPU=mips - #else - CPU= - #endif - #endif -EOF - eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=` - rm -f $dummy.c - test x"${CPU}" != x && echo "${CPU}-pc-linux-gnu" && exit 0 - ;; - ppc:Linux:*:*) - echo powerpc-unknown-linux-gnu - exit 0 ;; - ppc64:Linux:*:*) - echo powerpc64-unknown-linux-gnu - exit 0 ;; - alpha:Linux:*:*) - case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in - EV5) UNAME_MACHINE=alphaev5 ;; - EV56) UNAME_MACHINE=alphaev56 ;; - PCA56) UNAME_MACHINE=alphapca56 ;; - PCA57) UNAME_MACHINE=alphapca56 ;; - EV6) UNAME_MACHINE=alphaev6 ;; - EV67) UNAME_MACHINE=alphaev67 ;; - EV68*) UNAME_MACHINE=alphaev68 ;; - esac - objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null - if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi - echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} - exit 0 ;; - parisc:Linux:*:* | hppa:Linux:*:*) - # Look for CPU level - case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in - PA7*) echo hppa1.1-unknown-linux-gnu ;; - PA8*) echo hppa2.0-unknown-linux-gnu ;; - *) echo hppa-unknown-linux-gnu ;; - esac - exit 0 ;; - parisc64:Linux:*:* | hppa64:Linux:*:*) - echo hppa64-unknown-linux-gnu - exit 0 ;; - s390:Linux:*:* | s390x:Linux:*:*) - echo ${UNAME_MACHINE}-ibm-linux - exit 0 ;; - sh*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu - exit 0 ;; - sparc:Linux:*:* | sparc64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu - exit 0 ;; - x86_64:Linux:*:*) - echo x86_64-unknown-linux-gnu - exit 0 ;; - i*86:Linux:*:*) - # The BFD linker knows what the default object file format is, so - # first see if it will tell us. cd to the root directory to prevent - # problems with other programs or directories called `ld' in the path. - # Set LC_ALL=C to ensure ld outputs messages in English. - ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \ - | sed -ne '/supported targets:/!d - s/[ ][ ]*/ /g - s/.*supported targets: *// - s/ .*// - p'` - case "$ld_supported_targets" in - elf32-i386) - TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu" - ;; - a.out-i386-linux) - echo "${UNAME_MACHINE}-pc-linux-gnuaout" - exit 0 ;; - coff-i386) - echo "${UNAME_MACHINE}-pc-linux-gnucoff" - exit 0 ;; - "") - # Either a pre-BFD a.out linker (linux-gnuoldld) or - # one that does not give us useful --help. - echo "${UNAME_MACHINE}-pc-linux-gnuoldld" - exit 0 ;; - esac - # Determine whether the default compiler is a.out or elf - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c - #include - #ifdef __ELF__ - # ifdef __GLIBC__ - # if __GLIBC__ >= 2 - LIBC=gnu - # else - LIBC=gnulibc1 - # endif - # else - LIBC=gnulibc1 - # endif - #else - #ifdef __INTEL_COMPILER - LIBC=gnu - #else - LIBC=gnuaout - #endif - #endif -EOF - eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=` - rm -f $dummy.c - test x"${LIBC}" != x && echo "${UNAME_MACHINE}-pc-linux-${LIBC}" && exit 0 - test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0 - ;; - i*86:DYNIX/ptx:4*:*) - # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. - # earlier versions are messed up and put the nodename in both - # sysname and nodename. - echo i386-sequent-sysv4 - exit 0 ;; - i*86:UNIX_SV:4.2MP:2.*) - # Unixware is an offshoot of SVR4, but it has its own version - # number series starting with 2... - # I am not positive that other SVR4 systems won't match this, - # I just have to hope. -- rms. - # Use sysv4.2uw... so that sysv4* matches it. - echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION} - exit 0 ;; - i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*) - UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'` - if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then - echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL} - else - echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL} - fi - exit 0 ;; - i*86:*:5:[78]*) - case `/bin/uname -X | grep "^Machine"` in - *486*) UNAME_MACHINE=i486 ;; - *Pentium) UNAME_MACHINE=i586 ;; - *Pent*|*Celeron) UNAME_MACHINE=i686 ;; - esac - echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION} - exit 0 ;; - i*86:*:3.2:*) - if test -f /usr/options/cb.name; then - UNAME_REL=`sed -n 's/.*Version //p' /dev/null >/dev/null ; then - UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')` - (/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486 - (/bin/uname -X|grep '^Machine.*Pentium' >/dev/null) \ - && UNAME_MACHINE=i586 - (/bin/uname -X|grep '^Machine.*Pent *II' >/dev/null) \ - && UNAME_MACHINE=i686 - (/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \ - && UNAME_MACHINE=i686 - echo ${UNAME_MACHINE}-pc-sco$UNAME_REL - else - echo ${UNAME_MACHINE}-pc-sysv32 - fi - exit 0 ;; - i*86:*DOS:*:*) - echo ${UNAME_MACHINE}-pc-msdosdjgpp - exit 0 ;; - pc:*:*:*) - # Left here for compatibility: - # uname -m prints for DJGPP always 'pc', but it prints nothing about - # the processor, so we play safe by assuming i386. - echo i386-pc-msdosdjgpp - exit 0 ;; - Intel:Mach:3*:*) - echo i386-pc-mach3 - exit 0 ;; - paragon:*:*:*) - echo i860-intel-osf1 - exit 0 ;; - i860:*:4.*:*) # i860-SVR4 - if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then - echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4 - else # Add other i860-SVR4 vendors below as they are discovered. - echo i860-unknown-sysv${UNAME_RELEASE} # Unknown i860-SVR4 - fi - exit 0 ;; - mini*:CTIX:SYS*5:*) - # "miniframe" - echo m68010-convergent-sysv - exit 0 ;; - M68*:*:R3V[567]*:*) - test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;; - 3[34]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0) - OS_REL='' - test -r /etc/.relid \ - && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` - /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ - && echo i486-ncr-sysv4.3${OS_REL} && exit 0 - /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ - && echo i586-ncr-sysv4.3${OS_REL} && exit 0 ;; - 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*) - /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ - && echo i486-ncr-sysv4 && exit 0 ;; - m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*) - echo m68k-unknown-lynxos${UNAME_RELEASE} - exit 0 ;; - mc68030:UNIX_System_V:4.*:*) - echo m68k-atari-sysv4 - exit 0 ;; - i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*) - echo i386-unknown-lynxos${UNAME_RELEASE} - exit 0 ;; - TSUNAMI:LynxOS:2.*:*) - echo sparc-unknown-lynxos${UNAME_RELEASE} - exit 0 ;; - rs6000:LynxOS:2.*:*) - echo rs6000-unknown-lynxos${UNAME_RELEASE} - exit 0 ;; - PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*) - echo powerpc-unknown-lynxos${UNAME_RELEASE} - exit 0 ;; - SM[BE]S:UNIX_SV:*:*) - echo mips-dde-sysv${UNAME_RELEASE} - exit 0 ;; - RM*:ReliantUNIX-*:*:*) - echo mips-sni-sysv4 - exit 0 ;; - RM*:SINIX-*:*:*) - echo mips-sni-sysv4 - exit 0 ;; - *:SINIX-*:*:*) - if uname -p 2>/dev/null >/dev/null ; then - UNAME_MACHINE=`(uname -p) 2>/dev/null` - echo ${UNAME_MACHINE}-sni-sysv4 - else - echo ns32k-sni-sysv - fi - exit 0 ;; - PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort - # says - echo i586-unisys-sysv4 - exit 0 ;; - *:UNIX_System_V:4*:FTX*) - # From Gerald Hewes . - # How about differentiating between stratus architectures? -djm - echo hppa1.1-stratus-sysv4 - exit 0 ;; - *:*:*:FTX*) - # From seanf@swdc.stratus.com. - echo i860-stratus-sysv4 - exit 0 ;; - *:VOS:*:*) - # From Paul.Green@stratus.com. - echo hppa1.1-stratus-vos - exit 0 ;; - mc68*:A/UX:*:*) - echo m68k-apple-aux${UNAME_RELEASE} - exit 0 ;; - news*:NEWS-OS:6*:*) - echo mips-sony-newsos6 - exit 0 ;; - R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*) - if [ -d /usr/nec ]; then - echo mips-nec-sysv${UNAME_RELEASE} - else - echo mips-unknown-sysv${UNAME_RELEASE} - fi - exit 0 ;; - BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only. - echo powerpc-be-beos - exit 0 ;; - BeMac:BeOS:*:*) # BeOS running on Mac or Mac clone, PPC only. - echo powerpc-apple-beos - exit 0 ;; - BePC:BeOS:*:*) # BeOS running on Intel PC compatible. - echo i586-pc-beos - exit 0 ;; - SX-4:SUPER-UX:*:*) - echo sx4-nec-superux${UNAME_RELEASE} - exit 0 ;; - SX-5:SUPER-UX:*:*) - echo sx5-nec-superux${UNAME_RELEASE} - exit 0 ;; - Power*:Rhapsody:*:*) - echo powerpc-apple-rhapsody${UNAME_RELEASE} - exit 0 ;; - *:Rhapsody:*:*) - echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE} - exit 0 ;; - *:Darwin:*:*) - echo `uname -p`-apple-darwin${UNAME_RELEASE} - exit 0 ;; - *:procnto*:*:* | *:QNX:[0123456789]*:*) - UNAME_PROCESSOR=`uname -p` - if test "$UNAME_PROCESSOR" = "x86"; then - UNAME_PROCESSOR=i386 - UNAME_MACHINE=pc - fi - echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE} - exit 0 ;; - *:QNX:*:4*) - echo i386-pc-qnx - exit 0 ;; - NSR-[GKLNPTVW]:NONSTOP_KERNEL:*:*) - echo nsr-tandem-nsk${UNAME_RELEASE} - exit 0 ;; - *:NonStop-UX:*:*) - echo mips-compaq-nonstopux - exit 0 ;; - BS2000:POSIX*:*:*) - echo bs2000-siemens-sysv - exit 0 ;; - DS/*:UNIX_System_V:*:*) - echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE} - exit 0 ;; - *:Plan9:*:*) - # "uname -m" is not consistent, so use $cputype instead. 386 - # is converted to i386 for consistency with other x86 - # operating systems. - if test "$cputype" = "386"; then - UNAME_MACHINE=i386 - else - UNAME_MACHINE="$cputype" - fi - echo ${UNAME_MACHINE}-unknown-plan9 - exit 0 ;; - i*86:OS/2:*:*) - # If we were able to find `uname', then EMX Unix compatibility - # is probably installed. - echo ${UNAME_MACHINE}-pc-os2-emx - exit 0 ;; - *:TOPS-10:*:*) - echo pdp10-unknown-tops10 - exit 0 ;; - *:TENEX:*:*) - echo pdp10-unknown-tenex - exit 0 ;; - KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*) - echo pdp10-dec-tops20 - exit 0 ;; - XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*) - echo pdp10-xkl-tops20 - exit 0 ;; - *:TOPS-20:*:*) - echo pdp10-unknown-tops20 - exit 0 ;; - *:ITS:*:*) - echo pdp10-unknown-its - exit 0 ;; - i*86:XTS-300:*:STOP) - echo ${UNAME_MACHINE}-unknown-stop - exit 0 ;; - i*86:atheos:*:*) - echo ${UNAME_MACHINE}-unknown-atheos - exit 0 ;; -esac - -#echo '(No uname command or uname output not recognized.)' 1>&2 -#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2 - -eval $set_cc_for_build -cat >$dummy.c < -# include -#endif -main () -{ -#if defined (sony) -#if defined (MIPSEB) - /* BFD wants "bsd" instead of "newsos". Perhaps BFD should be changed, - I don't know.... */ - printf ("mips-sony-bsd\n"); exit (0); -#else -#include - printf ("m68k-sony-newsos%s\n", -#ifdef NEWSOS4 - "4" -#else - "" -#endif - ); exit (0); -#endif -#endif - -#if defined (__arm) && defined (__acorn) && defined (__unix) - printf ("arm-acorn-riscix"); exit (0); -#endif - -#if defined (hp300) && !defined (hpux) - printf ("m68k-hp-bsd\n"); exit (0); -#endif - -#if defined (NeXT) -#if !defined (__ARCHITECTURE__) -#define __ARCHITECTURE__ "m68k" -#endif - int version; - version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`; - if (version < 4) - printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version); - else - printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version); - exit (0); -#endif - -#if defined (MULTIMAX) || defined (n16) -#if defined (UMAXV) - printf ("ns32k-encore-sysv\n"); exit (0); -#else -#if defined (CMU) - printf ("ns32k-encore-mach\n"); exit (0); -#else - printf ("ns32k-encore-bsd\n"); exit (0); -#endif -#endif -#endif - -#if defined (__386BSD__) - printf ("i386-pc-bsd\n"); exit (0); -#endif - -#if defined (sequent) -#if defined (i386) - printf ("i386-sequent-dynix\n"); exit (0); -#endif -#if defined (ns32000) - printf ("ns32k-sequent-dynix\n"); exit (0); -#endif -#endif - -#if defined (_SEQUENT_) - struct utsname un; - - uname(&un); - - if (strncmp(un.version, "V2", 2) == 0) { - printf ("i386-sequent-ptx2\n"); exit (0); - } - if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */ - printf ("i386-sequent-ptx1\n"); exit (0); - } - printf ("i386-sequent-ptx\n"); exit (0); - -#endif - -#if defined (vax) -# if !defined (ultrix) -# include -# if defined (BSD) -# if BSD == 43 - printf ("vax-dec-bsd4.3\n"); exit (0); -# else -# if BSD == 199006 - printf ("vax-dec-bsd4.3reno\n"); exit (0); -# else - printf ("vax-dec-bsd\n"); exit (0); -# endif -# endif -# else - printf ("vax-dec-bsd\n"); exit (0); -# endif -# else - printf ("vax-dec-ultrix\n"); exit (0); -# endif -#endif - -#if defined (alliant) && defined (i860) - printf ("i860-alliant-bsd\n"); exit (0); -#endif - - exit (1); -} -EOF - -$CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy && rm -f $dummy.c $dummy && exit 0 -rm -f $dummy.c $dummy - -# Apollos put the system type in the environment. - -test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit 0; } - -# Convex versions that predate uname can use getsysinfo(1) - -if [ -x /usr/convex/getsysinfo ] -then - case `getsysinfo -f cpu_type` in - c1*) - echo c1-convex-bsd - exit 0 ;; - c2*) - if getsysinfo -f scalar_acc - then echo c32-convex-bsd - else echo c2-convex-bsd - fi - exit 0 ;; - c34*) - echo c34-convex-bsd - exit 0 ;; - c38*) - echo c38-convex-bsd - exit 0 ;; - c4*) - echo c4-convex-bsd - exit 0 ;; - esac -fi - -cat >&2 < in order to provide the needed -information to handle your system. - -config.guess timestamp = $timestamp - -uname -m = `(uname -m) 2>/dev/null || echo unknown` -uname -r = `(uname -r) 2>/dev/null || echo unknown` -uname -s = `(uname -s) 2>/dev/null || echo unknown` -uname -v = `(uname -v) 2>/dev/null || echo unknown` - -/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null` -/bin/uname -X = `(/bin/uname -X) 2>/dev/null` - -hostinfo = `(hostinfo) 2>/dev/null` -/bin/universe = `(/bin/universe) 2>/dev/null` -/usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null` -/bin/arch = `(/bin/arch) 2>/dev/null` -/usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null` -/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null` - -UNAME_MACHINE = ${UNAME_MACHINE} -UNAME_RELEASE = ${UNAME_RELEASE} -UNAME_SYSTEM = ${UNAME_SYSTEM} -UNAME_VERSION = ${UNAME_VERSION} -EOF - -exit 1 - -# Local variables: -# eval: (add-hook 'write-file-hooks 'time-stamp) -# time-stamp-start: "timestamp='" -# time-stamp-format: "%:y-%02m-%02d" -# time-stamp-end: "'" -# End: diff --git a/contrib/amd/config.guess.long b/contrib/amd/config.guess.long deleted file mode 100755 index 24ace2e..0000000 --- a/contrib/amd/config.guess.long +++ /dev/null @@ -1,47 +0,0 @@ -#!/bin/sh -# generate long version of output from config.guess -# part of am-utils-6.x -# Erez Zadok -# -#set -x - -# find a single word that prints the version number of the release -getver () { - l=`head $1` - set $l - for i in $* - do - case "$i" in - # look for one digit followed by a sequence of non-spaces - # so it'll catch 7.3 as well as 2.1AW - *[0-9]* ) echo $i; return ;; - esac - done -} - -if test "x$GCONFIG" = "x" ; then - # find dirname of this script - base=`echo $0 | sed 's/\/[^\/]*$//' 2>/dev/null` - PATH=$base:$PATH - export PATH - GCONFIG=`config.guess || echo unknown-config` -fi -case "${GCONFIG}" in - *linux* ) - GCONFIG=`echo ${GCONFIG} | sed -e 's/i.86/i386/' -e 's/linux-gnu/linux/'` - if test -f /etc/redhat-release ; then - long=`getver /etc/redhat-release` - echo ${GCONFIG}-rh${long} - exit 0 - elif test -f /etc/SuSE-release ; then - long=`getver /etc/SuSE-release` - echo ${GCONFIG}-suse${long} - exit 0 - else - echo ${GCONFIG} - fi - ;; - * ) echo ${GCONFIG} - ;; -esac -exit 0 diff --git a/contrib/amd/config.sub b/contrib/amd/config.sub deleted file mode 100755 index e6eed00..0000000 --- a/contrib/amd/config.sub +++ /dev/null @@ -1,1445 +0,0 @@ -#! /bin/sh -# Configuration validation subroutine script. -# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002 Free Software Foundation, Inc. - -timestamp='2002-06-19' - -# This file is (in principle) common to ALL GNU software. -# The presence of a machine in this file suggests that SOME GNU software -# can handle that machine. It does not imply ALL GNU software can. -# -# This file is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, -# Boston, MA 02111-1307, USA. - -# As a special exception to the GNU General Public License, if you -# distribute this file as part of a program that contains a -# configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that program. - -# Please send patches to . Submit a context -# diff and a properly formatted ChangeLog entry. -# -# Configuration subroutine to validate and canonicalize a configuration type. -# Supply the specified configuration type as an argument. -# If it is invalid, we print an error message on stderr and exit with code 1. -# Otherwise, we print the canonical config type on stdout and succeed. - -# This file is supposed to be the same for all GNU packages -# and recognize all the CPU types, system types and aliases -# that are meaningful with *any* GNU software. -# Each package is responsible for reporting which valid configurations -# it does not support. The user should be able to distinguish -# a failure to support a valid configuration from a meaningless -# configuration. - -# The goal of this file is to map all the various variations of a given -# machine specification into a single specification in the form: -# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM -# or in some cases, the newer four-part form: -# CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM -# It is wrong to echo any other type of specification. - -me=`echo "$0" | sed -e 's,.*/,,'` - -usage="\ -Usage: $0 [OPTION] CPU-MFR-OPSYS - $0 [OPTION] ALIAS - -Canonicalize a configuration name. - -Operation modes: - -h, --help print this help, then exit - -t, --time-stamp print date of last modification, then exit - -v, --version print version number, then exit - -Report bugs and patches to ." - -version="\ -GNU config.sub ($timestamp) - -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 -Free Software Foundation, Inc. - -This is free software; see the source for copying conditions. There is NO -warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." - -help=" -Try \`$me --help' for more information." - -# Parse command line -while test $# -gt 0 ; do - case $1 in - --time-stamp | --time* | -t ) - echo "$timestamp" ; exit 0 ;; - --version | -v ) - echo "$version" ; exit 0 ;; - --help | --h* | -h ) - echo "$usage"; exit 0 ;; - -- ) # Stop option processing - shift; break ;; - - ) # Use stdin as input. - break ;; - -* ) - echo "$me: invalid option $1$help" - exit 1 ;; - - *local*) - # First pass through any local machine types. - echo $1 - exit 0;; - - * ) - break ;; - esac -done - -case $# in - 0) echo "$me: missing argument$help" >&2 - exit 1;; - 1) ;; - *) echo "$me: too many arguments$help" >&2 - exit 1;; -esac - -# Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any). -# Here we must recognize all the valid KERNEL-OS combinations. -maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` -case $maybe_os in - nto-qnx* | linux-gnu* | storm-chaos* | os2-emx* | windows32-* | rtmk-nova*) - os=-$maybe_os - basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` - ;; - *) - basic_machine=`echo $1 | sed 's/-[^-]*$//'` - if [ $basic_machine != $1 ] - then os=`echo $1 | sed 's/.*-/-/'` - else os=; fi - ;; -esac - -### Let's recognize common machines as not being operating systems so -### that things like config.sub decstation-3100 work. We also -### recognize some manufacturers as not being operating systems, so we -### can provide default operating systems below. -case $os in - -sun*os*) - # Prevent following clause from handling this invalid input. - ;; - -dec* | -mips* | -sequent* | -encore* | -pc532* | -sgi* | -sony* | \ - -att* | -7300* | -3300* | -delta* | -motorola* | -sun[234]* | \ - -unicom* | -ibm* | -next | -hp | -isi* | -apollo | -altos* | \ - -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\ - -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \ - -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \ - -apple | -axis) - os= - basic_machine=$1 - ;; - -sim | -cisco | -oki | -wec | -winbond) - os= - basic_machine=$1 - ;; - -scout) - ;; - -wrs) - os=-vxworks - basic_machine=$1 - ;; - -chorusos*) - os=-chorusos - basic_machine=$1 - ;; - -chorusrdb) - os=-chorusrdb - basic_machine=$1 - ;; - -hiux*) - os=-hiuxwe2 - ;; - -sco5) - os=-sco3.2v5 - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -sco4) - os=-sco3.2v4 - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -sco3.2.[4-9]*) - os=`echo $os | sed -e 's/sco3.2./sco3.2v/'` - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -sco3.2v[4-9]*) - # Don't forget version if it is 3.2v4 or newer. - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -sco*) - os=-sco3.2v2 - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -udk*) - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -isc) - os=-isc2.2 - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -clix*) - basic_machine=clipper-intergraph - ;; - -isc*) - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -lynx*) - os=-lynxos - ;; - -ptx*) - basic_machine=`echo $1 | sed -e 's/86-.*/86-sequent/'` - ;; - -windowsnt*) - os=`echo $os | sed -e 's/windowsnt/winnt/'` - ;; - -psos*) - os=-psos - ;; - -mint | -mint[0-9]*) - basic_machine=m68k-atari - os=-mint - ;; -esac - -# Decode aliases for certain CPU-COMPANY combinations. -case $basic_machine in - # Recognize the basic CPU types without company name. - # Some are omitted here because they have special meanings below. - 1750a | 580 \ - | a29k \ - | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ - | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ - | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \ - | c4x | clipper \ - | d10v | d30v | dlx | dsp16xx \ - | fr30 \ - | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ - | i370 | i860 | i960 | ia64 \ - | ip2k \ - | m32r | m68000 | m68k | m88k | mcore \ - | mips | mips16 | mips64 | mips64el | mips64orion | mips64orionel \ - | mips64vr4100 | mips64vr4100el | mips64vr4300 \ - | mips64vr4300el | mips64vr5000 | mips64vr5000el \ - | mipsbe | mipseb | mipsel | mipsle | mipstx39 | mipstx39el \ - | mipsisa32 | mipsisa64 \ - | mn10200 | mn10300 \ - | ns16k | ns32k \ - | openrisc | or32 \ - | pdp10 | pdp11 | pj | pjl \ - | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ - | pyramid \ - | sh | sh[34] | sh[34]eb | shbe | shle | sh64 | sh64le \ - | sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv9 | sparcv9b \ - | strongarm \ - | tahoe | thumb | tic80 | tron \ - | v850 | v850e \ - | we32k \ - | x86 | xscale | xstormy16 | xtensa \ - | z8k) - basic_machine=$basic_machine-unknown - ;; - m6811 | m68hc11 | m6812 | m68hc12) - # Motorola 68HC11/12. - basic_machine=$basic_machine-unknown - os=-none - ;; - m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k) - ;; - - # We use `pc' rather than `unknown' - # because (1) that's what they normally are, and - # (2) the word "unknown" tends to confuse beginning users. - i*86 | x86_64) - basic_machine=$basic_machine-pc - ;; - # Object if more than one company name word. - *-*-*) - echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2 - exit 1 - ;; - # Recognize the basic CPU types with company name. - 580-* \ - | a29k-* \ - | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \ - | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ - | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \ - | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ - | avr-* \ - | bs2000-* \ - | c[123]* | c30-* | [cjt]90-* | c54x-* \ - | clipper-* | cydra-* \ - | d10v-* | d30v-* | dlx-* \ - | elxsi-* \ - | f30[01]-* | f700-* | fr30-* | fx80-* \ - | h8300-* | h8500-* \ - | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ - | i*86-* | i860-* | i960-* | ia64-* \ - | ip2k-* \ - | m32r-* \ - | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ - | m88110-* | m88k-* | mcore-* \ - | mips-* | mips16-* | mips64-* | mips64el-* | mips64orion-* \ - | mips64orionel-* | mips64vr4100-* | mips64vr4100el-* \ - | mips64vr4300-* | mips64vr4300el-* | mipsbe-* | mipseb-* \ - | mipsle-* | mipsel-* | mipstx39-* | mipstx39el-* \ - | none-* | np1-* | ns16k-* | ns32k-* \ - | orion-* \ - | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ - | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \ - | pyramid-* \ - | romp-* | rs6000-* \ - | sh-* | sh[34]-* | sh[34]eb-* | shbe-* | shle-* | sh64-* | sh64le-* \ - | sparc-* | sparc64-* | sparc86x-* | sparclet-* | sparclite-* \ - | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \ - | tahoe-* | thumb-* | tic30-* | tic54x-* | tic80-* | tron-* \ - | v850-* | v850e-* | vax-* \ - | we32k-* \ - | x86-* | x86_64-* | xps100-* | xscale-* | xstormy16-* \ - | xtensa-* \ - | ymp-* \ - | z8k-*) - ;; - # Recognize the various machine names and aliases which stand - # for a CPU type and a company and sometimes even an OS. - 386bsd) - basic_machine=i386-unknown - os=-bsd - ;; - 3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc) - basic_machine=m68000-att - ;; - 3b*) - basic_machine=we32k-att - ;; - a29khif) - basic_machine=a29k-amd - os=-udi - ;; - adobe68k) - basic_machine=m68010-adobe - os=-scout - ;; - alliant | fx80) - basic_machine=fx80-alliant - ;; - altos | altos3068) - basic_machine=m68k-altos - ;; - am29k) - basic_machine=a29k-none - os=-bsd - ;; - amdahl) - basic_machine=580-amdahl - os=-sysv - ;; - amiga | amiga-*) - basic_machine=m68k-unknown - ;; - amigaos | amigados) - basic_machine=m68k-unknown - os=-amigaos - ;; - amigaunix | amix) - basic_machine=m68k-unknown - os=-sysv4 - ;; - apollo68) - basic_machine=m68k-apollo - os=-sysv - ;; - apollo68bsd) - basic_machine=m68k-apollo - os=-bsd - ;; - aux) - basic_machine=m68k-apple - os=-aux - ;; - balance) - basic_machine=ns32k-sequent - os=-dynix - ;; - c90) - basic_machine=c90-cray - os=-unicos - ;; - convex-c1) - basic_machine=c1-convex - os=-bsd - ;; - convex-c2) - basic_machine=c2-convex - os=-bsd - ;; - convex-c32) - basic_machine=c32-convex - os=-bsd - ;; - convex-c34) - basic_machine=c34-convex - os=-bsd - ;; - convex-c38) - basic_machine=c38-convex - os=-bsd - ;; - cray | j90) - basic_machine=j90-cray - os=-unicos - ;; - crds | unos) - basic_machine=m68k-crds - ;; - cris | cris-* | etrax*) - basic_machine=cris-axis - ;; - da30 | da30-*) - basic_machine=m68k-da30 - ;; - decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn) - basic_machine=mips-dec - ;; - decsystem10* | dec10*) - basic_machine=pdp10-dec - os=-tops10 - ;; - decsystem20* | dec20*) - basic_machine=pdp10-dec - os=-tops20 - ;; - delta | 3300 | motorola-3300 | motorola-delta \ - | 3300-motorola | delta-motorola) - basic_machine=m68k-motorola - ;; - delta88) - basic_machine=m88k-motorola - os=-sysv3 - ;; - dpx20 | dpx20-*) - basic_machine=rs6000-bull - os=-bosx - ;; - dpx2* | dpx2*-bull) - basic_machine=m68k-bull - os=-sysv3 - ;; - ebmon29k) - basic_machine=a29k-amd - os=-ebmon - ;; - elxsi) - basic_machine=elxsi-elxsi - os=-bsd - ;; - encore | umax | mmax) - basic_machine=ns32k-encore - ;; - es1800 | OSE68k | ose68k | ose | OSE) - basic_machine=m68k-ericsson - os=-ose - ;; - fx2800) - basic_machine=i860-alliant - ;; - genix) - basic_machine=ns32k-ns - ;; - gmicro) - basic_machine=tron-gmicro - os=-sysv - ;; - go32) - basic_machine=i386-pc - os=-go32 - ;; - h3050r* | hiux*) - basic_machine=hppa1.1-hitachi - os=-hiuxwe2 - ;; - h8300hms) - basic_machine=h8300-hitachi - os=-hms - ;; - h8300xray) - basic_machine=h8300-hitachi - os=-xray - ;; - h8500hms) - basic_machine=h8500-hitachi - os=-hms - ;; - harris) - basic_machine=m88k-harris - os=-sysv3 - ;; - hp300-*) - basic_machine=m68k-hp - ;; - hp300bsd) - basic_machine=m68k-hp - os=-bsd - ;; - hp300hpux) - basic_machine=m68k-hp - os=-hpux - ;; - hp3k9[0-9][0-9] | hp9[0-9][0-9]) - basic_machine=hppa1.0-hp - ;; - hp9k2[0-9][0-9] | hp9k31[0-9]) - basic_machine=m68000-hp - ;; - hp9k3[2-9][0-9]) - basic_machine=m68k-hp - ;; - hp9k6[0-9][0-9] | hp6[0-9][0-9]) - basic_machine=hppa1.0-hp - ;; - hp9k7[0-79][0-9] | hp7[0-79][0-9]) - basic_machine=hppa1.1-hp - ;; - hp9k78[0-9] | hp78[0-9]) - # FIXME: really hppa2.0-hp - basic_machine=hppa1.1-hp - ;; - hp9k8[67]1 | hp8[67]1 | hp9k80[24] | hp80[24] | hp9k8[78]9 | hp8[78]9 | hp9k893 | hp893) - # FIXME: really hppa2.0-hp - basic_machine=hppa1.1-hp - ;; - hp9k8[0-9][13679] | hp8[0-9][13679]) - basic_machine=hppa1.1-hp - ;; - hp9k8[0-9][0-9] | hp8[0-9][0-9]) - basic_machine=hppa1.0-hp - ;; - hppa-next) - os=-nextstep3 - ;; - hppaosf) - basic_machine=hppa1.1-hp - os=-osf - ;; - hppro) - basic_machine=hppa1.1-hp - os=-proelf - ;; - i370-ibm* | ibm*) - basic_machine=i370-ibm - ;; -# I'm not sure what "Sysv32" means. Should this be sysv3.2? - i*86v32) - basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` - os=-sysv32 - ;; - i*86v4*) - basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` - os=-sysv4 - ;; - i*86v) - basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` - os=-sysv - ;; - i*86sol2) - basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` - os=-solaris2 - ;; - i386mach) - basic_machine=i386-mach - os=-mach - ;; - i386-vsta | vsta) - basic_machine=i386-unknown - os=-vsta - ;; - iris | iris4d) - basic_machine=mips-sgi - case $os in - -irix*) - ;; - *) - os=-irix4 - ;; - esac - ;; - isi68 | isi) - basic_machine=m68k-isi - os=-sysv - ;; - m88k-omron*) - basic_machine=m88k-omron - ;; - magnum | m3230) - basic_machine=mips-mips - os=-sysv - ;; - merlin) - basic_machine=ns32k-utek - os=-sysv - ;; - mingw32) - basic_machine=i386-pc - os=-mingw32 - ;; - miniframe) - basic_machine=m68000-convergent - ;; - *mint | -mint[0-9]* | *MiNT | *MiNT[0-9]*) - basic_machine=m68k-atari - os=-mint - ;; - mips3*-*) - basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'` - ;; - mips3*) - basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown - ;; - mmix*) - basic_machine=mmix-knuth - os=-mmixware - ;; - monitor) - basic_machine=m68k-rom68k - os=-coff - ;; - morphos) - basic_machine=powerpc-unknown - os=-morphos - ;; - msdos) - basic_machine=i386-pc - os=-msdos - ;; - mvs) - basic_machine=i370-ibm - os=-mvs - ;; - ncr3000) - basic_machine=i486-ncr - os=-sysv4 - ;; - netbsd386) - basic_machine=i386-unknown - os=-netbsd - ;; - netwinder) - basic_machine=armv4l-rebel - os=-linux - ;; - news | news700 | news800 | news900) - basic_machine=m68k-sony - os=-newsos - ;; - news1000) - basic_machine=m68030-sony - os=-newsos - ;; - news-3600 | risc-news) - basic_machine=mips-sony - os=-newsos - ;; - necv70) - basic_machine=v70-nec - os=-sysv - ;; - next | m*-next ) - basic_machine=m68k-next - case $os in - -nextstep* ) - ;; - -ns2*) - os=-nextstep2 - ;; - *) - os=-nextstep3 - ;; - esac - ;; - nh3000) - basic_machine=m68k-harris - os=-cxux - ;; - nh[45]000) - basic_machine=m88k-harris - os=-cxux - ;; - nindy960) - basic_machine=i960-intel - os=-nindy - ;; - mon960) - basic_machine=i960-intel - os=-mon960 - ;; - nonstopux) - basic_machine=mips-compaq - os=-nonstopux - ;; - np1) - basic_machine=np1-gould - ;; - nsr-tandem) - basic_machine=nsr-tandem - ;; - op50n-* | op60c-*) - basic_machine=hppa1.1-oki - os=-proelf - ;; - or32 | or32-*) - basic_machine=or32-unknown - os=-coff - ;; - OSE68000 | ose68000) - basic_machine=m68000-ericsson - os=-ose - ;; - os68k) - basic_machine=m68k-none - os=-os68k - ;; - pa-hitachi) - basic_machine=hppa1.1-hitachi - os=-hiuxwe2 - ;; - paragon) - basic_machine=i860-intel - os=-osf - ;; - pbd) - basic_machine=sparc-tti - ;; - pbb) - basic_machine=m68k-tti - ;; - pc532 | pc532-*) - basic_machine=ns32k-pc532 - ;; - pentium | p5 | k5 | k6 | nexgen | viac3) - basic_machine=i586-pc - ;; - pentiumpro | p6 | 6x86 | athlon) - basic_machine=i686-pc - ;; - pentiumii | pentium2) - basic_machine=i686-pc - ;; - pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*) - basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - pentiumpro-* | p6-* | 6x86-* | athlon-*) - basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - pentiumii-* | pentium2-*) - basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - pn) - basic_machine=pn-gould - ;; - power) basic_machine=power-ibm - ;; - ppc) basic_machine=powerpc-unknown - ;; - ppc-*) basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - ppcle | powerpclittle | ppc-le | powerpc-little) - basic_machine=powerpcle-unknown - ;; - ppcle-* | powerpclittle-*) - basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - ppc64) basic_machine=powerpc64-unknown - ;; - ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - ppc64le | powerpc64little | ppc64-le | powerpc64-little) - basic_machine=powerpc64le-unknown - ;; - ppc64le-* | powerpc64little-*) - basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - ps2) - basic_machine=i386-ibm - ;; - pw32) - basic_machine=i586-unknown - os=-pw32 - ;; - rom68k) - basic_machine=m68k-rom68k - os=-coff - ;; - rm[46]00) - basic_machine=mips-siemens - ;; - rtpc | rtpc-*) - basic_machine=romp-ibm - ;; - s390 | s390-*) - basic_machine=s390-ibm - ;; - s390x | s390x-*) - basic_machine=s390x-ibm - ;; - sa29200) - basic_machine=a29k-amd - os=-udi - ;; - sequent) - basic_machine=i386-sequent - ;; - sh) - basic_machine=sh-hitachi - os=-hms - ;; - sparclite-wrs | simso-wrs) - basic_machine=sparclite-wrs - os=-vxworks - ;; - sps7) - basic_machine=m68k-bull - os=-sysv2 - ;; - spur) - basic_machine=spur-unknown - ;; - st2000) - basic_machine=m68k-tandem - ;; - stratus) - basic_machine=i860-stratus - os=-sysv4 - ;; - sun2) - basic_machine=m68000-sun - ;; - sun2os3) - basic_machine=m68000-sun - os=-sunos3 - ;; - sun2os4) - basic_machine=m68000-sun - os=-sunos4 - ;; - sun3os3) - basic_machine=m68k-sun - os=-sunos3 - ;; - sun3os4) - basic_machine=m68k-sun - os=-sunos4 - ;; - sun4os3) - basic_machine=sparc-sun - os=-sunos3 - ;; - sun4os4) - basic_machine=sparc-sun - os=-sunos4 - ;; - sun4sol2) - basic_machine=sparc-sun - os=-solaris2 - ;; - sun3 | sun3-*) - basic_machine=m68k-sun - ;; - sun4) - basic_machine=sparc-sun - ;; - sun386 | sun386i | roadrunner) - basic_machine=i386-sun - ;; - sv1) - basic_machine=sv1-cray - os=-unicos - ;; - symmetry) - basic_machine=i386-sequent - os=-dynix - ;; - t3d) - basic_machine=alpha-cray - os=-unicos - ;; - t3e) - basic_machine=alphaev5-cray - os=-unicos - ;; - t90) - basic_machine=t90-cray - os=-unicos - ;; - tic54x | c54x*) - basic_machine=tic54x-unknown - os=-coff - ;; - tx39) - basic_machine=mipstx39-unknown - ;; - tx39el) - basic_machine=mipstx39el-unknown - ;; - toad1) - basic_machine=pdp10-xkl - os=-tops20 - ;; - tower | tower-32) - basic_machine=m68k-ncr - ;; - udi29k) - basic_machine=a29k-amd - os=-udi - ;; - ultra3) - basic_machine=a29k-nyu - os=-sym1 - ;; - v810 | necv810) - basic_machine=v810-nec - os=-none - ;; - vaxv) - basic_machine=vax-dec - os=-sysv - ;; - vms) - basic_machine=vax-dec - os=-vms - ;; - vpp*|vx|vx-*) - basic_machine=f301-fujitsu - ;; - vxworks960) - basic_machine=i960-wrs - os=-vxworks - ;; - vxworks68) - basic_machine=m68k-wrs - os=-vxworks - ;; - vxworks29k) - basic_machine=a29k-wrs - os=-vxworks - ;; - w65*) - basic_machine=w65-wdc - os=-none - ;; - w89k-*) - basic_machine=hppa1.1-winbond - os=-proelf - ;; - windows32) - basic_machine=i386-pc - os=-windows32-msvcrt - ;; - xps | xps100) - basic_machine=xps100-honeywell - ;; - ymp) - basic_machine=ymp-cray - os=-unicos - ;; - z8k-*-coff) - basic_machine=z8k-unknown - os=-sim - ;; - none) - basic_machine=none-none - os=-none - ;; - -# Here we handle the default manufacturer of certain CPU types. It is in -# some cases the only manufacturer, in others, it is the most popular. - w89k) - basic_machine=hppa1.1-winbond - ;; - op50n) - basic_machine=hppa1.1-oki - ;; - op60c) - basic_machine=hppa1.1-oki - ;; - romp) - basic_machine=romp-ibm - ;; - rs6000) - basic_machine=rs6000-ibm - ;; - vax) - basic_machine=vax-dec - ;; - pdp10) - # there are many clones, so DEC is not a safe bet - basic_machine=pdp10-unknown - ;; - pdp11) - basic_machine=pdp11-dec - ;; - we32k) - basic_machine=we32k-att - ;; - sh3 | sh4 | sh3eb | sh4eb) - basic_machine=sh-unknown - ;; - sh64) - basic_machine=sh64-unknown - ;; - sparc | sparcv9 | sparcv9b) - basic_machine=sparc-sun - ;; - cydra) - basic_machine=cydra-cydrome - ;; - orion) - basic_machine=orion-highlevel - ;; - orion105) - basic_machine=clipper-highlevel - ;; - mac | mpw | mac-mpw) - basic_machine=m68k-apple - ;; - pmac | pmac-mpw) - basic_machine=powerpc-apple - ;; - c4x*) - basic_machine=c4x-none - os=-coff - ;; - *-unknown) - # Make sure to match an already-canonicalized machine name. - ;; - *) - echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2 - exit 1 - ;; -esac - -# Here we canonicalize certain aliases for manufacturers. -case $basic_machine in - *-digital*) - basic_machine=`echo $basic_machine | sed 's/digital.*/dec/'` - ;; - *-commodore*) - basic_machine=`echo $basic_machine | sed 's/commodore.*/cbm/'` - ;; - *) - ;; -esac - -# Decode manufacturer-specific aliases for certain operating systems. - -if [ x"$os" != x"" ] -then -case $os in - # First match some system type aliases - # that might get confused with valid system types. - # -solaris* is a basic system type, with this one exception. - -solaris1 | -solaris1.*) - os=`echo $os | sed -e 's|solaris1|sunos4|'` - ;; - -solaris) - os=-solaris2 - ;; - -svr4*) - os=-sysv4 - ;; - -unixware*) - os=-sysv4.2uw - ;; - -gnu/linux*) - os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'` - ;; - # First accept the basic system types. - # The portable systems comes first. - # Each alternative MUST END IN A *, to match a version number. - # -sysv* is not here because it comes later, after sysvr4. - -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \ - | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\ - | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \ - | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \ - | -aos* \ - | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ - | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ - | -hiux* | -386bsd* | -netbsd* | -openbsd* | -freebsd* | -riscix* \ - | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ - | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ - | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ - | -chorusos* | -chorusrdb* \ - | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ - | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \ - | -interix* | -uwin* | -rhapsody* | -darwin* | -opened* \ - | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ - | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \ - | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ - | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* | -powermax*) - # Remember, each alternative MUST END IN *, to match a version number. - ;; - -qnx*) - case $basic_machine in - x86-* | i*86-*) - ;; - *) - os=-nto$os - ;; - esac - ;; - -nto*) - os=-nto-qnx - ;; - -sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \ - | -windows* | -osx | -abug | -netware* | -os9* | -beos* \ - | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*) - ;; - -mac*) - os=`echo $os | sed -e 's|mac|macos|'` - ;; - -linux*) - os=`echo $os | sed -e 's|linux|linux-gnu|'` - ;; - -sunos5*) - os=`echo $os | sed -e 's|sunos5|solaris2|'` - ;; - -sunos6*) - os=`echo $os | sed -e 's|sunos6|solaris3|'` - ;; - -opened*) - os=-openedition - ;; - -wince*) - os=-wince - ;; - -osfrose*) - os=-osfrose - ;; - -osf*) - os=-osf - ;; - -utek*) - os=-bsd - ;; - -dynix*) - os=-bsd - ;; - -acis*) - os=-aos - ;; - -atheos*) - os=-atheos - ;; - -386bsd) - os=-bsd - ;; - -ctix* | -uts*) - os=-sysv - ;; - -nova*) - os=-rtmk-nova - ;; - -ns2 ) - os=-nextstep2 - ;; - -nsk*) - os=-nsk - ;; - # Preserve the version number of sinix5. - -sinix5.*) - os=`echo $os | sed -e 's|sinix|sysv|'` - ;; - -sinix*) - os=-sysv4 - ;; - -triton*) - os=-sysv3 - ;; - -oss*) - os=-sysv3 - ;; - -svr4) - os=-sysv4 - ;; - -svr3) - os=-sysv3 - ;; - -sysvr4) - os=-sysv4 - ;; - # This must come after -sysvr4. - -sysv*) - ;; - -ose*) - os=-ose - ;; - -es1800*) - os=-ose - ;; - -xenix) - os=-xenix - ;; - -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*) - os=-mint - ;; - -none) - ;; - *) - # Get rid of the `-' at the beginning of $os. - os=`echo $os | sed 's/[^-]*-//'` - echo Invalid configuration \`$1\': system \`$os\' not recognized 1>&2 - exit 1 - ;; -esac -else - -# Here we handle the default operating systems that come with various machines. -# The value should be what the vendor currently ships out the door with their -# machine or put another way, the most popular os provided with the machine. - -# Note that if you're going to try to match "-MANUFACTURER" here (say, -# "-sun"), then you have to tell the case statement up towards the top -# that MANUFACTURER isn't an operating system. Otherwise, code above -# will signal an error saying that MANUFACTURER isn't an operating -# system, and we'll never get to this point. - -case $basic_machine in - *-acorn) - os=-riscix1.2 - ;; - arm*-rebel) - os=-linux - ;; - arm*-semi) - os=-aout - ;; - # This must come before the *-dec entry. - pdp10-*) - os=-tops20 - ;; - pdp11-*) - os=-none - ;; - *-dec | vax-*) - os=-ultrix4.2 - ;; - m68*-apollo) - os=-domain - ;; - i386-sun) - os=-sunos4.0.2 - ;; - m68000-sun) - os=-sunos3 - # This also exists in the configure program, but was not the - # default. - # os=-sunos4 - ;; - m68*-cisco) - os=-aout - ;; - mips*-cisco) - os=-elf - ;; - mips*-*) - os=-elf - ;; - or32-*) - os=-coff - ;; - *-tti) # must be before sparc entry or we get the wrong os. - os=-sysv3 - ;; - sparc-* | *-sun) - os=-sunos4.1.1 - ;; - *-be) - os=-beos - ;; - *-ibm) - os=-aix - ;; - *-wec) - os=-proelf - ;; - *-winbond) - os=-proelf - ;; - *-oki) - os=-proelf - ;; - *-hp) - os=-hpux - ;; - *-hitachi) - os=-hiux - ;; - i860-* | *-att | *-ncr | *-altos | *-motorola | *-convergent) - os=-sysv - ;; - *-cbm) - os=-amigaos - ;; - *-dg) - os=-dgux - ;; - *-dolphin) - os=-sysv3 - ;; - m68k-ccur) - os=-rtu - ;; - m88k-omron*) - os=-luna - ;; - *-next ) - os=-nextstep - ;; - *-sequent) - os=-ptx - ;; - *-crds) - os=-unos - ;; - *-ns) - os=-genix - ;; - i370-*) - os=-mvs - ;; - *-next) - os=-nextstep3 - ;; - *-gould) - os=-sysv - ;; - *-highlevel) - os=-bsd - ;; - *-encore) - os=-bsd - ;; - *-sgi) - os=-irix - ;; - *-siemens) - os=-sysv4 - ;; - *-masscomp) - os=-rtu - ;; - f30[01]-fujitsu | f700-fujitsu) - os=-uxpv - ;; - *-rom68k) - os=-coff - ;; - *-*bug) - os=-coff - ;; - *-apple) - os=-macos - ;; - *-atari*) - os=-mint - ;; - *) - os=-none - ;; -esac -fi - -# Here we handle the case where we know the os, and the CPU type, but not the -# manufacturer. We pick the logical manufacturer. -vendor=unknown -case $basic_machine in - *-unknown) - case $os in - -riscix*) - vendor=acorn - ;; - -sunos*) - vendor=sun - ;; - -aix*) - vendor=ibm - ;; - -beos*) - vendor=be - ;; - -hpux*) - vendor=hp - ;; - -mpeix*) - vendor=hp - ;; - -hiux*) - vendor=hitachi - ;; - -unos*) - vendor=crds - ;; - -dgux*) - vendor=dg - ;; - -luna*) - vendor=omron - ;; - -genix*) - vendor=ns - ;; - -mvs* | -opened*) - vendor=ibm - ;; - -ptx*) - vendor=sequent - ;; - -vxsim* | -vxworks* | -windiss*) - vendor=wrs - ;; - -aux*) - vendor=apple - ;; - -hms*) - vendor=hitachi - ;; - -mpw* | -macos*) - vendor=apple - ;; - -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*) - vendor=atari - ;; - -vos*) - vendor=stratus - ;; - esac - basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"` - ;; -esac - -echo $basic_machine$os -exit 0 - -# Local variables: -# eval: (add-hook 'write-file-hooks 'time-stamp) -# time-stamp-start: "timestamp='" -# time-stamp-format: "%:y-%02m-%02d" -# time-stamp-end: "'" -# End: diff --git a/contrib/amd/configure.in b/contrib/amd/configure.in deleted file mode 100644 index 57943ba..0000000 --- a/contrib/amd/configure.in +++ /dev/null @@ -1,1107 +0,0 @@ -dnl configure.in file for am-utils-6.x -dnl Contains general GNU-autoconf macros. -dnl Author: Erez Zadok -dnl -dnl ###################################################################### -dnl UNCOMMENT THE NEXT FEW LINES FOR DEBUGGING CONFIGURE -dnl define([AC_CACHE_LOAD], )dnl -dnl define([AC_CACHE_SAVE], )dnl -dnl ====================================================================== - -dnl ###################################################################### -dnl INITIALIZATION -dnl AC_INIT -dnl new init style: PACKAGE, VERSION, BUG-REPORTING-ADDRESS -AC_INIT([am-utils],[6.0-20030828],[amd-dev@am-utils.org]) -AC_MSG_NOTICE(*** INITIALIZATION ***) -AC_CONFIG_SRCDIR([amd/amd.c]) -AM_CONFIG_HEADER(config.h) -AH_TOP([ -/* - * Start of am-utils-6.x config.h file. - * Erez Zadok - * - * DO NOT EDIT BY HAND. - * Note: generated by autoheader from configure.in. - */ - -#ifndef _CONFIG_H -#define _CONFIG_H -]) -dnl add actual "#undef" commands into m4/macros/header_templates.m4 -AH_BOTTOM([ -/****************************************************************************/ -/*** INCLUDE localconfig.h if it exists, to allow users to make some ***/ -/*** compile time configuration changes. ***/ -/****************************************************************************/ -/* does a local configuration file exist? */ -#undef HAVE_LOCALCONFIG_H -#ifdef HAVE_LOCALCONFIG_H -# include -#endif /* HAVE_LOCALCONFIG_H */ - -#endif /* not _CONFIG_H */ - -/* - * Local Variables: - * mode: c - * End: - */ - -/* End of am-utils-6.x config.h file */ -]) -dnl -dnl AC_CONFIG_AUX_DIR(m4) -AC_PREREQ(2.52) -AC_REVISION($Revision: 1.1.2.39 $) -AC_COPYRIGHT([Copyright (c) 1997-2003 Erez Zadok]) -dnl find out system type -AC_MSG_NOTICE(*** SYSTEM TYPES ***) -dnl run by libtool, but must be kept here because HOST_MACROS depends on it -AC_CANONICAL_HOST -AMU_HOST_MACROS -dnl ====================================================================== - -dnl ###################################################################### -dnl PACKAGE NAME AND VERSION -AC_MSG_NOTICE(*** PACKAGE NAME AND VERSION ***) -AMU_PACKAGE_NAME($PACKAGE_NAME) -AMU_PACKAGE_VERSION($PACKAGE_VERSION) -AMU_PACKAGE_BUGREPORT($PACKAGE_BUGREPORT) -AM_INIT_AUTOMAKE($PACKAGE_NAME, $PACKAGE_VERSION) -dnl SET (shared) library version. Update it only before major release! -dnl Clarification: -dnl The major number should change when an incompatible change is made to -dnl the API; the minor number should change when an API is added; the patch -dnl level should change when an internal implementation change is made that -dnl does not affect the API. -dnl -dnl In other words: if the major changes, the library is incompatible with -dnl older ones; if the minor changes, the library is backwards compatible -dnl with libraries using the same major; if the patchlevel changes, the -dnl library is backward and forward compatible with libraries using the same -dnl major and minor. -dnl -dnl For sanity, the lower numbers should be set to 0 when a higher number -dnl is changed. -dnl version info for am-utils-6.0.2: 3:2:1 -dnl version info for am-utils-6.0.3: 4:0:2 -dnl version info for am-utils-6.0.4: 4:1:2 -dnl version info for am-utils-6.0.5: 4:2:2 -dnl version info for am-utils-6.0.[67]: 4:3:2 -dnl version info for am-utils-6.0.8: 4:4:2 -LIBTOOL_LDFLAGS="-version-info 4:5:2" -AC_SUBST(LIBTOOL_LDFLAGS) -dnl ====================================================================== - -dnl ###################################################################### -dnl OPTION PROCESSING -AC_MSG_NOTICE(*** OPTION PROCESSING ***) -dnl Do we want LDAP support ? -AMU_WITH_ADDON(ldap, LDAP) -dnl Do we want HESIOD support ? -AMU_WITH_ADDON(hesiod, HESIOD) -dnl Debugging options (yes, mem, or no) -AMU_OPT_DEBUG -dnl additional preprocessor options for configuration/compilation -AMU_OPT_CPPFLAGS -dnl additional linker -l options for configuration/compilation -AMU_OPT_LIBS -dnl additional linker -L options for configuration/compilation -AMU_OPT_LDFLAGS -dnl Which options to add to CFLAGS for compilation only? -AMU_OPT_AMU_CFLAGS -dnl check if a local configuration file exists -AMU_LOCALCONFIG -dnl turn off maintainer-mode Makefile rules, unless using --enable-maintainer-mode -AM_MAINTAINER_MODE -dnl ====================================================================== - -dnl ###################################################################### -dnl ALTERNATIVE PROGRAMS -dnl Part 1: these are required before "unix variants" -dnl ====================================================================== -dnl Particular Program Checks -AC_MSG_NOTICE(*** PARTICULAR PROGRAMS (part 1) ***) -dnl AC-PROG-LIBTOOL will run this, but we need this to squelch warnings -dnl from autoconf about AMU_TRY_COMPILE running before AC_AIX/AC_ISC_POSIX -AC_PROG_CC -AC_PROG_CPP -AC_PROG_CC_C_O -AC_PROG_GCC_TRADITIONAL -AC_PROG_MAKE_SET -AC_ISC_POSIX -AC_AIX -dnl XXX: available in autoconf-2.14 -dnl AC_PROG_CC_STDC -dnl ====================================================================== - -dnl ###################################################################### -AC_MSG_NOTICE(*** LIBTOOL ***) -dnl my version of prog_libtool will not build shared by default -dnl AM_PROG_LIBTOOL2 -dnl build static libraries by default -AC_DISABLE_SHARED -dnl XXX: for autoconf-2.14: use AC_PROG_LIBTOOL, not AM_PROG_LIBTOOL -case ${host_os} in - # Temporarily undo renaming of "linux-gnu" to "linux", because - # libtool only looks for "linux-gnu". Sigh. - linux ) host_os=linux-gnu ;; -esac -dnl this line must appear only once and on its own line -dnl (hence the double case statements above and below) -AC_PROG_LIBTOOL -case ${host_os} in - # end temporary renaming of "linux-gnu" to "linux" - linux-gnu ) host_os=linux ;; -esac -dnl ====================================================================== - -dnl ###################################################################### -dnl ADDITIONAL OPTION PROCESSING (must be done after CC is defined) -AC_MSG_NOTICE(*** EXTRA OPTION PROCESSING ***) -AMU_OS_CPPFLAGS -AMU_OS_CFLAGS -AMU_OS_LDFLAGS -dnl ====================================================================== - -dnl ###################################################################### -dnl Some of these macros must be called before any call to the C compiler -AC_MSG_NOTICE(*** UNIX VARIANTS ***) -dnl UNIX VARIANTS -dnl AC_AIX -dnl AC_ISC_POSIX -AMU_LINUX_HEADERS -dnl ====================================================================== - -dnl ###################################################################### -dnl ALTERNATIVE PROGRAMS -dnl Part 2: these are required after "unix variants" -dnl ====================================================================== -dnl Particular Program Checks (part 2) -AC_MSG_NOTICE(*** PARTICULAR PROGRAMS (part 2) ***) -AC_PROG_INSTALL -dnl the next two are run or supported natively by libtool -dnl AC_PROG_LN_S -dnl AC_PROG_RANLIB -AC_PROG_YACC -AM_PROG_LEX - -dnl ====================================================================== -dnl Generic Program Checks -AC_MSG_NOTICE(*** GENERIC PROGRAMS ***) -AC_PATH_PROGS(AR, ar, :) -AC_PATH_PROGS(PERL, perl5 perl4 perl, /usr/bin/perl) -dnl ====================================================================== - -dnl ###################################################################### -dnl LIBRARY FILES -dnl ====================================================================== -dnl Note that the configuration order of libraries is in reverse of linkage -dnl for example, linking of the first two is -lc -lnsl. -AC_MSG_NOTICE(*** LIBRARY FILES ***) - -dnl libnsl/libsocket are needed only on solaris and some svr4 systems. -dnl Using a typical macro has proven unsuccesful, because on some other -dnl systems such as irix, including libnsl and or libsocket actually breaks -dnl lots of code. So I am forced to use a special purpose macro that sets -dnl the libraries based on the OS. Sigh. -Erez. -AMU_CHECK_OS_LIBS - -dnl librpc and librpcsvc are needed on Solaris (I think) -AC_CHECK_LIB(rpc, clnt_sperrno) -AC_CHECK_LIB(rpcsvc, xdr_fhandle) -dnl Linux RedHat 5.1 puts yp functions only in libnsl (libnsl broken on aix) -AC_CHECK_FUNC(yp_all,,AC_CHECK_LIB(nsl, yp_all)) - -dnl hesiod library may not link unless libresolv is included -if test "$with_hesiod" = "yes"; then -AMU_CHECK_LIB2(hesiod, hes_init,,, -lresolv) -fi -if test "$with_ldap" = "yes"; then -AMU_CHECK_LIB2(ldap, ldap_open,,, -llber) -fi - -dnl Digital UNIX V4.0 and Solaris 7 have POSIX.1c functions in -lrt -dnl Solaris 2.6 only has -lposix4; in Solaris 7, this is a symlink to -lrt, -dnl so only use one of them -case "$ac_cv_opt_debug" in -yes | mem ) - AC_CHECK_LIB(rt, clock_gettime,, AC_CHECK_LIB(posix4, clock_gettime)) - ;; -esac - -dnl some systems replaced old ndbm.h include with GNU ndbm.h, which requires -dnl libgdbm for dbm_pagfno, so check for this. -AC_MSG_CHECKING(for GNU ndbm.h) -AC_TRY_LINK([#include ], [ -DBM *db; -dbm_pagfno(db); -], AC_MSG_RESULT(no), AC_CHECK_LIB(gdbm, dbm_pagfno)) -dnl ====================================================================== - -dnl ###################################################################### -dnl LIBRARY FUNCTIONS -dnl ====================================================================== -dnl Particular Function Checks -AC_MSG_NOTICE(*** PARTICULAR LIBRARY FUNCTIONS ***) -AC_FUNC_ALLOCA -dnl This GETMNTENT test will add -lgen to LIBS if needed. We may need it -dnl if we have to build am-utils on Irix 4, PTX, or Unixware. -dnl AC_FUNC_GETMNTENT -AMU_FUNC_BAD_MEMCMP -AMU_FUNC_BAD_YP_ALL -AC_FUNC_FORK([]) -AC_FUNC_WAIT3 -AC_FUNC_GETPGRP -AC_FUNC_SETPGRP -dnl ====================================================================== -dnl Generic Function Checks -AC_MSG_NOTICE(*** GENERIC LIBRARY FUNCTIONS ***) -AC_CHECK_FUNCS( \ - __seterr_reply \ - _seterr_reply \ - bcmp \ - bcopy \ - bzero \ - clnt_create \ - clnt_create_timed \ - clnt_spcreateerror \ - clock_gettime \ - cnodeid \ - dg_mount \ - flock \ - fsmount \ - get_myaddress \ - getccent \ - getcwd \ - getdomainname \ - getdtablesize \ - gethostname \ - getifaddrs \ - getmntinfo \ - getmountent \ - getpagesize \ - gettimeofday \ - hasmntopt \ - hes_init \ - hesiod_init \ - hesiod_reload \ - hesiod_to_bind \ - ldap_open \ - ldap_enable_cache \ - memcmp \ - memcpy \ - memmove \ - memset \ - mkdir \ - mkstemp \ - mntctl \ - mlockall \ - mount \ - mountsyscall \ - plock \ - regcomp \ - regexec \ - rmdir \ - select \ - seteuid \ - setitimer \ - setresuid \ - setsid \ - sigaction \ - signal \ - socket \ - strchr \ - strcspn \ - strcasecmp \ - strdup \ - strerror \ - strspn \ - strstr \ - svc_getreq \ - svc_getreqset \ - sysfs \ - syslog \ - uname \ - umount \ - unmount \ - uvmount \ - vfork \ - vfsmount \ - vmount \ - vsnprintf \ - wait3 \ - waitpid \ - ) -AC_REPLACE_FUNCS( \ - clnt_sperrno \ - hasmntopt \ - strcasecmp \ - strdup \ - strerror \ - strstr \ - ualarm \ - ) -dnl all xdr_* functions are implemented in libamu/xdr_func.c -AC_CHECK_FUNCS( \ - xdr_attrstat \ - xdr_createargs \ - xdr_dirlist \ - xdr_diropargs \ - xdr_diropokres \ - xdr_diropres \ - xdr_dirpath \ - xdr_entry \ - xdr_exportnode \ - xdr_exports \ - xdr_fattr \ - xdr_fhandle \ - xdr_fhstatus \ - xdr_filename \ - xdr_ftype \ - xdr_groupnode \ - xdr_groups \ - xdr_linkargs \ - xdr_mountbody \ - xdr_mountlist \ - xdr_mountres3 \ - xdr_name \ - xdr_nfs_fh \ - xdr_nfscookie \ - xdr_nfspath \ - xdr_nfsstat \ - xdr_nfstime \ - xdr_pointer \ - xdr_readargs \ - xdr_readdirargs \ - xdr_readdirres \ - xdr_readlinkres \ - xdr_readokres \ - xdr_readres \ - xdr_renameargs \ - xdr_sattr \ - xdr_sattrargs \ - xdr_statfsokres \ - xdr_statfsres \ - xdr_symlinkargs \ - xdr_writeargs \ - ) -dnl ====================================================================== - -dnl ********* -AMU_SAVE_STATE -dnl ********* - -dnl ###################################################################### -dnl HEADER FILES -dnl ====================================================================== -dnl Particular Header Checks -AC_MSG_NOTICE(*** PARTICULAR HEADER FILES ***) -AC_HEADER_DIRENT -AC_HEADER_STDC -AC_HEADER_SYS_WAIT -dnl ====================================================================== -dnl Generic Header Checks -AC_MSG_NOTICE(*** GENERIC HEADER FILES ***) -AC_CHECK_HEADERS( \ - arpa/nameser.h \ - arpa/inet.h \ - bsd/rpc/rpc.h \ - cdfs/cdfsmount.h \ - cdfs/cdfs_mount.h \ - db1/ndbm.h \ - hsfs/hsfs.h \ - isofs/cd9660/cd9660_mount.h \ - linux/auto_fs.h \ - linux/auto_fs4.h \ - linux/fs.h \ - linux/kdev_t.h \ - linux/list.h \ - linux/loop.h \ - linux/nfs.h \ - linux/nfs_mount.h \ - linux/posix_types.h \ - machine/endian.h \ - msdosfs/msdosfsmount.h \ - net/errno.h \ - net/if.h \ - net/if_var.h \ - net/route.h \ - netinet/if_ether.h \ - netinet/in.h \ - nfs/export.h \ - nfs/mount.h \ - nfs/nfs.h \ - nfs/nfs_clnt.h \ - nfs/nfs_gfs.h \ - nfs/nfs_mount.h \ - nfs/nfsmount.h \ - nfs/nfsproto.h \ - nfs/nfsv2.h \ - nfs/pathconf.h \ - nfs/rpcv2.h \ - nfsclient/nfsargs.h \ - rpc/auth_des.h \ - rpc/pmap_clnt.h \ - rpc/pmap_prot.h \ - rpc/rpc.h \ - rpc/types.h \ - rpc/xdr.h \ -dnl rpcsvc/autofs_prot.h \ - rpcsvc/mount.h \ - rpcsvc/mountv3.h \ - rpcsvc/nfs_prot.h \ - rpcsvc/nis.h \ - rpcsvc/yp_prot.h \ - rpcsvc/ypclnt.h \ - sys/config.h \ - sys/dg_mount.h \ - sys/dir.h \ - sys/errno.h \ - sys/file.h \ -dnl sys/fs/autofs.h \ -dnl sys/fs/autofs_prot.h \ - sys/fs/cachefs_fs.h \ - sys/fs/efs_clnt.h \ - sys/fs/nfs.h \ - sys/fs/nfs/mount.h \ - sys/fs/nfs/nfs_clnt.h \ - sys/fs/nfs_clnt.h \ - sys/fs/pc_fs.h \ - sys/fs/tmp.h \ - sys/fs/ufs_mount.h \ - sys/fs/xfs_clnt.h \ - sys/fs_types.h \ - sys/fsid.h \ - sys/fstyp.h \ - sys/ioctl.h \ - sys/lock.h \ - sys/machine.h \ - sys/mbuf.h \ - sys/mman.h \ - sys/mntctl.h \ - sys/mntent.h \ - sys/mnttab.h \ - sys/mount.h \ - sys/ndir.h \ - sys/netconfig.h \ - sys/param.h \ - sys/pathconf.h \ - sys/proc.h \ - sys/resource.h \ - sys/sema.h \ - sys/signal.h \ - sys/socket.h \ - sys/sockio.h \ - sys/stat.h \ - sys/statfs.h \ - sys/syscall.h \ - sys/syslimits.h \ - sys/syslog.h \ - sys/time.h \ - sys/tiuser.h \ - sys/types.h \ - sys/ucred.h \ - sys/uio.h \ - sys/utsname.h \ - sys/vfs.h \ - sys/vmount.h \ - sys/vnode.h \ -dnl sys/wait.h \ - ufs/ufs_mount.h \ - ufs/ufs/ufsmount.h \ - \ - assert.h \ -dnl cfs.h \ - cluster.h \ - ctype.h \ -dnl dirent.h \ - errno.h \ - fcntl.h \ - ifaddrs.h \ - irs.h \ - grp.h \ - hesiod.h \ - lber.h \ - ldap.h \ - libgen.h \ - malloc.h \ - memory.h \ - mntent.h \ - mnttab.h \ - mount.h \ - ndbm.h \ - ndir.h \ - netconfig.h \ - netdb.h \ - netdir.h \ - nsswitch.h \ - pwd.h \ - regex.h \ - resolv.h \ - setjmp.h \ - signal.h \ - socketbits.h \ - statbuf.h \ - stdarg.h \ - stdlib.h \ - stdio.h \ - string.h \ - strings.h \ - syslog.h \ - time.h \ - tiuser.h \ - varargs.h \ - unistd.h \ - ) -dnl ====================================================================== - -if test "$ac_cv_header_ldap_h" = "no"; then - with_ldap="no" -fi - -dnl ********* -AMU_SAVE_STATE -dnl ********* - -dnl ###################################################################### -dnl STRUCTURES -AC_MSG_NOTICE(*** PARTICULAR STRUCTURES ***) -AC_HEADER_STAT -AC_HEADER_TIME -AC_STRUCT_TM -dnl ====================================================================== -AC_MSG_NOTICE(*** GENERIC STRUCTURES ***) -dnl before any use of macros that need nfs/mount headers, must define O/S -dnl specific header to include. -AMU_CHECK_NFS_PROT_HEADERS -AMU_STRUCT_MNTENT -AMU_STRUCT_MNTTAB -AMU_STRUCT_NFS_ARGS -AMU_STRUCT_NFS_GFS_MOUNT -AMU_STRUCT_FIELD_NFS_FH -AMU_STRUCT_NFS_FH -AMU_STRUCT_NFS_FH3 -dnl ====================================================================== - -dnl ********* -AMU_SAVE_STATE -dnl ********* - -dnl ###################################################################### -dnl TYPEDEFS -dnl ====================================================================== -dnl Particular Typedef Checks -AC_MSG_NOTICE(*** PARTICULAR TYPEDEFS ***) -AC_TYPE_GETGROUPS -AC_TYPE_MODE_T -AC_TYPE_PID_T -AC_TYPE_SIGNAL -AC_TYPE_SIZE_T -AC_TYPE_UID_T -dnl ====================================================================== -dnl Generic Typedef Checks -AC_MSG_NOTICE(*** GENERIC TYPEDEFS ***) -AMU_TYPE_TIME_T -AMU_CHECK_FHANDLE -AMU_CHECK_MTYPE_TYPE -AMU_CHECK_MTYPE_PRINTF_TYPE -AMU_TYPE_YP_ORDER_OUTORDER -AMU_TYPE_RECVFROM_FROMLEN -AMU_TYPE_AUTH_CREATE_GIDLIST -AMU_TYPE_SVC_IN_ARG -dnl AMU_TYPE_AUTOFS_ARGS -AMU_TYPE_CACHEFS_ARGS -AMU_TYPE_CDFS_ARGS -AMU_TYPE_LOFS_ARGS -AMU_TYPE_MFS_ARGS -AMU_TYPE_PCFS_ARGS -AMU_TYPE_RFS_ARGS -AMU_TYPE_TMPFS_ARGS -AMU_TYPE_UFS_ARGS -AMU_TYPE_XFS_ARGS -AMU_TYPE_EFS_ARGS -AMU_TYPE_XDRPROC_T -dnl ====================================================================== - -dnl ###################################################################### -dnl Particular Compiler Characteristics -AC_MSG_NOTICE(*** PARTICULAR COMPILER CHARACTERISTICS ***) -AC_C_BIGENDIAN -AC_C_CONST -AC_C_INLINE -AC_C_VOLATILE -dnl AC_CHECK_SIZEOF(void *, 0) -dnl ====================================================================== -dnl Generic Compiler Characteristics -AC_MSG_NOTICE(*** GENERIC COMPILER CHARACTERISTICS ***) -AMU_C_VOID_P -dnl ====================================================================== - -dnl ********* -AMU_SAVE_STATE -dnl ********* - -dnl ###################################################################### -AC_MSG_NOTICE(*** EXTERNAL DEFINITIONS ***) -AMU_EXTERN_SYS_ERRLIST -AMU_EXTERN_OPTARG -AMU_CHECK_EXTERNS( - clnt_spcreateerror \ - clnt_sperrno \ - free \ - get_myaddress \ - getccent \ - getdomainname \ - getdtablesize \ - gethostname \ - getlogin \ - getpagesize \ - getwd \ - innetgr \ - mkstemp \ - sbrk \ - seteuid \ - setitimer \ - strcasecmp \ - strdup \ - strstr \ - ualarm \ - usleep \ - wait3 \ - vsnprintf \ - xdr_callmsg \ - xdr_opaque_auth \ - ) -dnl ====================================================================== - -dnl ###################################################################### -dnl C PREPROCESSOR MACROS -AC_MSG_NOTICE(*** C PREPROCESSOR MACROS ***) -dnl ====================================================================== - -dnl ###################################################################### -dnl SYSTEM SERVICES -AC_MSG_NOTICE(*** SYSTEM SERVICES ***) -AC_SYS_LONG_FILE_NAMES -AC_SYS_RESTARTABLE_SYSCALLS -AMU_CHECK_NETWORK_TRANSPORT_TYPE -dnl ====================================================================== - -dnl ********* -AMU_SAVE_STATE -dnl ********* - -dnl ###################################################################### -AC_MSG_NOTICE(*** FIELDS WITHIN STRUCTURES ***) -AMU_CHECK_FIELD(mntent_t.mnt_cnode) -AMU_CHECK_FIELD(mntent_t.mnt_ro) -AMU_CHECK_FIELD(mntent_t.mnt_time) -AMU_FIELD_MNTENT_T_MNT_TIME_STRING -AMU_CHECK_FIELD(cdfs_args_t.flags) -AMU_CHECK_FIELD(cdfs_args_t.fspec) -AMU_CHECK_FIELD(cdfs_args_t.iso_flags) -AMU_CHECK_FIELD(cdfs_args_t.iso_pgthresh) -AMU_CHECK_FIELD(cdfs_args_t.norrip) -AMU_CHECK_FIELD(cdfs_args_t.ssector) -AMU_CHECK_FIELD(pcfs_args_t.dsttime) -AMU_CHECK_FIELD(pcfs_args_t.fspec) -AMU_CHECK_FIELD(pcfs_args_t.gid) -AMU_CHECK_FIELD(pcfs_args_t.mask) -AMU_CHECK_FIELD(pcfs_args_t.secondswest) -AMU_CHECK_FIELD(pcfs_args_t.uid) -AMU_CHECK_FIELD(ufs_args_t.flags) -AMU_CHECK_FIELD(ufs_args_t.fspec) -AMU_CHECK_FIELD(ufs_args_t.ufs_flags) -AMU_CHECK_FIELD(ufs_args_t.ufs_pgthresh) -AMU_CHECK_FIELD(efs_args_t.flags) -AMU_CHECK_FIELD(efs_args_t.fspec) -AMU_CHECK_FIELD(xfs_args_t.flags) -AMU_CHECK_FIELD(xfs_args_t.fspec) -AMU_CHECK_FIELD(struct fhstatus.fhs_fh) -AMU_CHECK_FIELD(struct statfs.f_fstypename) -AMU_CHECK_FIELD(nfs_args_t.acdirmin) -AMU_CHECK_FIELD(nfs_args_t.acregmin) -AMU_CHECK_FIELD(nfs_args_t.bsize) -AMU_CHECK_FIELD(nfs_args_t.fh_len) -AMU_CHECK_FIELD(nfs_args_t.fhsize) -AMU_CHECK_FIELD(nfs_args_t.gfs_flags) -AMU_CHECK_FIELD(nfs_args_t.namlen) -AMU_CHECK_FIELD(nfs_args_t.optstr) -AMU_CHECK_FIELD(nfs_args_t.proto) -AMU_CHECK_FIELD(nfs_args_t.sotype) -AMU_CHECK_FIELD(nfs_args_t.version) -AMU_CHECK_FIELD(struct ifreq.ifr_addr) -AMU_CHECK_FIELD(struct ifaddrs.ifa_next) -AMU_CHECK_FIELD(struct sockaddr.sa_len) -dnl This one is for Irix -dnl AMU_CHECK_FIELD(autofs_args_t.addr) -dnl ====================================================================== - -dnl ###################################################################### -dnl MAP TYPES -AC_MSG_NOTICE(*** MAP TYPES ***) -dnl DBM is obsolete, use NDBM -dnl AMU_CHECK_MAP_FUNCS(dbminit dbmopen, dbm) -AMU_CHECK_MAP_FUNCS(fgets, file) -if test "$with_hesiod" = "yes"; then -AMU_CHECK_MAP_FUNCS(hes_init hesiod_init, hesiod) -fi -if test "$with_ldap" = "yes"; then -AMU_CHECK_MAP_FUNCS(ldap_open, ldap) -fi -AMU_CHECK_MAP_FUNCS(dbm_open, ndbm) -AMU_CHECK_MAP_FUNCS(yp_get_default_domain yp_all, nis) -AMU_CHECK_MAP_FUNCS(nis_domain_of, nisplus, nisplus) -AMU_CHECK_MAP_FUNCS(getpwnam, passwd) -AMU_CHECK_MAP_FUNCS(opendir, union) -dnl ====================================================================== - -dnl ********* -AMU_SAVE_STATE -dnl ********* - -dnl ###################################################################### -dnl FILESYSTEM TYPES -AC_MSG_NOTICE(*** FILESYSTEM TYPES ***) -dnl check for filesystem existence if MNTTYPE_ exists, then if -dnl MOUNT_, then MNT_, then in /proc/filesystems, and getvfsbyname() -dnl AMU_CHECK_FS_MNTENT(autofs) -AMU_CHECK_FS_MNTENT(cdfs hsfs cd9660 iso9660 isofs cdrom, cdfs) -AMU_CHECK_FS_MNTENT(cache) -AMU_CHECK_FS_MNTENT(lofs lo, lofs) -AMU_CHECK_FS_MNTENT(mfs) -AMU_CHECK_FS_MNTENT(nfs) -AMU_CHECK_FS_MNTENT(nfs3) -AMU_CHECK_FS_MNTENT(vfat pcfs pc msdos msdosfs fat, pcfs) -AMU_CHECK_FS_MNTENT(tfs) -AMU_CHECK_FS_MNTENT(tmpfs) -AMU_CHECK_FS_MNTENT(ext2 ffs ufs 42 efs xfs jfs ultrix, ufs) -dnl openbsd 2.4 introduce a new file system called xfs, which is not -dnl the same as irix-s xfs. Sigh, why did openbsd have to use such a name! -case "${host_os_name}" in - openbsd* ) ;; - * ) AMU_CHECK_FS_MNTENT(xfs) ;; -esac -AMU_CHECK_FS_MNTENT(efs) -dnl new ones in bsd44 -AMU_CHECK_FS_MNTENT(null nullfs, nullfs) -AMU_CHECK_FS_MNTENT(union unionfs, unionfs) -AMU_CHECK_FS_MNTENT(umap umapfs, umapfs) - -dnl check for filesystem existence if their headers exist -dnl AMU_CHECK_FS_HEADERS(cfs.h, cfs) -AMU_CHECK_FS_HEADERS(hsfs/hsfs.h, cdfs) -AMU_CHECK_FS_HEADERS(tmpfs/tmp.h, tmpfs) -dnl AMU_CHECK_FS_HEADERS(sys/fs/autofs.h, autofs) -AMU_CHECK_FS_HEADERS(sys/fs/cachefs_fs.h, cachefs) -dnl AMU_CHECK_FS_HEADERS(jfs/jfsmount.h, ufs) -dnl ====================================================================== -dnl AUTOMOUNTER FILESYSTEM TYPES -AC_MSG_NOTICE(*** AUTOMOUNTER FILESYSTEM TYPES ***) -AMU_CHECK_AMU_FS(auto, automounter) -AMU_CHECK_AMU_FS(direct, direct automount) -AMU_CHECK_AMU_FS(toplvl, top-level) -AMU_CHECK_AMU_FS(error, error) -AMU_CHECK_AMU_FS(inherit, inheritance) -AMU_CHECK_AMU_FS(program, program) -AMU_CHECK_AMU_FS(link, symlink) -AMU_CHECK_AMU_FS(linkx, symlink with existence check) -AMU_CHECK_AMU_FS(host, host (nfs), nfs) -AMU_CHECK_AMU_FS(nfsx, multi-nfs mount, nfs) -AMU_CHECK_AMU_FS(nfsl, NFS with local existence check) -AMU_CHECK_AMU_FS(union, union) -dnl AMU_CHECK_AMU_FS(autofs, Sun AutoFS, autofs) -dnl ====================================================================== - -dnl ********* -AMU_SAVE_STATE -dnl ********* - -dnl ###################################################################### -dnl MOUNTING TYPES AND NAMES FOR MOUNTING TABLE -dnl check for mount(2) type/name for filesystem (MNTTYPE_*, MOUNT_*) -AC_MSG_NOTICE(*** MOUNTING TYPES ***) -AMU_CHECK_MOUNT_TYPE(nfs) -AMU_CHECK_MOUNT_TYPE(nfs3) -AMU_CHECK_MOUNT_TYPE(4.2 4.3 4.4 ext2 ufs efs xfs ffs jfs ultrix, ufs) -AMU_CHECK_MOUNT_TYPE(xfs) -AMU_CHECK_MOUNT_TYPE(efs) -AMU_CHECK_MOUNT_TYPE(cdfs hsfs cd9660 iso9660 isofs cdrom, cdfs) -AMU_CHECK_MOUNT_TYPE(vfat pcfs pc msdos msdosfs fat, pcfs) -AMU_CHECK_MOUNT_TYPE(mfs) -AMU_CHECK_MOUNT_TYPE(tmpfs tmp, tmpfs) -AMU_CHECK_MOUNT_TYPE(lofs lo, lofs) -AMU_CHECK_MOUNT_TYPE(lfs) -AMU_CHECK_MOUNT_TYPE(afs) -dnl AMU_CHECK_MOUNT_TYPE(autofs) -AMU_CHECK_MOUNT_TYPE(tfs) -AMU_CHECK_MOUNT_TYPE(cachefs) -AMU_CHECK_MOUNT_TYPE(ignore) -dnl new ones in bsd44 -AMU_CHECK_MOUNT_TYPE(null nullfs, nullfs) -AMU_CHECK_MOUNT_TYPE(union unionfs, unionfs) -AMU_CHECK_MOUNT_TYPE(umap umapfs, umapfs) -dnl ###################################################################### -dnl check for mnttab name for filesystem -AC_MSG_NOTICE(*** MOUNTING TABLE NAMES ***) -AMU_CHECK_MNTTAB_TYPE(nfs) -AMU_CHECK_MNTTAB_TYPE(nfs3) -AMU_CHECK_MNTTAB_TYPE(ext2 ufs jfs 4.2 4.3 4.4 efs xfs ffs, ufs) -AMU_CHECK_MNTTAB_TYPE(xfs) -AMU_CHECK_MNTTAB_TYPE(efs) -AMU_CHECK_MNTTAB_TYPE(cdfs hsfs cd9660 iso9660 isofs cdrom, cdfs) -AMU_CHECK_MNTTAB_TYPE(vfat pcfs pc msdos msdosfs fat, pcfs) -AMU_CHECK_MNTTAB_TYPE(mfs) -AMU_CHECK_MNTTAB_TYPE(tmpfs tmp, tmpfs) -AMU_CHECK_MNTTAB_TYPE(lofs lo, lofs) -AMU_CHECK_MNTTAB_TYPE(lfs) -AMU_CHECK_MNTTAB_TYPE(afs) -dnl AMU_CHECK_MNTTAB_TYPE(autofs) -AMU_CHECK_MNTTAB_TYPE(tfs) -AMU_CHECK_MNTTAB_TYPE(cachefs) -dnl new ones in bsd44 -AMU_CHECK_MNTTAB_TYPE(null nullfs, nullfs) -AMU_CHECK_MNTTAB_TYPE(union unionfs, unionfs) -AMU_CHECK_MNTTAB_TYPE(umap umapfs, umapfs) -dnl ====================================================================== - -dnl ********* -AMU_SAVE_STATE -dnl ********* - -dnl ###################################################################### -dnl Mount Table option name strings like MNTOPT_* -dnl if found, defines MNTTAB_OPT_* -AC_MSG_NOTICE(*** MOUNT TABLE OPTION NAME STRINGS ***) -AMU_CHECK_MNTTAB_OPTS( \ - acdirmax \ - acdirmin \ - acregmax \ - acregmin \ - actimeo \ - compress \ - dev \ - fsid \ - grpid \ - ignore \ - intr \ - maxgroups \ - multi \ - noac \ - noauto \ - noconn \ - nocto \ - nosub \ - nosuid \ - pgthresh \ - port \ - posix \ - proplist \ - proto \ - retrans \ - retry \ - ro \ - rsize \ - rw \ - soft \ - spongy \ - suid \ - symttl \ - timeo \ - vers \ - wsize \ - ) -dnl ====================================================================== - -dnl ********* -AMU_SAVE_STATE -dnl ********* - -dnl ###################################################################### -dnl Generic mount(2) system call flags (hex/int numbers) like M_*/MS_*/MNT_* -dnl if found, defines MNT2_GEN_OPT_* -AC_MSG_NOTICE(*** GENERIC MOUNT(2) OPTIONS ***) -AMU_CHECK_MNT2_GEN_OPTS( \ - async \ - automntfs \ - bind \ - cache \ - data \ - fss \ - grpid \ - ignore \ - jfs \ - multi \ - newtype \ - nfs \ - nocache \ - nodev \ - noexec \ - nomnttab \ - nosub \ - nosuid \ - optionstr \ - overlay \ - quota \ - rdonly \ - ronly \ - sync \ - synchronous \ - ) -dnl ====================================================================== - -dnl ********* -AMU_SAVE_STATE -dnl ********* - -dnl ###################################################################### -dnl NFS-specific mount(2) options (hex numbers) like NFSMNT_*/NFS_MOUNT_* -AC_MSG_NOTICE(*** NFS-SPECIFIC MOUNT(2) OPTIONS ***) -dnl if found, defines MNT2_NFS_OPT_* -AMU_CHECK_MNT2_NFS_OPTS( \ - acdirmax \ - acdirmin \ - acregmax \ - acregmin \ - auto \ - deadthresh \ - dumbtimr \ - fsname \ - grpid \ - hostname \ - ignore \ - int \ - intr \ - kerb \ - knconf \ - leaseterm \ - maxgrps \ - nfsv3 \ - noac \ - noconn \ - nocto \ - noint \ - nonlm \ - nqnfs \ - pgthresh \ - posix \ - proplist \ - rdirplus \ - readahead \ - readdirsize \ - resvport \ - retrans \ - ronly \ - rsize \ - soft \ - spongy \ - symttl \ - tcp \ - timeo \ - ver3 \ - wsize \ - xlatecookie \ - ) -dnl ====================================================================== - -dnl ###################################################################### -dnl CDFS-specific mount(2) options (hex numbers) like M_* -AC_MSG_NOTICE(*** CDFS-SPECIFIC MOUNT(2) OPTIONS ***) -dnl if found, defines MNT2_CDFS_OPT_* -AMU_CHECK_MNT2_CDFS_OPTS(\ - defperm \ - extatt \ - gens \ - nodefperm \ - norrip \ - noversion \ - rrip \ - ) -dnl ====================================================================== - -dnl ###################################################################### -dnl SYSTEM-SPECIFIC TESTS -AC_MSG_NOTICE(*** SYSTEM-SPECIFIC TESTS ***) -dnl ====================================================================== -dnl Mount table style -AMU_CHECK_MNTTAB_STYLE -AMU_CHECK_HIDE_MOUNT_TYPE -AMU_CHECK_MNTTAB_LOCATION -AMU_CHECK_MNTTAB_FILE_NAME -AMU_CHECK_MOUNT_TRAP -AMU_CHECK_MOUNT_STYLE -AMU_CHECK_UMOUNT_STYLE -dnl AMU_CHECK_AUTOFS_STYLE -AMU_CHECK_UNMOUNT_CALL -AMU_CHECK_UNMOUNT_ARGS -AMU_CHECK_NFS_SA_DREF -AMU_CHECK_NFS_HN_DREF -AMU_CHECK_NFS_FH_DREF -AMU_CHECK_NFS_SOCKET_CONNECTION -AMU_CHECK_CHECKMOUNT_STYLE -AMU_CHECK_RESTARTABLE_SIGNAL_HANDLER -AMU_CHECK_GNU_GETOPT -dnl ====================================================================== - -dnl ********* -AMU_SAVE_STATE -dnl ********* - -dnl ###################################################################### -dnl output files -AC_MSG_NOTICE(*** OUTPUT FILES ***) -dnl The am_utils_link_files variable is set in macros in aclocal.m4 -AC_CONFIG_LINKS(${am_utils_link_files}) -dnl ========================================================================== -dnl This is necessary so that .o files in LIBOBJS are also built via -dnl the ANSI2KNR-filtering rules. -LIB@&t@OBJS=`echo "$LIB@&t@OBJS" | - sed 's,\.[[^.]]* ,$U&,g;s,\.[[^.]]*$,$U&,'` -LTLIBOBJS=`echo "$LIB@&t@OBJS" | - sed 's,\.[[^.]]* ,.lo ,g;s,\.[[^.]]*$,.lo,'` -AC_SUBST(LTLIBOBJS) -dnl XXX: next two lines are temp hack until automake newer than 1.4 comes out -AMU_LIB_OBJS="${LTLIBOBJS} ${LTALLOCA}" -AC_SUBST(AMU_LIB_OBJS) -dnl for Makefile rule to regenerate libtool -AC_SUBST(LIBTOOL_DEPS) -dnl ========================================================================== -AC_CONFIG_FILES( \ - aux_conf.h \ - \ - Makefile \ - amd/Makefile \ - amq/Makefile \ - \ - fixmount/Makefile \ - fsinfo/Makefile \ - hlfsd/Makefile \ - libamu/Makefile \ - mk-amd-map/Makefile \ - wire-test/Makefile \ - \ - scripts/Makefile \ - doc/Makefile \ - \ - scripts/am-eject \ - scripts/amd2ldif \ - scripts/amd2sun \ - scripts/automount2amd \ - scripts/ctl-amd \ - scripts/ctl-hlfsd \ - scripts/expn \ - scripts/fixrmtab \ - scripts/fix-amd-map \ - scripts/lostaltmail \ - scripts/redhat-ctl-amd \ - scripts/wait4amd \ - scripts/wait4amd2die \ - ) -AC_OUTPUT -dnl ====================================================================== - -dnl ###################################################################### -AC_MSG_NOTICE(*** END OF CONFIGURATION ***) -dnl end of configure.in for am-utils-6.x diff --git a/contrib/amd/cvs-server.txt b/contrib/amd/cvs-server.txt deleted file mode 100644 index 0943963..0000000 --- a/contrib/amd/cvs-server.txt +++ /dev/null @@ -1,43 +0,0 @@ -############################################################################## -Here are generic CVS server instructions: - -(1) Login to the cvs server. Not needed more than once b/c the cvs login - will record your cvs password in $HOME/.cvspass. Change "ezk" for your - CVS user id. - -$ cvs -d :pserver:ezk@shekel.mcl.cs.columbia.edu:/proj/bank/cvsroot login -CVS password: - -Type in your password, crypt(3)'ed in /proj/bank/cvsroot/CVSROOT/passwd. - -(2) Then, check out a fresh copy of 6.1 (experimental) - -$ cvs -d :pserver:ezk@shekel.mcl.cs.columbia.edu:/proj/bank/cvsroot checkout am-utils - -Or, to checkout the stable branch: - -$ cvs -d :pserver:ezk@shekel.mcl.cs.columbia.edu:/proj/bank/cvsroot checkout -r amd-6-0-stable am-utils - -(3) Then you can do normal edit, commit, update, etc. w/o having to worry - about your $CVSROOT or the -d option. - -############################################################################## -To merge changes from the stable branch into the main (experimental) branch: - -$ cvs update -j amd-6-0-stable -kk - -- don't worry about all the files that change; it's probably because of cvs - keywords in the sources -- after the merge, do a 'cvs update -d' and resolve any conflicts - -############################################################################## - -There are two new mailing lists: - -amd-maintainers@shekel.mcl.cs.columbia.edu: for Amd maintainers to - communicate internally w/o exposure to the greater user community. - -amd-cvslog@shekel.mcl.cs.columbia.edu: to get cvs log messages. I've used a - better (I hope) script for loginfo. It provides different output - and can be tweaked as well. -############################################################################## diff --git a/contrib/amd/depcomp b/contrib/amd/depcomp deleted file mode 100755 index 6589965..0000000 --- a/contrib/amd/depcomp +++ /dev/null @@ -1,411 +0,0 @@ -#! /bin/sh - -# depcomp - compile a program generating dependencies as side-effects -# Copyright 1999, 2000 Free Software Foundation, Inc. - -# 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 -# the Free Software Foundation; either version 2, or (at your option) -# any later version. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. - -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -# 02111-1307, USA. - -# As a special exception to the GNU General Public License, if you -# distribute this file as part of a program that contains a -# configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that program. - -# Originally written by Alexandre Oliva . - -if test -z "$depmode" || test -z "$source" || test -z "$object"; then - echo "depcomp: Variables source, object and depmode must be set" 1>&2 - exit 1 -fi -# `libtool' can also be set to `yes' or `no'. - -depfile=${depfile-`echo "$object" | sed 's,\([^/]*\)$,.deps/\1,;s/\.\([^.]*\)$/.P\1/'`} -tmpdepfile=${tmpdepfile-`echo "$depfile" | sed 's/\.\([^.]*\)$/.T\1/'`} - -rm -f "$tmpdepfile" - -# Some modes work just like other modes, but use different flags. We -# parameterize here, but still list the modes in the big case below, -# to make depend.m4 easier to write. Note that we *cannot* use a case -# here, because this file can only contain one case statement. -if test "$depmode" = hp; then - # HP compiler uses -M and no extra arg. - gccflag=-M - depmode=gcc -fi - -if test "$depmode" = dashXmstdout; then - # This is just like dashmstdout with a different argument. - dashmflag=-xM - depmode=dashmstdout -fi - -case "$depmode" in -gcc3) -## gcc 3 implements dependency tracking that does exactly what -## we want. Yay! Note: for some reason libtool 1.4 doesn't like -## it if -MD -MP comes after the -MF stuff. Hmm. - "$@" -MT "$object" -MD -MP -MF "$tmpdepfile" - stat=$? - if test $stat -eq 0; then : - else - rm -f "$tmpdepfile" - exit $stat - fi - mv "$tmpdepfile" "$depfile" - ;; - -gcc) -## There are various ways to get dependency output from gcc. Here's -## why we pick this rather obscure method: -## - Don't want to use -MD because we'd like the dependencies to end -## up in a subdir. Having to rename by hand is ugly. -## (We might end up doing this anyway to support other compilers.) -## - The DEPENDENCIES_OUTPUT environment variable makes gcc act like -## -MM, not -M (despite what the docs say). -## - Using -M directly means running the compiler twice (even worse -## than renaming). - if test -z "$gccflag"; then - gccflag=-MD, - fi - "$@" -Wp,"$gccflag$tmpdepfile" - stat=$? - if test $stat -eq 0; then : - else - rm -f "$tmpdepfile" - exit $stat - fi - rm -f "$depfile" - echo "$object : \\" > "$depfile" - alpha=ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz -## The second -e expression handles DOS-style file names with drive letters. - sed -e 's/^[^:]*: / /' \ - -e 's/^['$alpha']:\/[^:]*: / /' < "$tmpdepfile" >> "$depfile" -## This next piece of magic avoids the `deleted header file' problem. -## The problem is that when a header file which appears in a .P file -## is deleted, the dependency causes make to die (because there is -## typically no way to rebuild the header). We avoid this by adding -## dummy dependencies for each header file. Too bad gcc doesn't do -## this for us directly. - tr ' ' ' -' < "$tmpdepfile" | -## Some versions of gcc put a space before the `:'. On the theory -## that the space means something, we add a space to the output as -## well. -## Some versions of the HPUX 10.20 sed can't process this invocation -## correctly. Breaking it into two sed invocations is a workaround. - sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile" - rm -f "$tmpdepfile" - ;; - -hp) - # This case exists only to let depend.m4 do its work. It works by - # looking at the text of this script. This case will never be run, - # since it is checked for above. - exit 1 - ;; - -sgi) - if test "$libtool" = yes; then - "$@" "-Wp,-MDupdate,$tmpdepfile" - else - "$@" -MDupdate "$tmpdepfile" - fi - stat=$? - if test $stat -eq 0; then : - else - rm -f "$tmpdepfile" - exit $stat - fi - rm -f "$depfile" - - if test -f "$tmpdepfile"; then # yes, the sourcefile depend on other files - echo "$object : \\" > "$depfile" - - # Clip off the initial element (the dependent). Don't try to be - # clever and replace this with sed code, as IRIX sed won't handle - # lines with more than a fixed number of characters (4096 in - # IRIX 6.2 sed, 8192 in IRIX 6.5). We also remove comment lines; - # the IRIX cc adds comments like `#:fec' to the end of the - # dependency line. - tr ' ' ' -' < "$tmpdepfile" \ - | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' | \ - tr ' -' ' ' >> $depfile - echo >> $depfile - - # The second pass generates a dummy entry for each header file. - tr ' ' ' -' < "$tmpdepfile" \ - | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \ - >> $depfile - else - # The sourcefile does not contain any dependencies, so just - # store a dummy comment line, to avoid errors with the Makefile - # "include basename.Plo" scheme. - echo "#dummy" > "$depfile" - fi - rm -f "$tmpdepfile" - ;; - -aix) - # The C for AIX Compiler uses -M and outputs the dependencies - # in a .u file. This file always lives in the current directory. - # Also, the AIX compiler puts `$object:' at the start of each line; - # $object doesn't have directory information. - stripped=`echo "$object" | sed -e 's,^.*/,,' -e 's/\(.*\)\..*$/\1/'` - tmpdepfile="$stripped.u" - outname="$stripped.o" - if test "$libtool" = yes; then - "$@" -Wc,-M - else - "$@" -M - fi - - stat=$? - if test $stat -eq 0; then : - else - rm -f "$tmpdepfile" - exit $stat - fi - - if test -f "$tmpdepfile"; then - # Each line is of the form `foo.o: dependent.h'. - # Do two passes, one to just change these to - # `$object: dependent.h' and one to simply `dependent.h:'. - sed -e "s,^$outname:,$object :," < "$tmpdepfile" > "$depfile" - sed -e "s,^$outname: \(.*\)$,\1:," < "$tmpdepfile" >> "$depfile" - else - # The sourcefile does not contain any dependencies, so just - # store a dummy comment line, to avoid errors with the Makefile - # "include basename.Plo" scheme. - echo "#dummy" > "$depfile" - fi - rm -f "$tmpdepfile" - ;; - -tru64) - # The Tru64 AIX compiler uses -MD to generate dependencies as a side - # effect. `cc -MD -o foo.o ...' puts the dependencies into `foo.o.d'. - # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put - # dependencies in `foo.d' instead, so we check for that too. - # Subdirectories are respected. - - tmpdepfile1="$object.d" - tmpdepfile2=`echo "$object" | sed -e 's/.o$/.d/'` - if test "$libtool" = yes; then - "$@" -Wc,-MD - else - "$@" -MD - fi - - stat=$? - if test $stat -eq 0; then : - else - rm -f "$tmpdepfile1" "$tmpdepfile2" - exit $stat - fi - - if test -f "$tmpdepfile1"; then - tmpdepfile="$tmpdepfile1" - else - tmpdepfile="$tmpdepfile2" - fi - if test -f "$tmpdepfile"; then - sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile" - # That's a space and a tab in the []. - sed -e 's,^.*\.[a-z]*:[ ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile" - else - echo "#dummy" > "$depfile" - fi - rm -f "$tmpdepfile" - ;; - -#nosideeffect) - # This comment above is used by automake to tell side-effect - # dependency tracking mechanisms from slower ones. - -dashmstdout) - # Important note: in order to support this mode, a compiler *must* - # always write the proprocessed file to stdout, regardless of -o, - # because we must use -o when running libtool. - test -z "$dashmflag" && dashmflag=-M - ( IFS=" " - case " $* " in - *" --mode=compile "*) # this is libtool, let us make it quiet - for arg - do # cycle over the arguments - case "$arg" in - "--mode=compile") - # insert --quiet before "--mode=compile" - set fnord "$@" --quiet - shift # fnord - ;; - esac - set fnord "$@" "$arg" - shift # fnord - shift # "$arg" - done - ;; - esac - "$@" $dashmflag | sed 's:^[^:]*\:[ ]*:'"$object"'\: :' > "$tmpdepfile" - ) & - proc=$! - "$@" - stat=$? - wait "$proc" - if test "$stat" != 0; then exit $stat; fi - rm -f "$depfile" - cat < "$tmpdepfile" > "$depfile" - tr ' ' ' -' < "$tmpdepfile" | \ -## Some versions of the HPUX 10.20 sed can't process this invocation -## correctly. Breaking it into two sed invocations is a workaround. - sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile" - rm -f "$tmpdepfile" - ;; - -dashXmstdout) - # This case only exists to satisfy depend.m4. It is never actually - # run, as this mode is specially recognized in the preamble. - exit 1 - ;; - -makedepend) - # X makedepend - ( - shift - cleared=no - for arg in "$@"; do - case $cleared in no) - set ""; shift - cleared=yes - esac - case "$arg" in - -D*|-I*) - set fnord "$@" "$arg"; shift;; - -*) - ;; - *) - set fnord "$@" "$arg"; shift;; - esac - done - obj_suffix="`echo $object | sed 's/^.*\././'`" - touch "$tmpdepfile" - ${MAKEDEPEND-makedepend} 2>/dev/null -o"$obj_suffix" -f"$tmpdepfile" "$@" - ) & - proc=$! - "$@" - stat=$? - wait "$proc" - if test "$stat" != 0; then exit $stat; fi - rm -f "$depfile" - cat < "$tmpdepfile" > "$depfile" - tail +3 "$tmpdepfile" | tr ' ' ' -' | \ -## Some versions of the HPUX 10.20 sed can't process this invocation -## correctly. Breaking it into two sed invocations is a workaround. - sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile" - rm -f "$tmpdepfile" "$tmpdepfile".bak - ;; - -cpp) - # Important note: in order to support this mode, a compiler *must* - # always write the proprocessed file to stdout, regardless of -o, - # because we must use -o when running libtool. - ( IFS=" " - case " $* " in - *" --mode=compile "*) - for arg - do # cycle over the arguments - case $arg in - "--mode=compile") - # insert --quiet before "--mode=compile" - set fnord "$@" --quiet - shift # fnord - ;; - esac - set fnord "$@" "$arg" - shift # fnord - shift # "$arg" - done - ;; - esac - "$@" -E | - sed -n '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' | - sed '$ s: \\$::' > "$tmpdepfile" - ) & - proc=$! - "$@" - stat=$? - wait "$proc" - if test "$stat" != 0; then exit $stat; fi - rm -f "$depfile" - echo "$object : \\" > "$depfile" - cat < "$tmpdepfile" >> "$depfile" - sed < "$tmpdepfile" '/^$/d;s/^ //;s/ \\$//;s/$/ :/' >> "$depfile" - rm -f "$tmpdepfile" - ;; - -msvisualcpp) - # Important note: in order to support this mode, a compiler *must* - # always write the proprocessed file to stdout, regardless of -o, - # because we must use -o when running libtool. - ( IFS=" " - case " $* " in - *" --mode=compile "*) - for arg - do # cycle over the arguments - case $arg in - "--mode=compile") - # insert --quiet before "--mode=compile" - set fnord "$@" --quiet - shift # fnord - ;; - esac - set fnord "$@" "$arg" - shift # fnord - shift # "$arg" - done - ;; - esac - "$@" -E | - sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::echo "`cygpath -u \\"\1\\"`":p' | sort | uniq > "$tmpdepfile" - ) & - proc=$! - "$@" - stat=$? - wait "$proc" - if test "$stat" != 0; then exit $stat; fi - rm -f "$depfile" - echo "$object : \\" > "$depfile" - . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s:: \1 \\:p' >> "$depfile" - echo " " >> "$depfile" - . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s::\1\::p' >> "$depfile" - rm -f "$tmpdepfile" - ;; - -none) - exec "$@" - ;; - -*) - echo "Unknown depmode $depmode" 1>&2 - exit 1 - ;; -esac - -exit 0 diff --git a/contrib/amd/doc/mdate-sh b/contrib/amd/doc/mdate-sh deleted file mode 100755 index c079aed..0000000 --- a/contrib/amd/doc/mdate-sh +++ /dev/null @@ -1,97 +0,0 @@ -#!/bin/sh -# Get modification time of a file or directory and pretty-print it. -# Copyright 1995, 1996, 1997 Free Software Foundation, Inc. -# written by Ulrich Drepper , June 1995 -# -# 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 -# the Free Software Foundation; either version 2, or (at your option) -# any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software Foundation, -# Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - -# As a special exception to the GNU General Public License, if you -# distribute this file as part of a program that contains a -# configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that program. - -# Prevent date giving response in another language. -LANG=C -export LANG -LC_ALL=C -export LC_ALL -LC_TIME=C -export LC_TIME - -# Get the extended ls output of the file or directory. -# On HPUX /bin/sh, "set" interprets "-rw-r--r--" as options, so the "x" below. -if ls -L /dev/null 1>/dev/null 2>&1; then - set - x`ls -L -l -d $1` -else - set - x`ls -l -d $1` -fi -# The month is at least the fourth argument -# (3 shifts here, the next inside the loop). -shift -shift -shift - -# Find the month. Next argument is day, followed by the year or time. -month= -until test $month -do - shift - case $1 in - Jan) month=January; nummonth=1;; - Feb) month=February; nummonth=2;; - Mar) month=March; nummonth=3;; - Apr) month=April; nummonth=4;; - May) month=May; nummonth=5;; - Jun) month=June; nummonth=6;; - Jul) month=July; nummonth=7;; - Aug) month=August; nummonth=8;; - Sep) month=September; nummonth=9;; - Oct) month=October; nummonth=10;; - Nov) month=November; nummonth=11;; - Dec) month=December; nummonth=12;; - esac -done - -day=$2 - -# Here we have to deal with the problem that the ls output gives either -# the time of day or the year. -case $3 in - *:*) set `date`; eval year=\$$# - case $2 in - Jan) nummonthtod=1;; - Feb) nummonthtod=2;; - Mar) nummonthtod=3;; - Apr) nummonthtod=4;; - May) nummonthtod=5;; - Jun) nummonthtod=6;; - Jul) nummonthtod=7;; - Aug) nummonthtod=8;; - Sep) nummonthtod=9;; - Oct) nummonthtod=10;; - Nov) nummonthtod=11;; - Dec) nummonthtod=12;; - esac - # For the first six month of the year the time notation can also - # be used for files modified in the last year. - if (expr $nummonth \> $nummonthtod) > /dev/null; - then - year=`expr $year - 1` - fi;; - *) year=$3;; -esac - -# The result. -echo $day $month $year diff --git a/contrib/amd/fixmount/fixmount.8 b/contrib/amd/fixmount/fixmount.8 index 7e9793a..c2e92f3 100644 --- a/contrib/amd/fixmount/fixmount.8 +++ b/contrib/amd/fixmount/fixmount.8 @@ -1,5 +1,5 @@ .\" -.\" Copyright (c) 1997-2003 Erez Zadok +.\" Copyright (c) 1997-2004 Erez Zadok .\" Copyright (c) 1990 Jan-Simon Pendry .\" Copyright (c) 1990 Imperial College of Science, Technology & Medicine .\" Copyright (c) 1990 The Regents of the University of California. @@ -38,7 +38,7 @@ .\" .\" %W% (Berkeley) %G% .\" -.\" $Id: fixmount.8,v 1.3.2.5 2003/03/16 01:46:59 ezk Exp $ +.\" $Id: fixmount.8,v 1.3.2.6 2004/01/06 03:15:23 ezk Exp $ .\" $FreeBSD$ .\" .Dd February 26, 1993 diff --git a/contrib/amd/fixmount/fixmount.c b/contrib/amd/fixmount/fixmount.c index 9cfd736..3e00786 100644 --- a/contrib/amd/fixmount/fixmount.c +++ b/contrib/amd/fixmount/fixmount.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997-2003 Erez Zadok + * Copyright (c) 1997-2004 Erez Zadok * Copyright (c) 1990 Jan-Simon Pendry * Copyright (c) 1990 Imperial College of Science, Technology & Medicine * Copyright (c) 1990 The Regents of the University of California. @@ -38,7 +38,7 @@ * * %W% (Berkeley) %G% * - * $Id: fixmount.c,v 1.5.2.3 2002/12/27 22:45:04 ezk Exp $ + * $Id: fixmount.c,v 1.5.2.4 2004/01/06 03:15:23 ezk Exp $ * $FreeBSD$ * */ diff --git a/contrib/amd/fsinfo/fsinfo.8 b/contrib/amd/fsinfo/fsinfo.8 index 7cfeb3a..113c1ad 100644 --- a/contrib/amd/fsinfo/fsinfo.8 +++ b/contrib/amd/fsinfo/fsinfo.8 @@ -1,5 +1,5 @@ .\" -.\" Copyright (c) 1997-2003 Erez Zadok +.\" Copyright (c) 1997-2004 Erez Zadok .\" Copyright (c) 1993 Jan-Simon Pendry. .\" Copyright (c) 1993 .\" The Regents of the University of California. All rights reserved. @@ -33,7 +33,7 @@ .\" SUCH DAMAGE. .\" .\" from: @(#)fsinfo.8 8.1 (Berkeley) 6/28/93 -.\" $Id: fsinfo.8,v 1.3.2.4 2003/03/31 20:09:02 ezk Exp $ +.\" $Id: fsinfo.8,v 1.3.2.5 2004/01/06 03:15:23 ezk Exp $ .\" $FreeBSD$ .\" .Dd June 26, 1999 diff --git a/contrib/amd/fsinfo/fsinfo.c b/contrib/amd/fsinfo/fsinfo.c index 9f271f5..21f80382 100644 --- a/contrib/amd/fsinfo/fsinfo.c +++ b/contrib/amd/fsinfo/fsinfo.c @@ -1,6 +1,5 @@ /* - * Copyright (c) 1997-1999 Erez Zadok - * Copyright (c) 1997-2003 Erez Zadok + * Copyright (c) 1997-2004 Erez Zadok * Copyright (c) 1989 Jan-Simon Pendry * Copyright (c) 1989 Imperial College of Science, Technology & Medicine * Copyright (c) 1989 The Regents of the University of California. @@ -37,9 +36,8 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * %W% (Berkeley) %G% * - * $Id: fsinfo.c,v 1.5.2.5 2003/07/18 04:50:20 ezk Exp $ + * $Id: fsinfo.c,v 1.5.2.7 2004/05/12 15:54:31 ezk Exp $ * $FreeBSD$ * */ @@ -170,7 +168,9 @@ fsi_get_args(int c, char *v[]) if (c != optind) { g_argv = v + optind - 1; +#ifdef yywrap if (yywrap()) +#endif /* yywrap */ fatal("Cannot read any input files"); } else { usage++; diff --git a/contrib/amd/hlfsd/hlfsd.8 b/contrib/amd/hlfsd/hlfsd.8 index b7a0f0b..8db06d2 100644 --- a/contrib/amd/hlfsd/hlfsd.8 +++ b/contrib/amd/hlfsd/hlfsd.8 @@ -1,5 +1,5 @@ .\" -.\" Copyright (c) 1997-2003 Erez Zadok +.\" Copyright (c) 1997-2004 Erez Zadok .\" Copyright (c) 1989 Jan-Simon Pendry .\" Copyright (c) 1989 Imperial College of Science, Technology & Medicine .\" Copyright (c) 1989 The Regents of the University of California. @@ -36,7 +36,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $Id: hlfsd.8,v 1.3.2.4 2003/03/16 01:47:00 ezk Exp $ +.\" $Id: hlfsd.8,v 1.3.2.5 2004/01/06 03:15:23 ezk Exp $ .\" $FreeBSD$ .\" .\" HLFSD was written at Columbia University Computer Science Department, by diff --git a/contrib/amd/hlfsd/hlfsd.c b/contrib/amd/hlfsd/hlfsd.c index fdc3dae..17ee61f 100644 --- a/contrib/amd/hlfsd/hlfsd.c +++ b/contrib/amd/hlfsd/hlfsd.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997-2003 Erez Zadok + * Copyright (c) 1997-2004 Erez Zadok * Copyright (c) 1989 Jan-Simon Pendry * Copyright (c) 1989 Imperial College of Science, Technology & Medicine * Copyright (c) 1989 The Regents of the University of California. @@ -38,7 +38,7 @@ * * %W% (Berkeley) %G% * - * $Id: hlfsd.c,v 1.7.2.7 2002/12/27 22:45:08 ezk Exp $ + * $Id: hlfsd.c,v 1.7.2.9 2004/01/19 00:25:55 ezk Exp $ * $FreeBSD$ * * HLFSD was written at Columbia University Computer Science Department, by @@ -747,7 +747,7 @@ hlfsd_init(void) if (setitimer(ITIMER_REAL, &reloadinterval, (struct itimerval *) 0) < 0) fatal("setitimer: %m"); - gettimeofday((struct timeval *) &startup, (struct timezone *) 0); + gettimeofday((struct timeval *) ((void *)&startup), (struct timezone *) 0); #ifdef DEBUG /* diff --git a/contrib/amd/hlfsd/hlfsd.h b/contrib/amd/hlfsd/hlfsd.h index 3daa8fc..ab0a94e 100644 --- a/contrib/amd/hlfsd/hlfsd.h +++ b/contrib/amd/hlfsd/hlfsd.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997-2003 Erez Zadok + * Copyright (c) 1997-2004 Erez Zadok * Copyright (c) 1989 Jan-Simon Pendry * Copyright (c) 1989 Imperial College of Science, Technology & Medicine * Copyright (c) 1989 The Regents of the University of California. @@ -38,7 +38,7 @@ * * %W% (Berkeley) %G% * - * $Id: hlfsd.h,v 1.4.2.6 2002/12/27 22:45:08 ezk Exp $ + * $Id: hlfsd.h,v 1.4.2.7 2004/01/06 03:15:23 ezk Exp $ * $FreeBSD$ * * HLFSD was written at Columbia University Computer Science Department, by diff --git a/contrib/amd/hlfsd/homedir.c b/contrib/amd/hlfsd/homedir.c index 24d5224..eef883a 100644 --- a/contrib/amd/hlfsd/homedir.c +++ b/contrib/amd/hlfsd/homedir.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997-2003 Erez Zadok + * Copyright (c) 1997-2004 Erez Zadok * Copyright (c) 1989 Jan-Simon Pendry * Copyright (c) 1989 Imperial College of Science, Technology & Medicine * Copyright (c) 1989 The Regents of the University of California. @@ -38,7 +38,7 @@ * * %W% (Berkeley) %G% * - * $Id: homedir.c,v 1.5.2.10 2002/12/27 22:45:08 ezk Exp $ + * $Id: homedir.c,v 1.5.2.11 2004/01/06 03:15:23 ezk Exp $ * $FreeBSD$ * * HLFSD was written at Columbia University Computer Science Department, by diff --git a/contrib/amd/include/am_defs.h b/contrib/amd/include/am_defs.h index 5e0271d..19d2a3b 100644 --- a/contrib/amd/include/am_defs.h +++ b/contrib/amd/include/am_defs.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997-2003 Erez Zadok + * Copyright (c) 1997-2004 Erez Zadok * Copyright (c) 1990 Jan-Simon Pendry * Copyright (c) 1990 Imperial College of Science, Technology & Medicine * Copyright (c) 1990 The Regents of the University of California. @@ -38,7 +38,7 @@ * * %W% (Berkeley) %G% * - * $Id: am_defs.h,v 1.15.2.13 2002/12/27 22:45:09 ezk Exp $ + * $Id: am_defs.h,v 1.15.2.16 2004/05/12 15:54:31 ezk Exp $ * $FreeBSD$ * */ @@ -70,6 +70,26 @@ char *strchr(), *strrchr(), *strdup(); #endif /* not STDC_HEADERS */ +/* AIX requires this to be the first thing in the file. */ +#ifndef __GNUC__ +# if HAVE_ALLOCA_H +# include +# else /* not HAVE_ALLOCA_H */ +# ifdef _AIX +/* + * This pragma directive is indented so that pre-ANSI C compilers will + * ignore it, rather than choke on it. + */ + #pragma alloca +# else /* not _AIX */ +# ifndef alloca +/* predefined by HP cc +Olibcalls */ +voidp alloca(); +# endif /* not alloca */ +# endif /* not _AIX */ +# endif /* not HAVE_ALLOCA_H */ +#endif /* not __GNUC__ */ + /* * Handle gcc __attribute__ if available. */ @@ -276,10 +296,13 @@ typedef bool_t (*xdrproc_t) __P ((XDR *, __ptr_t, ...)); /* * Actions to take if exists. + * Don't include malloc.h if stdlib.h exists, because modern + * systems complain if you use malloc.h instead of stdlib.h. + * XXX: let's hope there are no systems out there that need both. */ -#ifdef HAVE_MALLOC_H +#if defined(HAVE_MALLOC_H) && !defined(HAVE_STDLIB_H) # include -#endif /* HAVE_MALLOC_H */ +#endif /* defined(HAVE_MALLOC_H) && !defined(HAVE_STDLIB_H) */ /* * Actions to take if exists. @@ -326,21 +349,13 @@ extern int errno; * Should be included before because on some systems * like Linux, it also defines "struct datum". */ -#ifdef HAVE_NDBM_H -# include +#ifdef HAVE_MAP_NDBM +# include NEW_DBM_H # ifndef DATUM /* ensure that struct datum is not included again from */ # define DATUM # endif /* not DATUM */ -#else /* not HAVE_NDBM_H */ -# ifdef HAVE_DB1_NDBM_H -# include -# ifndef DATUM -/* ensure that struct datum is not included again from */ -# define DATUM -# endif /* not DATUM */ -# endif /* HAVE_DB1_NDBM_H */ -#endif /* HAVE_NDBM_H */ +#endif /* HAVE_MAP_NDBM */ /* * Actions to take if exists. diff --git a/contrib/amd/install-sh b/contrib/amd/install-sh deleted file mode 100755 index e9de238..0000000 --- a/contrib/amd/install-sh +++ /dev/null @@ -1,251 +0,0 @@ -#!/bin/sh -# -# install - install a program, script, or datafile -# This comes from X11R5 (mit/util/scripts/install.sh). -# -# Copyright 1991 by the Massachusetts Institute of Technology -# -# Permission to use, copy, modify, distribute, and sell this software and its -# documentation for any purpose is hereby granted without fee, provided that -# the above copyright notice appear in all copies and that both that -# copyright notice and this permission notice appear in supporting -# documentation, and that the name of M.I.T. not be used in advertising or -# publicity pertaining to distribution of the software without specific, -# written prior permission. M.I.T. makes no representations about the -# suitability of this software for any purpose. It is provided "as is" -# without express or implied warranty. -# -# Calling this script install-sh is preferred over install.sh, to prevent -# `make' implicit rules from creating a file called install from it -# when there is no Makefile. -# -# This script is compatible with the BSD install script, but was written -# from scratch. It can only install one file at a time, a restriction -# shared with many OS's install programs. - - -# set DOITPROG to echo to test this script - -# Don't use :- since 4.3BSD and earlier shells don't like it. -doit="${DOITPROG-}" - - -# put in absolute paths if you don't have them in your path; or use env. vars. - -mvprog="${MVPROG-mv}" -cpprog="${CPPROG-cp}" -chmodprog="${CHMODPROG-chmod}" -chownprog="${CHOWNPROG-chown}" -chgrpprog="${CHGRPPROG-chgrp}" -stripprog="${STRIPPROG-strip}" -rmprog="${RMPROG-rm}" -mkdirprog="${MKDIRPROG-mkdir}" - -transformbasename="" -transform_arg="" -instcmd="$mvprog" -chmodcmd="$chmodprog 0755" -chowncmd="" -chgrpcmd="" -stripcmd="" -rmcmd="$rmprog -f" -mvcmd="$mvprog" -src="" -dst="" -dir_arg="" - -while [ x"$1" != x ]; do - case $1 in - -c) instcmd="$cpprog" - shift - continue;; - - -d) dir_arg=true - shift - continue;; - - -m) chmodcmd="$chmodprog $2" - shift - shift - continue;; - - -o) chowncmd="$chownprog $2" - shift - shift - continue;; - - -g) chgrpcmd="$chgrpprog $2" - shift - shift - continue;; - - -s) stripcmd="$stripprog" - shift - continue;; - - -t=*) transformarg=`echo $1 | sed 's/-t=//'` - shift - continue;; - - -b=*) transformbasename=`echo $1 | sed 's/-b=//'` - shift - continue;; - - *) if [ x"$src" = x ] - then - src=$1 - else - # this colon is to work around a 386BSD /bin/sh bug - : - dst=$1 - fi - shift - continue;; - esac -done - -if [ x"$src" = x ] -then - echo "install: no input file specified" - exit 1 -else - true -fi - -if [ x"$dir_arg" != x ]; then - dst=$src - src="" - - if [ -d $dst ]; then - instcmd=: - chmodcmd="" - else - instcmd=mkdir - fi -else - -# Waiting for this to be detected by the "$instcmd $src $dsttmp" command -# might cause directories to be created, which would be especially bad -# if $src (and thus $dsttmp) contains '*'. - - if [ -f $src -o -d $src ] - then - true - else - echo "install: $src does not exist" - exit 1 - fi - - if [ x"$dst" = x ] - then - echo "install: no destination specified" - exit 1 - else - true - fi - -# If destination is a directory, append the input filename; if your system -# does not like double slashes in filenames, you may need to add some logic - - if [ -d $dst ] - then - dst="$dst"/`basename $src` - else - true - fi -fi - -## this sed command emulates the dirname command -dstdir=`echo $dst | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'` - -# Make sure that the destination directory exists. -# this part is taken from Noah Friedman's mkinstalldirs script - -# Skip lots of stat calls in the usual case. -if [ ! -d "$dstdir" ]; then -defaultIFS=' -' -IFS="${IFS-${defaultIFS}}" - -oIFS="${IFS}" -# Some sh's can't handle IFS=/ for some reason. -IFS='%' -set - `echo ${dstdir} | sed -e 's@/@%@g' -e 's@^%@/@'` -IFS="${oIFS}" - -pathcomp='' - -while [ $# -ne 0 ] ; do - pathcomp="${pathcomp}${1}" - shift - - if [ ! -d "${pathcomp}" ] ; - then - $mkdirprog "${pathcomp}" - else - true - fi - - pathcomp="${pathcomp}/" -done -fi - -if [ x"$dir_arg" != x ] -then - $doit $instcmd $dst && - - if [ x"$chowncmd" != x ]; then $doit $chowncmd $dst; else true ; fi && - if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dst; else true ; fi && - if [ x"$stripcmd" != x ]; then $doit $stripcmd $dst; else true ; fi && - if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dst; else true ; fi -else - -# If we're going to rename the final executable, determine the name now. - - if [ x"$transformarg" = x ] - then - dstfile=`basename $dst` - else - dstfile=`basename $dst $transformbasename | - sed $transformarg`$transformbasename - fi - -# don't allow the sed command to completely eliminate the filename - - if [ x"$dstfile" = x ] - then - dstfile=`basename $dst` - else - true - fi - -# Make a temp file name in the proper directory. - - dsttmp=$dstdir/#inst.$$# - -# Move or copy the file name to the temp name - - $doit $instcmd $src $dsttmp && - - trap "rm -f ${dsttmp}" 0 && - -# and set any options; do chmod last to preserve setuid bits - -# If any of these fail, we abort the whole thing. If we want to -# ignore errors from any of these, just make sure not to ignore -# errors from the above "$doit $instcmd $src $dsttmp" command. - - if [ x"$chowncmd" != x ]; then $doit $chowncmd $dsttmp; else true;fi && - if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dsttmp; else true;fi && - if [ x"$stripcmd" != x ]; then $doit $stripcmd $dsttmp; else true;fi && - if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dsttmp; else true;fi && - -# Now rename the file to the real destination. - - $doit $rmcmd -f $dstdir/$dstfile && - $doit $mvcmd $dsttmp $dstdir/$dstfile - -fi && - - -exit 0 diff --git a/contrib/amd/libamu/mount_fs.c b/contrib/amd/libamu/mount_fs.c index 53198f2..e134c90 100644 --- a/contrib/amd/libamu/mount_fs.c +++ b/contrib/amd/libamu/mount_fs.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997-2003 Erez Zadok + * Copyright (c) 1997-2004 Erez Zadok * Copyright (c) 1990 Jan-Simon Pendry * Copyright (c) 1990 Imperial College of Science, Technology & Medicine * Copyright (c) 1990 The Regents of the University of California. @@ -38,7 +38,7 @@ * * %W% (Berkeley) %G% * - * $Id: mount_fs.c,v 1.11.2.11 2003/05/08 17:57:53 ib42 Exp $ + * $Id: mount_fs.c,v 1.11.2.12 2004/01/06 03:15:24 ezk Exp $ * $FreeBSD$ * */ diff --git a/contrib/amd/ltmain.sh b/contrib/amd/ltmain.sh deleted file mode 100644 index 6e5bf36..0000000 --- a/contrib/amd/ltmain.sh +++ /dev/null @@ -1,4984 +0,0 @@ -# ltmain.sh - Provide generalized library-building support services. -# NOTE: Changing this file will not affect anything until you rerun configure. -# -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001 -# Free Software Foundation, Inc. -# Originally by Gordon Matzigkeit , 1996 -# -# 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 -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -# -# As a special exception to the GNU General Public License, if you -# distribute this file as part of a program that contains a -# configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that program. - -# Check that we have a working $echo. -if test "X$1" = X--no-reexec; then - # Discard the --no-reexec flag, and continue. - shift -elif test "X$1" = X--fallback-echo; then - # Avoid inline document here, it may be left over - : -elif test "X`($echo '\t') 2>/dev/null`" = 'X\t'; then - # Yippee, $echo works! - : -else - # Restart under the correct shell, and then maybe $echo will work. - exec $SHELL "$0" --no-reexec ${1+"$@"} -fi - -if test "X$1" = X--fallback-echo; then - # used as fallback echo - shift - cat <&2 - echo "Fatal configuration error. See the $PACKAGE docs for more information." 1>&2 - exit 1 -fi - -# Global variables. -mode=$default_mode -nonopt= -prev= -prevopt= -run= -show="$echo" -show_help= -execute_dlfiles= -lo2o="s/\\.lo\$/.${objext}/" -o2lo="s/\\.${objext}\$/.lo/" - -# Parse our command line options once, thoroughly. -while test $# -gt 0 -do - arg="$1" - shift - - case $arg in - -*=*) optarg=`$echo "X$arg" | $Xsed -e 's/[-_a-zA-Z0-9]*=//'` ;; - *) optarg= ;; - esac - - # If the previous option needs an argument, assign it. - if test -n "$prev"; then - case $prev in - execute_dlfiles) - execute_dlfiles="$execute_dlfiles $arg" - ;; - *) - eval "$prev=\$arg" - ;; - esac - - prev= - prevopt= - continue - fi - - # Have we seen a non-optional argument yet? - case $arg in - --help) - show_help=yes - ;; - - --version) - echo "$PROGRAM (GNU $PACKAGE) $VERSION$TIMESTAMP" - exit 0 - ;; - - --config) - sed -e '1,/^# ### BEGIN LIBTOOL CONFIG/d' -e '/^# ### END LIBTOOL CONFIG/,$d' $0 - exit 0 - ;; - - --debug) - echo "$progname: enabling shell trace mode" - set -x - ;; - - --dry-run | -n) - run=: - ;; - - --features) - echo "host: $host" - if test "$build_libtool_libs" = yes; then - echo "enable shared libraries" - else - echo "disable shared libraries" - fi - if test "$build_old_libs" = yes; then - echo "enable static libraries" - else - echo "disable static libraries" - fi - exit 0 - ;; - - --finish) mode="finish" ;; - - --mode) prevopt="--mode" prev=mode ;; - --mode=*) mode="$optarg" ;; - - --quiet | --silent) - show=: - ;; - - -dlopen) - prevopt="-dlopen" - prev=execute_dlfiles - ;; - - -*) - $echo "$modename: unrecognized option \`$arg'" 1>&2 - $echo "$help" 1>&2 - exit 1 - ;; - - *) - nonopt="$arg" - break - ;; - esac -done - -if test -n "$prevopt"; then - $echo "$modename: option \`$prevopt' requires an argument" 1>&2 - $echo "$help" 1>&2 - exit 1 -fi - -# If this variable is set in any of the actions, the command in it -# will be execed at the end. This prevents here-documents from being -# left over by shells. -exec_cmd= - -if test -z "$show_help"; then - - # Infer the operation mode. - if test -z "$mode"; then - case $nonopt in - *cc | *++ | gcc* | *-gcc*) - mode=link - for arg - do - case $arg in - -c) - mode=compile - break - ;; - esac - done - ;; - *db | *dbx | *strace | *truss) - mode=execute - ;; - *install*|cp|mv) - mode=install - ;; - *rm) - mode=uninstall - ;; - *) - # If we have no mode, but dlfiles were specified, then do execute mode. - test -n "$execute_dlfiles" && mode=execute - - # Just use the default operation mode. - if test -z "$mode"; then - if test -n "$nonopt"; then - $echo "$modename: warning: cannot infer operation mode from \`$nonopt'" 1>&2 - else - $echo "$modename: warning: cannot infer operation mode without MODE-ARGS" 1>&2 - fi - fi - ;; - esac - fi - - # Only execute mode is allowed to have -dlopen flags. - if test -n "$execute_dlfiles" && test "$mode" != execute; then - $echo "$modename: unrecognized option \`-dlopen'" 1>&2 - $echo "$help" 1>&2 - exit 1 - fi - - # Change the help message to a mode-specific one. - generic_help="$help" - help="Try \`$modename --help --mode=$mode' for more information." - - # These modes are in order of execution frequency so that they run quickly. - case $mode in - # libtool compile mode - compile) - modename="$modename: compile" - # Get the compilation command and the source file. - base_compile= - prev= - lastarg= - srcfile="$nonopt" - suppress_output= - - user_target=no - for arg - do - case $prev in - "") ;; - xcompiler) - # Aesthetically quote the previous argument. - prev= - lastarg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"` - - case $arg in - # Double-quote args containing other shell metacharacters. - # Many Bourne shells cannot handle close brackets correctly - # in scan sets, so we specify it separately. - *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") - arg="\"$arg\"" - ;; - esac - - # Add the previous argument to base_compile. - if test -z "$base_compile"; then - base_compile="$lastarg" - else - base_compile="$base_compile $lastarg" - fi - continue - ;; - esac - - # Accept any command-line options. - case $arg in - -o) - if test "$user_target" != "no"; then - $echo "$modename: you cannot specify \`-o' more than once" 1>&2 - exit 1 - fi - user_target=next - ;; - - -static) - build_old_libs=yes - continue - ;; - - -prefer-pic) - pic_mode=yes - continue - ;; - - -prefer-non-pic) - pic_mode=no - continue - ;; - - -Xcompiler) - prev=xcompiler - continue - ;; - - -Wc,*) - args=`$echo "X$arg" | $Xsed -e "s/^-Wc,//"` - lastarg= - save_ifs="$IFS"; IFS=',' - for arg in $args; do - IFS="$save_ifs" - - # Double-quote args containing other shell metacharacters. - # Many Bourne shells cannot handle close brackets correctly - # in scan sets, so we specify it separately. - case $arg in - *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") - arg="\"$arg\"" - ;; - esac - lastarg="$lastarg $arg" - done - IFS="$save_ifs" - lastarg=`$echo "X$lastarg" | $Xsed -e "s/^ //"` - - # Add the arguments to base_compile. - if test -z "$base_compile"; then - base_compile="$lastarg" - else - base_compile="$base_compile $lastarg" - fi - continue - ;; - esac - - case $user_target in - next) - # The next one is the -o target name - user_target=yes - continue - ;; - yes) - # We got the output file - user_target=set - libobj="$arg" - continue - ;; - esac - - # Accept the current argument as the source file. - lastarg="$srcfile" - srcfile="$arg" - - # Aesthetically quote the previous argument. - - # Backslashify any backslashes, double quotes, and dollar signs. - # These are the only characters that are still specially - # interpreted inside of double-quoted scrings. - lastarg=`$echo "X$lastarg" | $Xsed -e "$sed_quote_subst"` - - # Double-quote args containing other shell metacharacters. - # Many Bourne shells cannot handle close brackets correctly - # in scan sets, so we specify it separately. - case $lastarg in - *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") - lastarg="\"$lastarg\"" - ;; - esac - - # Add the previous argument to base_compile. - if test -z "$base_compile"; then - base_compile="$lastarg" - else - base_compile="$base_compile $lastarg" - fi - done - - case $user_target in - set) - ;; - no) - # Get the name of the library object. - libobj=`$echo "X$srcfile" | $Xsed -e 's%^.*/%%'` - ;; - *) - $echo "$modename: you must specify a target with \`-o'" 1>&2 - exit 1 - ;; - esac - - # Recognize several different file suffixes. - # If the user specifies -o file.o, it is replaced with file.lo - xform='[cCFSfmso]' - case $libobj in - *.ada) xform=ada ;; - *.adb) xform=adb ;; - *.ads) xform=ads ;; - *.asm) xform=asm ;; - *.c++) xform=c++ ;; - *.cc) xform=cc ;; - *.cpp) xform=cpp ;; - *.cxx) xform=cxx ;; - *.f90) xform=f90 ;; - *.for) xform=for ;; - esac - - libobj=`$echo "X$libobj" | $Xsed -e "s/\.$xform$/.lo/"` - - case $libobj in - *.lo) obj=`$echo "X$libobj" | $Xsed -e "$lo2o"` ;; - *) - $echo "$modename: cannot determine name of library object from \`$libobj'" 1>&2 - exit 1 - ;; - esac - - if test -z "$base_compile"; then - $echo "$modename: you must specify a compilation command" 1>&2 - $echo "$help" 1>&2 - exit 1 - fi - - # Delete any leftover library objects. - if test "$build_old_libs" = yes; then - removelist="$obj $libobj" - else - removelist="$libobj" - fi - - $run $rm $removelist - trap "$run $rm $removelist; exit 1" 1 2 15 - - # On Cygwin there's no "real" PIC flag so we must build both object types - case $host_os in - cygwin* | mingw* | pw32* | os2*) - pic_mode=default - ;; - esac - if test $pic_mode = no && test "$deplibs_check_method" != pass_all; then - # non-PIC code in shared libraries is not supported - pic_mode=default - fi - - # Calculate the filename of the output object if compiler does - # not support -o with -c - if test "$compiler_c_o" = no; then - output_obj=`$echo "X$srcfile" | $Xsed -e 's%^.*/%%' -e 's%\.[^.]*$%%'`.${objext} - lockfile="$output_obj.lock" - removelist="$removelist $output_obj $lockfile" - trap "$run $rm $removelist; exit 1" 1 2 15 - else - need_locks=no - lockfile= - fi - - # Lock this critical section if it is needed - # We use this script file to make the link, it avoids creating a new file - if test "$need_locks" = yes; then - until $run ln "$0" "$lockfile" 2>/dev/null; do - $show "Waiting for $lockfile to be removed" - sleep 2 - done - elif test "$need_locks" = warn; then - if test -f "$lockfile"; then - echo "\ -*** ERROR, $lockfile exists and contains: -`cat $lockfile 2>/dev/null` - -This indicates that another process is trying to use the same -temporary object file, and libtool could not work around it because -your compiler does not support \`-c' and \`-o' together. If you -repeat this compilation, it may succeed, by chance, but you had better -avoid parallel builds (make -j) in this platform, or get a better -compiler." - - $run $rm $removelist - exit 1 - fi - echo $srcfile > "$lockfile" - fi - - if test -n "$fix_srcfile_path"; then - eval srcfile=\"$fix_srcfile_path\" - fi - - # Only build a PIC object if we are building libtool libraries. - if test "$build_libtool_libs" = yes; then - # Without this assignment, base_compile gets emptied. - fbsd_hideous_sh_bug=$base_compile - - if test "$pic_mode" != no; then - # All platforms use -DPIC, to notify preprocessed assembler code. - command="$base_compile $srcfile $pic_flag -DPIC" - else - # Don't build PIC code - command="$base_compile $srcfile" - fi - if test "$build_old_libs" = yes; then - lo_libobj="$libobj" - dir=`$echo "X$libobj" | $Xsed -e 's%/[^/]*$%%'` - if test "X$dir" = "X$libobj"; then - dir="$objdir" - else - dir="$dir/$objdir" - fi - libobj="$dir/"`$echo "X$libobj" | $Xsed -e 's%^.*/%%'` - - if test -d "$dir"; then - $show "$rm $libobj" - $run $rm $libobj - else - $show "$mkdir $dir" - $run $mkdir $dir - status=$? - if test $status -ne 0 && test ! -d $dir; then - exit $status - fi - fi - fi - if test "$compiler_o_lo" = yes; then - output_obj="$libobj" - command="$command -o $output_obj" - elif test "$compiler_c_o" = yes; then - output_obj="$obj" - command="$command -o $output_obj" - fi - - $run $rm "$output_obj" - $show "$command" - if $run eval "$command"; then : - else - test -n "$output_obj" && $run $rm $removelist - exit 1 - fi - - if test "$need_locks" = warn && - test x"`cat $lockfile 2>/dev/null`" != x"$srcfile"; then - echo "\ -*** ERROR, $lockfile contains: -`cat $lockfile 2>/dev/null` - -but it should contain: -$srcfile - -This indicates that another process is trying to use the same -temporary object file, and libtool could not work around it because -your compiler does not support \`-c' and \`-o' together. If you -repeat this compilation, it may succeed, by chance, but you had better -avoid parallel builds (make -j) in this platform, or get a better -compiler." - - $run $rm $removelist - exit 1 - fi - - # Just move the object if needed, then go on to compile the next one - if test x"$output_obj" != x"$libobj"; then - $show "$mv $output_obj $libobj" - if $run $mv $output_obj $libobj; then : - else - error=$? - $run $rm $removelist - exit $error - fi - fi - - # If we have no pic_flag, then copy the object into place and finish. - if (test -z "$pic_flag" || test "$pic_mode" != default) && - test "$build_old_libs" = yes; then - # Rename the .lo from within objdir to obj - if test -f $obj; then - $show $rm $obj - $run $rm $obj - fi - - $show "$mv $libobj $obj" - if $run $mv $libobj $obj; then : - else - error=$? - $run $rm $removelist - exit $error - fi - - xdir=`$echo "X$obj" | $Xsed -e 's%/[^/]*$%%'` - if test "X$xdir" = "X$obj"; then - xdir="." - else - xdir="$xdir" - fi - baseobj=`$echo "X$obj" | $Xsed -e "s%.*/%%"` - libobj=`$echo "X$baseobj" | $Xsed -e "$o2lo"` - # Now arrange that obj and lo_libobj become the same file - $show "(cd $xdir && $LN_S $baseobj $libobj)" - if $run eval '(cd $xdir && $LN_S $baseobj $libobj)'; then - # Unlock the critical section if it was locked - if test "$need_locks" != no; then - $run $rm "$lockfile" - fi - exit 0 - else - error=$? - $run $rm $removelist - exit $error - fi - fi - - # Allow error messages only from the first compilation. - suppress_output=' >/dev/null 2>&1' - fi - - # Only build a position-dependent object if we build old libraries. - if test "$build_old_libs" = yes; then - if test "$pic_mode" != yes; then - # Don't build PIC code - command="$base_compile $srcfile" - else - # All platforms use -DPIC, to notify preprocessed assembler code. - command="$base_compile $srcfile $pic_flag -DPIC" - fi - if test "$compiler_c_o" = yes; then - command="$command -o $obj" - output_obj="$obj" - fi - - # Suppress compiler output if we already did a PIC compilation. - command="$command$suppress_output" - $run $rm "$output_obj" - $show "$command" - if $run eval "$command"; then : - else - $run $rm $removelist - exit 1 - fi - - if test "$need_locks" = warn && - test x"`cat $lockfile 2>/dev/null`" != x"$srcfile"; then - echo "\ -*** ERROR, $lockfile contains: -`cat $lockfile 2>/dev/null` - -but it should contain: -$srcfile - -This indicates that another process is trying to use the same -temporary object file, and libtool could not work around it because -your compiler does not support \`-c' and \`-o' together. If you -repeat this compilation, it may succeed, by chance, but you had better -avoid parallel builds (make -j) in this platform, or get a better -compiler." - - $run $rm $removelist - exit 1 - fi - - # Just move the object if needed - if test x"$output_obj" != x"$obj"; then - $show "$mv $output_obj $obj" - if $run $mv $output_obj $obj; then : - else - error=$? - $run $rm $removelist - exit $error - fi - fi - - # Create an invalid libtool object if no PIC, so that we do not - # accidentally link it into a program. - if test "$build_libtool_libs" != yes; then - $show "echo timestamp > $libobj" - $run eval "echo timestamp > \$libobj" || exit $? - else - # Move the .lo from within objdir - $show "$mv $libobj $lo_libobj" - if $run $mv $libobj $lo_libobj; then : - else - error=$? - $run $rm $removelist - exit $error - fi - fi - fi - - # Unlock the critical section if it was locked - if test "$need_locks" != no; then - $run $rm "$lockfile" - fi - - exit 0 - ;; - - # libtool link mode - link | relink) - modename="$modename: link" - case $host in - *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*) - # It is impossible to link a dll without this setting, and - # we shouldn't force the makefile maintainer to figure out - # which system we are compiling for in order to pass an extra - # flag for every libtool invokation. - # allow_undefined=no - - # FIXME: Unfortunately, there are problems with the above when trying - # to make a dll which has undefined symbols, in which case not - # even a static library is built. For now, we need to specify - # -no-undefined on the libtool link line when we can be certain - # that all symbols are satisfied, otherwise we get a static library. - allow_undefined=yes - ;; - *) - allow_undefined=yes - ;; - esac - libtool_args="$nonopt" - compile_command="$nonopt" - finalize_command="$nonopt" - - compile_rpath= - finalize_rpath= - compile_shlibpath= - finalize_shlibpath= - convenience= - old_convenience= - deplibs= - old_deplibs= - compiler_flags= - linker_flags= - dllsearchpath= - lib_search_path=`pwd` - - avoid_version=no - dlfiles= - dlprefiles= - dlself=no - export_dynamic=no - export_symbols= - export_symbols_regex= - generated= - libobjs= - ltlibs= - module=no - no_install=no - objs= - prefer_static_libs=no - preload=no - prev= - prevarg= - release= - rpath= - xrpath= - perm_rpath= - temp_rpath= - thread_safe=no - vinfo= - - # We need to know -static, to get the right output filenames. - for arg - do - case $arg in - -all-static | -static) - if test "X$arg" = "X-all-static"; then - if test "$build_libtool_libs" = yes && test -z "$link_static_flag"; then - $echo "$modename: warning: complete static linking is impossible in this configuration" 1>&2 - fi - if test -n "$link_static_flag"; then - dlopen_self=$dlopen_self_static - fi - else - if test -z "$pic_flag" && test -n "$link_static_flag"; then - dlopen_self=$dlopen_self_static - fi - fi - build_libtool_libs=no - build_old_libs=yes - prefer_static_libs=yes - break - ;; - esac - done - - # See if our shared archives depend on static archives. - test -n "$old_archive_from_new_cmds" && build_old_libs=yes - - # Go through the arguments, transforming them on the way. - while test $# -gt 0; do - arg="$1" - shift - case $arg in - *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") - qarg=\"`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`\" ### testsuite: skip nested quoting test - ;; - *) qarg=$arg ;; - esac - libtool_args="$libtool_args $qarg" - - # If the previous option needs an argument, assign it. - if test -n "$prev"; then - case $prev in - output) - compile_command="$compile_command @OUTPUT@" - finalize_command="$finalize_command @OUTPUT@" - ;; - esac - - case $prev in - dlfiles|dlprefiles) - if test "$preload" = no; then - # Add the symbol object into the linking commands. - compile_command="$compile_command @SYMFILE@" - finalize_command="$finalize_command @SYMFILE@" - preload=yes - fi - case $arg in - *.la | *.lo) ;; # We handle these cases below. - force) - if test "$dlself" = no; then - dlself=needless - export_dynamic=yes - fi - prev= - continue - ;; - self) - if test "$prev" = dlprefiles; then - dlself=yes - elif test "$prev" = dlfiles && test "$dlopen_self" != yes; then - dlself=yes - else - dlself=needless - export_dynamic=yes - fi - prev= - continue - ;; - *) - if test "$prev" = dlfiles; then - dlfiles="$dlfiles $arg" - else - dlprefiles="$dlprefiles $arg" - fi - prev= - continue - ;; - esac - ;; - expsyms) - export_symbols="$arg" - if test ! -f "$arg"; then - $echo "$modename: symbol file \`$arg' does not exist" - exit 1 - fi - prev= - continue - ;; - expsyms_regex) - export_symbols_regex="$arg" - prev= - continue - ;; - release) - release="-$arg" - prev= - continue - ;; - rpath | xrpath) - # We need an absolute path. - case $arg in - [\\/]* | [A-Za-z]:[\\/]*) ;; - *) - $echo "$modename: only absolute run-paths are allowed" 1>&2 - exit 1 - ;; - esac - if test "$prev" = rpath; then - case "$rpath " in - *" $arg "*) ;; - *) rpath="$rpath $arg" ;; - esac - else - case "$xrpath " in - *" $arg "*) ;; - *) xrpath="$xrpath $arg" ;; - esac - fi - prev= - continue - ;; - xcompiler) - compiler_flags="$compiler_flags $qarg" - prev= - compile_command="$compile_command $qarg" - finalize_command="$finalize_command $qarg" - continue - ;; - xlinker) - linker_flags="$linker_flags $qarg" - compiler_flags="$compiler_flags $wl$qarg" - prev= - compile_command="$compile_command $wl$qarg" - finalize_command="$finalize_command $wl$qarg" - continue - ;; - *) - eval "$prev=\"\$arg\"" - prev= - continue - ;; - esac - fi # test -n $prev - - prevarg="$arg" - - case $arg in - -all-static) - if test -n "$link_static_flag"; then - compile_command="$compile_command $link_static_flag" - finalize_command="$finalize_command $link_static_flag" - fi - continue - ;; - - -allow-undefined) - # FIXME: remove this flag sometime in the future. - $echo "$modename: \`-allow-undefined' is deprecated because it is the default" 1>&2 - continue - ;; - - -avoid-version) - avoid_version=yes - continue - ;; - - -dlopen) - prev=dlfiles - continue - ;; - - -dlpreopen) - prev=dlprefiles - continue - ;; - - -export-dynamic) - export_dynamic=yes - continue - ;; - - -export-symbols | -export-symbols-regex) - if test -n "$export_symbols" || test -n "$export_symbols_regex"; then - $echo "$modename: more than one -exported-symbols argument is not allowed" - exit 1 - fi - if test "X$arg" = "X-export-symbols"; then - prev=expsyms - else - prev=expsyms_regex - fi - continue - ;; - - # The native IRIX linker understands -LANG:*, -LIST:* and -LNO:* - # so, if we see these flags be careful not to treat them like -L - -L[A-Z][A-Z]*:*) - case $with_gcc/$host in - no/*-*-irix*) - compile_command="$compile_command $arg" - finalize_command="$finalize_command $arg" - ;; - esac - continue - ;; - - -L*) - dir=`$echo "X$arg" | $Xsed -e 's/^-L//'` - # We need an absolute path. - case $dir in - [\\/]* | [A-Za-z]:[\\/]*) ;; - *) - absdir=`cd "$dir" && pwd` - if test -z "$absdir"; then - $echo "$modename: cannot determine absolute directory name of \`$dir'" 1>&2 - exit 1 - fi - dir="$absdir" - ;; - esac - case "$deplibs " in - *" -L$dir "*) ;; - *) - deplibs="$deplibs -L$dir" - lib_search_path="$lib_search_path $dir" - ;; - esac - case $host in - *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*) - case :$dllsearchpath: in - *":$dir:"*) ;; - *) dllsearchpath="$dllsearchpath:$dir";; - esac - ;; - esac - continue - ;; - - -l*) - if test "X$arg" = "X-lc" || test "X$arg" = "X-lm"; then - case $host in - *-*-cygwin* | *-*-pw32* | *-*-beos*) - # These systems don't actually have a C or math library (as such) - continue - ;; - *-*-mingw* | *-*-os2*) - # These systems don't actually have a C library (as such) - test "X$arg" = "X-lc" && continue - ;; - *-*-openbsd*) - # Do not include libc due to us having libc/libc_r. - test "X$arg" = "X-lc" && continue - ;; - esac - elif test "X$arg" = "X-lc_r"; then - case $host in - *-*-openbsd*) - # Do not include libc_r directly, use -pthread flag. - continue - ;; - esac - fi - deplibs="$deplibs $arg" - continue - ;; - - -module) - module=yes - continue - ;; - - -no-fast-install) - fast_install=no - continue - ;; - - -no-install) - case $host in - *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*) - # The PATH hackery in wrapper scripts is required on Windows - # in order for the loader to find any dlls it needs. - $echo "$modename: warning: \`-no-install' is ignored for $host" 1>&2 - $echo "$modename: warning: assuming \`-no-fast-install' instead" 1>&2 - fast_install=no - ;; - *) no_install=yes ;; - esac - continue - ;; - - -no-undefined) - allow_undefined=no - continue - ;; - - -o) prev=output ;; - - -release) - prev=release - continue - ;; - - -rpath) - prev=rpath - continue - ;; - - -R) - prev=xrpath - continue - ;; - - -R*) - dir=`$echo "X$arg" | $Xsed -e 's/^-R//'` - # We need an absolute path. - case $dir in - [\\/]* | [A-Za-z]:[\\/]*) ;; - *) - $echo "$modename: only absolute run-paths are allowed" 1>&2 - exit 1 - ;; - esac - case "$xrpath " in - *" $dir "*) ;; - *) xrpath="$xrpath $dir" ;; - esac - continue - ;; - - -static) - # The effects of -static are defined in a previous loop. - # We used to do the same as -all-static on platforms that - # didn't have a PIC flag, but the assumption that the effects - # would be equivalent was wrong. It would break on at least - # Digital Unix and AIX. - continue - ;; - - -thread-safe) - thread_safe=yes - continue - ;; - - -version-info) - prev=vinfo - continue - ;; - - -Wc,*) - args=`$echo "X$arg" | $Xsed -e "$sed_quote_subst" -e 's/^-Wc,//'` - arg= - save_ifs="$IFS"; IFS=',' - for flag in $args; do - IFS="$save_ifs" - case $flag in - *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") - flag="\"$flag\"" - ;; - esac - arg="$arg $wl$flag" - compiler_flags="$compiler_flags $flag" - done - IFS="$save_ifs" - arg=`$echo "X$arg" | $Xsed -e "s/^ //"` - ;; - - -Wl,*) - args=`$echo "X$arg" | $Xsed -e "$sed_quote_subst" -e 's/^-Wl,//'` - arg= - save_ifs="$IFS"; IFS=',' - for flag in $args; do - IFS="$save_ifs" - case $flag in - *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") - flag="\"$flag\"" - ;; - esac - arg="$arg $wl$flag" - compiler_flags="$compiler_flags $wl$flag" - linker_flags="$linker_flags $flag" - done - IFS="$save_ifs" - arg=`$echo "X$arg" | $Xsed -e "s/^ //"` - ;; - - -Xcompiler) - prev=xcompiler - continue - ;; - - -Xlinker) - prev=xlinker - continue - ;; - - # Some other compiler flag. - -* | +*) - # Unknown arguments in both finalize_command and compile_command need - # to be aesthetically quoted because they are evaled later. - arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"` - case $arg in - *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") - arg="\"$arg\"" - ;; - esac - ;; - - *.lo | *.$objext) - # A library or standard object. - if test "$prev" = dlfiles; then - # This file was specified with -dlopen. - if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then - dlfiles="$dlfiles $arg" - prev= - continue - else - # If libtool objects are unsupported, then we need to preload. - prev=dlprefiles - fi - fi - - if test "$prev" = dlprefiles; then - # Preload the old-style object. - dlprefiles="$dlprefiles "`$echo "X$arg" | $Xsed -e "$lo2o"` - prev= - else - case $arg in - *.lo) libobjs="$libobjs $arg" ;; - *) objs="$objs $arg" ;; - esac - fi - ;; - - *.$libext) - # An archive. - deplibs="$deplibs $arg" - old_deplibs="$old_deplibs $arg" - continue - ;; - - *.la) - # A libtool-controlled library. - - if test "$prev" = dlfiles; then - # This library was specified with -dlopen. - dlfiles="$dlfiles $arg" - prev= - elif test "$prev" = dlprefiles; then - # The library was specified with -dlpreopen. - dlprefiles="$dlprefiles $arg" - prev= - else - deplibs="$deplibs $arg" - fi - continue - ;; - - # Some other compiler argument. - *) - # Unknown arguments in both finalize_command and compile_command need - # to be aesthetically quoted because they are evaled later. - arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"` - case $arg in - *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") - arg="\"$arg\"" - ;; - esac - ;; - esac # arg - - # Now actually substitute the argument into the commands. - if test -n "$arg"; then - compile_command="$compile_command $arg" - finalize_command="$finalize_command $arg" - fi - done # argument parsing loop - - if test -n "$prev"; then - $echo "$modename: the \`$prevarg' option requires an argument" 1>&2 - $echo "$help" 1>&2 - exit 1 - fi - - if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then - eval arg=\"$export_dynamic_flag_spec\" - compile_command="$compile_command $arg" - finalize_command="$finalize_command $arg" - fi - - # calculate the name of the file, without its directory - outputname=`$echo "X$output" | $Xsed -e 's%^.*/%%'` - libobjs_save="$libobjs" - - if test -n "$shlibpath_var"; then - # get the directories listed in $shlibpath_var - eval shlib_search_path=\`\$echo \"X\${$shlibpath_var}\" \| \$Xsed -e \'s/:/ /g\'\` - else - shlib_search_path= - fi - eval sys_lib_search_path=\"$sys_lib_search_path_spec\" - eval sys_lib_dlsearch_path=\"$sys_lib_dlsearch_path_spec\" - - output_objdir=`$echo "X$output" | $Xsed -e 's%/[^/]*$%%'` - if test "X$output_objdir" = "X$output"; then - output_objdir="$objdir" - else - output_objdir="$output_objdir/$objdir" - fi - # Create the object directory. - if test ! -d $output_objdir; then - $show "$mkdir $output_objdir" - $run $mkdir $output_objdir - status=$? - if test $status -ne 0 && test ! -d $output_objdir; then - exit $status - fi - fi - - # Determine the type of output - case $output in - "") - $echo "$modename: you must specify an output file" 1>&2 - $echo "$help" 1>&2 - exit 1 - ;; - *.$libext) linkmode=oldlib ;; - *.lo | *.$objext) linkmode=obj ;; - *.la) linkmode=lib ;; - *) linkmode=prog ;; # Anything else should be a program. - esac - - specialdeplibs= - libs= - # Find all interdependent deplibs by searching for libraries - # that are linked more than once (e.g. -la -lb -la) - for deplib in $deplibs; do - case "$libs " in - *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; - esac - libs="$libs $deplib" - done - deplibs= - newdependency_libs= - newlib_search_path= - need_relink=no # whether we're linking any uninstalled libtool libraries - notinst_deplibs= # not-installed libtool libraries - notinst_path= # paths that contain not-installed libtool libraries - case $linkmode in - lib) - passes="conv link" - for file in $dlfiles $dlprefiles; do - case $file in - *.la) ;; - *) - $echo "$modename: libraries can \`-dlopen' only libtool libraries: $file" 1>&2 - exit 1 - ;; - esac - done - ;; - prog) - compile_deplibs= - finalize_deplibs= - alldeplibs=no - newdlfiles= - newdlprefiles= - passes="conv scan dlopen dlpreopen link" - ;; - *) passes="conv" - ;; - esac - for pass in $passes; do - if test $linkmode = prog; then - # Determine which files to process - case $pass in - dlopen) - libs="$dlfiles" - save_deplibs="$deplibs" # Collect dlpreopened libraries - deplibs= - ;; - dlpreopen) libs="$dlprefiles" ;; - link) libs="$deplibs %DEPLIBS% $dependency_libs" ;; - esac - fi - for deplib in $libs; do - lib= - found=no - case $deplib in - -l*) - if test $linkmode = oldlib && test $linkmode = obj; then - $echo "$modename: warning: \`-l' is ignored for archives/objects: $deplib" 1>&2 - continue - fi - if test $pass = conv; then - deplibs="$deplib $deplibs" - continue - fi - name=`$echo "X$deplib" | $Xsed -e 's/^-l//'` - for searchdir in $newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path; do - # Search the libtool library - lib="$searchdir/lib${name}.la" - if test -f "$lib"; then - found=yes - break - fi - done - if test "$found" != yes; then - # deplib doesn't seem to be a libtool library - if test "$linkmode,$pass" = "prog,link"; then - compile_deplibs="$deplib $compile_deplibs" - finalize_deplibs="$deplib $finalize_deplibs" - else - deplibs="$deplib $deplibs" - test $linkmode = lib && newdependency_libs="$deplib $newdependency_libs" - fi - continue - fi - ;; # -l - -L*) - case $linkmode in - lib) - deplibs="$deplib $deplibs" - test $pass = conv && continue - newdependency_libs="$deplib $newdependency_libs" - newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'` - ;; - prog) - if test $pass = conv; then - deplibs="$deplib $deplibs" - continue - fi - if test $pass = scan; then - deplibs="$deplib $deplibs" - newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'` - else - compile_deplibs="$deplib $compile_deplibs" - finalize_deplibs="$deplib $finalize_deplibs" - fi - ;; - *) - $echo "$modename: warning: \`-L' is ignored for archives/objects: $deplib" 1>&2 - ;; - esac # linkmode - continue - ;; # -L - -R*) - if test $pass = link; then - dir=`$echo "X$deplib" | $Xsed -e 's/^-R//'` - # Make sure the xrpath contains only unique directories. - case "$xrpath " in - *" $dir "*) ;; - *) xrpath="$xrpath $dir" ;; - esac - fi - deplibs="$deplib $deplibs" - continue - ;; - *.la) lib="$deplib" ;; - *.$libext) - if test $pass = conv; then - deplibs="$deplib $deplibs" - continue - fi - case $linkmode in - lib) - if test "$deplibs_check_method" != pass_all; then - echo - echo "*** Warning: This library needs some functionality provided by $deplib." - echo "*** I have the capability to make that library automatically link in when" - echo "*** you link to this library. But I can only do this if you have a" - echo "*** shared version of the library, which you do not appear to have." - else - echo - echo "*** Warning: Linking the shared library $output against the" - echo "*** static library $deplib is not portable!" - deplibs="$deplib $deplibs" - fi - continue - ;; - prog) - if test $pass != link; then - deplibs="$deplib $deplibs" - else - compile_deplibs="$deplib $compile_deplibs" - finalize_deplibs="$deplib $finalize_deplibs" - fi - continue - ;; - esac # linkmode - ;; # *.$libext - *.lo | *.$objext) - if test $pass = dlpreopen || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then - # If there is no dlopen support or we're linking statically, - # we need to preload. - newdlprefiles="$newdlprefiles $deplib" - compile_deplibs="$deplib $compile_deplibs" - finalize_deplibs="$deplib $finalize_deplibs" - else - newdlfiles="$newdlfiles $deplib" - fi - continue - ;; - %DEPLIBS%) - alldeplibs=yes - continue - ;; - esac # case $deplib - if test $found = yes || test -f "$lib"; then : - else - $echo "$modename: cannot find the library \`$lib'" 1>&2 - exit 1 - fi - - # Check to see that this really is a libtool archive. - if (sed -e '2q' $lib | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then : - else - $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2 - exit 1 - fi - - ladir=`$echo "X$lib" | $Xsed -e 's%/[^/]*$%%'` - test "X$ladir" = "X$lib" && ladir="." - - dlname= - dlopen= - dlpreopen= - libdir= - library_names= - old_library= - # If the library was installed with an old release of libtool, - # it will not redefine variable installed. - installed=yes - - # Read the .la file - case $lib in - */* | *\\*) . $lib ;; - *) . ./$lib ;; - esac - - if test "$linkmode,$pass" = "lib,link" || - test "$linkmode,$pass" = "prog,scan" || - { test $linkmode = oldlib && test $linkmode = obj; }; then - # Add dl[pre]opened files of deplib - test -n "$dlopen" && dlfiles="$dlfiles $dlopen" - test -n "$dlpreopen" && dlprefiles="$dlprefiles $dlpreopen" - fi - - if test $pass = conv; then - # Only check for convenience libraries - deplibs="$lib $deplibs" - if test -z "$libdir"; then - if test -z "$old_library"; then - $echo "$modename: cannot find name of link library for \`$lib'" 1>&2 - exit 1 - fi - # It is a libtool convenience library, so add in its objects. - convenience="$convenience $ladir/$objdir/$old_library" - old_convenience="$old_convenience $ladir/$objdir/$old_library" - tmp_libs= - for deplib in $dependency_libs; do - deplibs="$deplib $deplibs" - case "$tmp_libs " in - *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; - esac - tmp_libs="$tmp_libs $deplib" - done - elif test $linkmode != prog && test $linkmode != lib; then - $echo "$modename: \`$lib' is not a convenience library" 1>&2 - exit 1 - fi - continue - fi # $pass = conv - - # Get the name of the library we link against. - linklib= - for l in $old_library $library_names; do - linklib="$l" - done - if test -z "$linklib"; then - $echo "$modename: cannot find name of link library for \`$lib'" 1>&2 - exit 1 - fi - - # This library was specified with -dlopen. - if test $pass = dlopen; then - if test -z "$libdir"; then - $echo "$modename: cannot -dlopen a convenience library: \`$lib'" 1>&2 - exit 1 - fi - if test -z "$dlname" || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then - # If there is no dlname, no dlopen support or we're linking - # statically, we need to preload. - dlprefiles="$dlprefiles $lib" - else - newdlfiles="$newdlfiles $lib" - fi - continue - fi # $pass = dlopen - - # We need an absolute path. - case $ladir in - [\\/]* | [A-Za-z]:[\\/]*) abs_ladir="$ladir" ;; - *) - abs_ladir=`cd "$ladir" && pwd` - if test -z "$abs_ladir"; then - $echo "$modename: warning: cannot determine absolute directory name of \`$ladir'" 1>&2 - $echo "$modename: passing it literally to the linker, although it might fail" 1>&2 - abs_ladir="$ladir" - fi - ;; - esac - laname=`$echo "X$lib" | $Xsed -e 's%^.*/%%'` - - # Find the relevant object directory and library name. - if test "X$installed" = Xyes; then - if test ! -f "$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then - $echo "$modename: warning: library \`$lib' was moved." 1>&2 - dir="$ladir" - absdir="$abs_ladir" - libdir="$abs_ladir" - else - dir="$libdir" - absdir="$libdir" - fi - else - dir="$ladir/$objdir" - absdir="$abs_ladir/$objdir" - # Remove this search path later - notinst_path="$notinst_path $abs_ladir" - fi # $installed = yes - name=`$echo "X$laname" | $Xsed -e 's/\.la$//' -e 's/^lib//'` - - # This library was specified with -dlpreopen. - if test $pass = dlpreopen; then - if test -z "$libdir"; then - $echo "$modename: cannot -dlpreopen a convenience library: \`$lib'" 1>&2 - exit 1 - fi - # Prefer using a static library (so that no silly _DYNAMIC symbols - # are required to link). - if test -n "$old_library"; then - newdlprefiles="$newdlprefiles $dir/$old_library" - # Otherwise, use the dlname, so that lt_dlopen finds it. - elif test -n "$dlname"; then - newdlprefiles="$newdlprefiles $dir/$dlname" - else - newdlprefiles="$newdlprefiles $dir/$linklib" - fi - fi # $pass = dlpreopen - - if test -z "$libdir"; then - # Link the convenience library - if test $linkmode = lib; then - deplibs="$dir/$old_library $deplibs" - elif test "$linkmode,$pass" = "prog,link"; then - compile_deplibs="$dir/$old_library $compile_deplibs" - finalize_deplibs="$dir/$old_library $finalize_deplibs" - else - deplibs="$lib $deplibs" - fi - continue - fi - - if test $linkmode = prog && test $pass != link; then - newlib_search_path="$newlib_search_path $ladir" - deplibs="$lib $deplibs" - - linkalldeplibs=no - if test "$link_all_deplibs" != no || test -z "$library_names" || - test "$build_libtool_libs" = no; then - linkalldeplibs=yes - fi - - tmp_libs= - for deplib in $dependency_libs; do - case $deplib in - -L*) newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'`;; ### testsuite: skip nested quoting test - esac - # Need to link against all dependency_libs? - if test $linkalldeplibs = yes; then - deplibs="$deplib $deplibs" - else - # Need to hardcode shared library paths - # or/and link against static libraries - newdependency_libs="$deplib $newdependency_libs" - fi - case "$tmp_libs " in - *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; - esac - tmp_libs="$tmp_libs $deplib" - done # for deplib - continue - fi # $linkmode = prog... - - link_static=no # Whether the deplib will be linked statically - if test -n "$library_names" && - { test "$prefer_static_libs" = no || test -z "$old_library"; }; then - # Link against this shared library - - if test "$linkmode,$pass" = "prog,link" || - { test $linkmode = lib && test $hardcode_into_libs = yes; }; then - # Hardcode the library path. - # Skip directories that are in the system default run-time - # search path. - case " $sys_lib_dlsearch_path " in - *" $absdir "*) ;; - *) - case "$compile_rpath " in - *" $absdir "*) ;; - *) compile_rpath="$compile_rpath $absdir" - esac - ;; - esac - case " $sys_lib_dlsearch_path " in - *" $libdir "*) ;; - *) - case "$finalize_rpath " in - *" $libdir "*) ;; - *) finalize_rpath="$finalize_rpath $libdir" - esac - ;; - esac - if test $linkmode = prog; then - # We need to hardcode the library path - if test -n "$shlibpath_var"; then - # Make sure the rpath contains only unique directories. - case "$temp_rpath " in - *" $dir "*) ;; - *" $absdir "*) ;; - *) temp_rpath="$temp_rpath $dir" ;; - esac - fi - fi - fi # $linkmode,$pass = prog,link... - - if test "$alldeplibs" = yes && - { test "$deplibs_check_method" = pass_all || - { test "$build_libtool_libs" = yes && - test -n "$library_names"; }; }; then - # We only need to search for static libraries - continue - fi - - if test "$installed" = no; then - notinst_deplibs="$notinst_deplibs $lib" - need_relink=yes - fi - - if test -n "$old_archive_from_expsyms_cmds"; then - # figure out the soname - set dummy $library_names - realname="$2" - shift; shift - libname=`eval \\$echo \"$libname_spec\"` - # use dlname if we got it. it's perfectly good, no? - if test -n "$dlname"; then - soname="$dlname" - elif test -n "$soname_spec"; then - # bleh windows - case $host in - *cygwin*) - major=`expr $current - $age` - versuffix="-$major" - ;; - esac - eval soname=\"$soname_spec\" - else - soname="$realname" - fi - - # Make a new name for the extract_expsyms_cmds to use - soroot="$soname" - soname=`echo $soroot | sed -e 's/^.*\///'` - newlib="libimp-`echo $soname | sed 's/^lib//;s/\.dll$//'`.a" - - # If the library has no export list, then create one now - if test -f "$output_objdir/$soname-def"; then : - else - $show "extracting exported symbol list from \`$soname'" - save_ifs="$IFS"; IFS='~' - eval cmds=\"$extract_expsyms_cmds\" - for cmd in $cmds; do - IFS="$save_ifs" - $show "$cmd" - $run eval "$cmd" || exit $? - done - IFS="$save_ifs" - fi - - # Create $newlib - if test -f "$output_objdir/$newlib"; then :; else - $show "generating import library for \`$soname'" - save_ifs="$IFS"; IFS='~' - eval cmds=\"$old_archive_from_expsyms_cmds\" - for cmd in $cmds; do - IFS="$save_ifs" - $show "$cmd" - $run eval "$cmd" || exit $? - done - IFS="$save_ifs" - fi - # make sure the library variables are pointing to the new library - dir=$output_objdir - linklib=$newlib - fi # test -n $old_archive_from_expsyms_cmds - - if test $linkmode = prog || test "$mode" != relink; then - add_shlibpath= - add_dir= - add= - lib_linked=yes - case $hardcode_action in - immediate | unsupported) - if test "$hardcode_direct" = no; then - add="$dir/$linklib" - elif test "$hardcode_minus_L" = no; then - case $host in - *-*-sunos*) add_shlibpath="$dir" ;; - esac - add_dir="-L$dir" - add="-l$name" - elif test "$hardcode_shlibpath_var" = no; then - add_shlibpath="$dir" - add="-l$name" - else - lib_linked=no - fi - ;; - relink) - if test "$hardcode_direct" = yes; then - add="$dir/$linklib" - elif test "$hardcode_minus_L" = yes; then - add_dir="-L$dir" - add="-l$name" - elif test "$hardcode_shlibpath_var" = yes; then - add_shlibpath="$dir" - add="-l$name" - else - lib_linked=no - fi - ;; - *) lib_linked=no ;; - esac - - if test "$lib_linked" != yes; then - $echo "$modename: configuration error: unsupported hardcode properties" - exit 1 - fi - - if test -n "$add_shlibpath"; then - case :$compile_shlibpath: in - *":$add_shlibpath:"*) ;; - *) compile_shlibpath="$compile_shlibpath$add_shlibpath:" ;; - esac - fi - if test $linkmode = prog; then - test -n "$add_dir" && compile_deplibs="$add_dir $compile_deplibs" - test -n "$add" && compile_deplibs="$add $compile_deplibs" - else - test -n "$add_dir" && deplibs="$add_dir $deplibs" - test -n "$add" && deplibs="$add $deplibs" - if test "$hardcode_direct" != yes && \ - test "$hardcode_minus_L" != yes && \ - test "$hardcode_shlibpath_var" = yes; then - case :$finalize_shlibpath: in - *":$libdir:"*) ;; - *) finalize_shlibpath="$finalize_shlibpath$libdir:" ;; - esac - fi - fi - fi - - if test $linkmode = prog || test "$mode" = relink; then - add_shlibpath= - add_dir= - add= - # Finalize command for both is simple: just hardcode it. - if test "$hardcode_direct" = yes; then - add="$libdir/$linklib" - elif test "$hardcode_minus_L" = yes; then - add_dir="-L$libdir" - add="-l$name" - elif test "$hardcode_shlibpath_var" = yes; then - case :$finalize_shlibpath: in - *":$libdir:"*) ;; - *) finalize_shlibpath="$finalize_shlibpath$libdir:" ;; - esac - add="-l$name" - else - # We cannot seem to hardcode it, guess we'll fake it. - add_dir="-L$libdir" - add="-l$name" - fi - - if test $linkmode = prog; then - test -n "$add_dir" && finalize_deplibs="$add_dir $finalize_deplibs" - test -n "$add" && finalize_deplibs="$add $finalize_deplibs" - else - test -n "$add_dir" && deplibs="$add_dir $deplibs" - test -n "$add" && deplibs="$add $deplibs" - fi - fi - elif test $linkmode = prog; then - if test "$alldeplibs" = yes && - { test "$deplibs_check_method" = pass_all || - { test "$build_libtool_libs" = yes && - test -n "$library_names"; }; }; then - # We only need to search for static libraries - continue - fi - - # Try to link the static library - # Here we assume that one of hardcode_direct or hardcode_minus_L - # is not unsupported. This is valid on all known static and - # shared platforms. - if test "$hardcode_direct" != unsupported; then - test -n "$old_library" && linklib="$old_library" - compile_deplibs="$dir/$linklib $compile_deplibs" - finalize_deplibs="$dir/$linklib $finalize_deplibs" - else - compile_deplibs="-l$name -L$dir $compile_deplibs" - finalize_deplibs="-l$name -L$dir $finalize_deplibs" - fi - elif test "$build_libtool_libs" = yes; then - # Not a shared library - if test "$deplibs_check_method" != pass_all; then - # We're trying link a shared library against a static one - # but the system doesn't support it. - - # Just print a warning and add the library to dependency_libs so - # that the program can be linked against the static library. - echo - echo "*** Warning: This library needs some functionality provided by $lib." - echo "*** I have the capability to make that library automatically link in when" - echo "*** you link to this library. But I can only do this if you have a" - echo "*** shared version of the library, which you do not appear to have." - if test "$module" = yes; then - echo "*** Therefore, libtool will create a static module, that should work " - echo "*** as long as the dlopening application is linked with the -dlopen flag." - if test -z "$global_symbol_pipe"; then - echo - echo "*** However, this would only work if libtool was able to extract symbol" - echo "*** lists from a program, using \`nm' or equivalent, but libtool could" - echo "*** not find such a program. So, this module is probably useless." - echo "*** \`nm' from GNU binutils and a full rebuild may help." - fi - if test "$build_old_libs" = no; then - build_libtool_libs=module - build_old_libs=yes - else - build_libtool_libs=no - fi - fi - else - convenience="$convenience $dir/$old_library" - old_convenience="$old_convenience $dir/$old_library" - deplibs="$dir/$old_library $deplibs" - link_static=yes - fi - fi # link shared/static library? - - if test $linkmode = lib; then - if test -n "$dependency_libs" && - { test $hardcode_into_libs != yes || test $build_old_libs = yes || - test $link_static = yes; }; then - # Extract -R from dependency_libs - temp_deplibs= - for libdir in $dependency_libs; do - case $libdir in - -R*) temp_xrpath=`$echo "X$libdir" | $Xsed -e 's/^-R//'` - case " $xrpath " in - *" $temp_xrpath "*) ;; - *) xrpath="$xrpath $temp_xrpath";; - esac;; - *) temp_deplibs="$temp_deplibs $libdir";; - esac - done - dependency_libs="$temp_deplibs" - fi - - newlib_search_path="$newlib_search_path $absdir" - # Link against this library - test "$link_static" = no && newdependency_libs="$abs_ladir/$laname $newdependency_libs" - # ... and its dependency_libs - tmp_libs= - for deplib in $dependency_libs; do - newdependency_libs="$deplib $newdependency_libs" - case "$tmp_libs " in - *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; - esac - tmp_libs="$tmp_libs $deplib" - done - - if test $link_all_deplibs != no; then - # Add the search paths of all dependency libraries - for deplib in $dependency_libs; do - case $deplib in - -L*) path="$deplib" ;; - *.la) - dir=`$echo "X$deplib" | $Xsed -e 's%/[^/]*$%%'` - test "X$dir" = "X$deplib" && dir="." - # We need an absolute path. - case $dir in - [\\/]* | [A-Za-z]:[\\/]*) absdir="$dir" ;; - *) - absdir=`cd "$dir" && pwd` - if test -z "$absdir"; then - $echo "$modename: warning: cannot determine absolute directory name of \`$dir'" 1>&2 - absdir="$dir" - fi - ;; - esac - if grep "^installed=no" $deplib > /dev/null; then - path="-L$absdir/$objdir" - else - eval libdir=`sed -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` - if test -z "$libdir"; then - $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2 - exit 1 - fi - if test "$absdir" != "$libdir"; then - $echo "$modename: warning: \`$deplib' seems to be moved" 1>&2 - fi - path="-L$absdir" - fi - ;; - *) continue ;; - esac - case " $deplibs " in - *" $path "*) ;; - *) deplibs="$deplibs $path" ;; - esac - done - fi # link_all_deplibs != no - fi # linkmode = lib - done # for deplib in $libs - if test $pass = dlpreopen; then - # Link the dlpreopened libraries before other libraries - for deplib in $save_deplibs; do - deplibs="$deplib $deplibs" - done - fi - if test $pass != dlopen; then - test $pass != scan && dependency_libs="$newdependency_libs" - if test $pass != conv; then - # Make sure lib_search_path contains only unique directories. - lib_search_path= - for dir in $newlib_search_path; do - case "$lib_search_path " in - *" $dir "*) ;; - *) lib_search_path="$lib_search_path $dir" ;; - esac - done - newlib_search_path= - fi - - if test "$linkmode,$pass" != "prog,link"; then - vars="deplibs" - else - vars="compile_deplibs finalize_deplibs" - fi - for var in $vars dependency_libs; do - # Add libraries to $var in reverse order - eval tmp_libs=\"\$$var\" - new_libs= - for deplib in $tmp_libs; do - case $deplib in - -L*) new_libs="$deplib $new_libs" ;; - *) - case " $specialdeplibs " in - *" $deplib "*) new_libs="$deplib $new_libs" ;; - *) - case " $new_libs " in - *" $deplib "*) ;; - *) new_libs="$deplib $new_libs" ;; - esac - ;; - esac - ;; - esac - done - tmp_libs= - for deplib in $new_libs; do - case $deplib in - -L*) - case " $tmp_libs " in - *" $deplib "*) ;; - *) tmp_libs="$tmp_libs $deplib" ;; - esac - ;; - *) tmp_libs="$tmp_libs $deplib" ;; - esac - done - eval $var=\"$tmp_libs\" - done # for var - fi - if test "$pass" = "conv" && - { test "$linkmode" = "lib" || test "$linkmode" = "prog"; }; then - libs="$deplibs" # reset libs - deplibs= - fi - done # for pass - if test $linkmode = prog; then - dlfiles="$newdlfiles" - dlprefiles="$newdlprefiles" - fi - - case $linkmode in - oldlib) - if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then - $echo "$modename: warning: \`-dlopen' is ignored for archives" 1>&2 - fi - - if test -n "$rpath"; then - $echo "$modename: warning: \`-rpath' is ignored for archives" 1>&2 - fi - - if test -n "$xrpath"; then - $echo "$modename: warning: \`-R' is ignored for archives" 1>&2 - fi - - if test -n "$vinfo"; then - $echo "$modename: warning: \`-version-info' is ignored for archives" 1>&2 - fi - - if test -n "$release"; then - $echo "$modename: warning: \`-release' is ignored for archives" 1>&2 - fi - - if test -n "$export_symbols" || test -n "$export_symbols_regex"; then - $echo "$modename: warning: \`-export-symbols' is ignored for archives" 1>&2 - fi - - # Now set the variables for building old libraries. - build_libtool_libs=no - oldlibs="$output" - objs="$objs$old_deplibs" - ;; - - lib) - # Make sure we only generate libraries of the form `libNAME.la'. - case $outputname in - lib*) - name=`$echo "X$outputname" | $Xsed -e 's/\.la$//' -e 's/^lib//'` - eval libname=\"$libname_spec\" - ;; - *) - if test "$module" = no; then - $echo "$modename: libtool library \`$output' must begin with \`lib'" 1>&2 - $echo "$help" 1>&2 - exit 1 - fi - if test "$need_lib_prefix" != no; then - # Add the "lib" prefix for modules if required - name=`$echo "X$outputname" | $Xsed -e 's/\.la$//'` - eval libname=\"$libname_spec\" - else - libname=`$echo "X$outputname" | $Xsed -e 's/\.la$//'` - fi - ;; - esac - - if test -n "$objs"; then - if test "$deplibs_check_method" != pass_all; then - $echo "$modename: cannot build libtool library \`$output' from non-libtool objects on this host:$objs" 2>&1 - exit 1 - else - echo - echo "*** Warning: Linking the shared library $output against the non-libtool" - echo "*** objects $objs is not portable!" - libobjs="$libobjs $objs" - fi - fi - - if test "$dlself" != no; then - $echo "$modename: warning: \`-dlopen self' is ignored for libtool libraries" 1>&2 - fi - - set dummy $rpath - if test $# -gt 2; then - $echo "$modename: warning: ignoring multiple \`-rpath's for a libtool library" 1>&2 - fi - install_libdir="$2" - - oldlibs= - if test -z "$rpath"; then - if test "$build_libtool_libs" = yes; then - # Building a libtool convenience library. - libext=al - oldlibs="$output_objdir/$libname.$libext $oldlibs" - build_libtool_libs=convenience - build_old_libs=yes - fi - - if test -n "$vinfo"; then - $echo "$modename: warning: \`-version-info' is ignored for convenience libraries" 1>&2 - fi - - if test -n "$release"; then - $echo "$modename: warning: \`-release' is ignored for convenience libraries" 1>&2 - fi - else - - # Parse the version information argument. - save_ifs="$IFS"; IFS=':' - set dummy $vinfo 0 0 0 - IFS="$save_ifs" - - if test -n "$8"; then - $echo "$modename: too many parameters to \`-version-info'" 1>&2 - $echo "$help" 1>&2 - exit 1 - fi - - current="$2" - revision="$3" - age="$4" - - # Check that each of the things are valid numbers. - case $current in - 0 | [1-9] | [1-9][0-9] | [1-9][0-9][0-9]) ;; - *) - $echo "$modename: CURRENT \`$current' is not a nonnegative integer" 1>&2 - $echo "$modename: \`$vinfo' is not valid version information" 1>&2 - exit 1 - ;; - esac - - case $revision in - 0 | [1-9] | [1-9][0-9] | [1-9][0-9][0-9]) ;; - *) - $echo "$modename: REVISION \`$revision' is not a nonnegative integer" 1>&2 - $echo "$modename: \`$vinfo' is not valid version information" 1>&2 - exit 1 - ;; - esac - - case $age in - 0 | [1-9] | [1-9][0-9] | [1-9][0-9][0-9]) ;; - *) - $echo "$modename: AGE \`$age' is not a nonnegative integer" 1>&2 - $echo "$modename: \`$vinfo' is not valid version information" 1>&2 - exit 1 - ;; - esac - - if test $age -gt $current; then - $echo "$modename: AGE \`$age' is greater than the current interface number \`$current'" 1>&2 - $echo "$modename: \`$vinfo' is not valid version information" 1>&2 - exit 1 - fi - - # Calculate the version variables. - major= - versuffix= - verstring= - case $version_type in - none) ;; - - darwin) - # Like Linux, but with the current version available in - # verstring for coding it into the library header - major=.`expr $current - $age` - versuffix="$major.$age.$revision" - # Darwin ld doesn't like 0 for these options... - minor_current=`expr $current + 1` - verstring="-compatibility_version $minor_current -current_version $minor_current.$revision" - ;; - - freebsd-aout) - major=".$current" - versuffix=".$current.$revision"; - ;; - - freebsd-elf) - major=".$current" - versuffix=".$current"; - ;; - - irix) - major=`expr $current - $age + 1` - verstring="sgi$major.$revision" - - # Add in all the interfaces that we are compatible with. - loop=$revision - while test $loop != 0; do - iface=`expr $revision - $loop` - loop=`expr $loop - 1` - verstring="sgi$major.$iface:$verstring" - done - - # Before this point, $major must not contain `.'. - major=.$major - versuffix="$major.$revision" - ;; - - linux) - major=.`expr $current - $age` - versuffix="$major.$age.$revision" - ;; - - osf) - major=`expr $current - $age` - versuffix=".$current.$age.$revision" - verstring="$current.$age.$revision" - - # Add in all the interfaces that we are compatible with. - loop=$age - while test $loop != 0; do - iface=`expr $current - $loop` - loop=`expr $loop - 1` - verstring="$verstring:${iface}.0" - done - - # Make executables depend on our current version. - verstring="$verstring:${current}.0" - ;; - - sunos) - major=".$current" - versuffix=".$current.$revision" - ;; - - windows) - # Use '-' rather than '.', since we only want one - # extension on DOS 8.3 filesystems. - major=`expr $current - $age` - versuffix="-$major" - ;; - - *) - $echo "$modename: unknown library version type \`$version_type'" 1>&2 - echo "Fatal configuration error. See the $PACKAGE docs for more information." 1>&2 - exit 1 - ;; - esac - - # Clear the version info if we defaulted, and they specified a release. - if test -z "$vinfo" && test -n "$release"; then - major= - verstring="0.0" - case $version_type in - darwin) - # we can't check for "0.0" in archive_cmds due to quoting - # problems, so we reset it completely - verstring="" - ;; - *) - verstring="0.0" - ;; - esac - if test "$need_version" = no; then - versuffix= - else - versuffix=".0.0" - fi - fi - - # Remove version info from name if versioning should be avoided - if test "$avoid_version" = yes && test "$need_version" = no; then - major= - versuffix= - verstring="" - fi - - # Check to see if the archive will have undefined symbols. - if test "$allow_undefined" = yes; then - if test "$allow_undefined_flag" = unsupported; then - $echo "$modename: warning: undefined symbols not allowed in $host shared libraries" 1>&2 - build_libtool_libs=no - build_old_libs=yes - fi - else - # Don't allow undefined symbols. - allow_undefined_flag="$no_undefined_flag" - fi - fi - - if test "$mode" != relink; then - # Remove our outputs. - $show "${rm}r $output_objdir/$outputname $output_objdir/$libname.* $output_objdir/${libname}${release}.*" - $run ${rm}r $output_objdir/$outputname $output_objdir/$libname.* $output_objdir/${libname}${release}.* - fi - - # Now set the variables for building old libraries. - if test "$build_old_libs" = yes && test "$build_libtool_libs" != convenience ; then - oldlibs="$oldlibs $output_objdir/$libname.$libext" - - # Transform .lo files to .o files. - oldobjs="$objs "`$echo "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}'$/d' -e "$lo2o" | $NL2SP` - fi - - # Eliminate all temporary directories. - for path in $notinst_path; do - lib_search_path=`echo "$lib_search_path " | sed -e 's% $path % %g'` - deplibs=`echo "$deplibs " | sed -e 's% -L$path % %g'` - dependency_libs=`echo "$dependency_libs " | sed -e 's% -L$path % %g'` - done - - if test -n "$xrpath"; then - # If the user specified any rpath flags, then add them. - temp_xrpath= - for libdir in $xrpath; do - temp_xrpath="$temp_xrpath -R$libdir" - case "$finalize_rpath " in - *" $libdir "*) ;; - *) finalize_rpath="$finalize_rpath $libdir" ;; - esac - done - if test $hardcode_into_libs != yes || test $build_old_libs = yes; then - dependency_libs="$temp_xrpath $dependency_libs" - fi - fi - - # Make sure dlfiles contains only unique files that won't be dlpreopened - old_dlfiles="$dlfiles" - dlfiles= - for lib in $old_dlfiles; do - case " $dlprefiles $dlfiles " in - *" $lib "*) ;; - *) dlfiles="$dlfiles $lib" ;; - esac - done - - # Make sure dlprefiles contains only unique files - old_dlprefiles="$dlprefiles" - dlprefiles= - for lib in $old_dlprefiles; do - case "$dlprefiles " in - *" $lib "*) ;; - *) dlprefiles="$dlprefiles $lib" ;; - esac - done - - if test "$build_libtool_libs" = yes; then - if test -n "$rpath"; then - case $host in - *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos*) - # these systems don't actually have a c library (as such)! - ;; - *-*-rhapsody* | *-*-darwin1.[012]) - # Rhapsody C library is in the System framework - deplibs="$deplibs -framework System" - ;; - *-*-netbsd*) - # Don't link with libc until the a.out ld.so is fixed. - ;; - *-*-openbsd*) - # Do not include libc due to us having libc/libc_r. - ;; - *) - # Add libc to deplibs on all other systems if necessary. - if test $build_libtool_need_lc = "yes"; then - deplibs="$deplibs -lc" - fi - ;; - esac - fi - - # Transform deplibs into only deplibs that can be linked in shared. - name_save=$name - libname_save=$libname - release_save=$release - versuffix_save=$versuffix - major_save=$major - # I'm not sure if I'm treating the release correctly. I think - # release should show up in the -l (ie -lgmp5) so we don't want to - # add it in twice. Is that correct? - release="" - versuffix="" - major="" - newdeplibs= - droppeddeps=no - case $deplibs_check_method in - pass_all) - # Don't check for shared/static. Everything works. - # This might be a little naive. We might want to check - # whether the library exists or not. But this is on - # osf3 & osf4 and I'm not really sure... Just - # implementing what was already the behaviour. - newdeplibs=$deplibs - ;; - test_compile) - # This code stresses the "libraries are programs" paradigm to its - # limits. Maybe even breaks it. We compile a program, linking it - # against the deplibs as a proxy for the library. Then we can check - # whether they linked in statically or dynamically with ldd. - $rm conftest.c - cat > conftest.c </dev/null` - for potent_lib in $potential_libs; do - # Follow soft links. - if ls -lLd "$potent_lib" 2>/dev/null \ - | grep " -> " >/dev/null; then - continue - fi - # The statement above tries to avoid entering an - # endless loop below, in case of cyclic links. - # We might still enter an endless loop, since a link - # loop can be closed while we follow links, - # but so what? - potlib="$potent_lib" - while test -h "$potlib" 2>/dev/null; do - potliblink=`ls -ld $potlib | sed 's/.* -> //'` - case $potliblink in - [\\/]* | [A-Za-z]:[\\/]*) potlib="$potliblink";; - *) potlib=`$echo "X$potlib" | $Xsed -e 's,[^/]*$,,'`"$potliblink";; - esac - done - if eval $file_magic_cmd \"\$potlib\" 2>/dev/null \ - | sed 10q \ - | egrep "$file_magic_regex" > /dev/null; then - newdeplibs="$newdeplibs $a_deplib" - a_deplib="" - break 2 - fi - done - done - if test -n "$a_deplib" ; then - droppeddeps=yes - echo - echo "*** Warning: This library needs some functionality provided by $a_deplib." - echo "*** I have the capability to make that library automatically link in when" - echo "*** you link to this library. But I can only do this if you have a" - echo "*** shared version of the library, which you do not appear to have." - fi - else - # Add a -L argument. - newdeplibs="$newdeplibs $a_deplib" - fi - done # Gone through all deplibs. - ;; - match_pattern*) - set dummy $deplibs_check_method - match_pattern_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"` - for a_deplib in $deplibs; do - name="`expr $a_deplib : '-l\(.*\)'`" - # If $name is empty we are operating on a -L argument. - if test -n "$name" && test "$name" != "0"; then - libname=`eval \\$echo \"$libname_spec\"` - for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do - potential_libs=`ls $i/$libname[.-]* 2>/dev/null` - for potent_lib in $potential_libs; do - if eval echo \"$potent_lib\" 2>/dev/null \ - | sed 10q \ - | egrep "$match_pattern_regex" > /dev/null; then - newdeplibs="$newdeplibs $a_deplib" - a_deplib="" - break 2 - fi - done - done - if test -n "$a_deplib" ; then - droppeddeps=yes - echo - echo "*** Warning: This library needs some functionality provided by $a_deplib." - echo "*** I have the capability to make that library automatically link in when" - echo "*** you link to this library. But I can only do this if you have a" - echo "*** shared version of the library, which you do not appear to have." - fi - else - # Add a -L argument. - newdeplibs="$newdeplibs $a_deplib" - fi - done # Gone through all deplibs. - ;; - none | unknown | *) - newdeplibs="" - if $echo "X $deplibs" | $Xsed -e 's/ -lc$//' \ - -e 's/ -[LR][^ ]*//g' -e 's/[ ]//g' | - grep . >/dev/null; then - echo - if test "X$deplibs_check_method" = "Xnone"; then - echo "*** Warning: inter-library dependencies are not supported in this platform." - else - echo "*** Warning: inter-library dependencies are not known to be supported." - fi - echo "*** All declared inter-library dependencies are being dropped." - droppeddeps=yes - fi - ;; - esac - versuffix=$versuffix_save - major=$major_save - release=$release_save - libname=$libname_save - name=$name_save - - case $host in - *-*-rhapsody* | *-*-darwin1.[012]) - # On Rhapsody replace the C library is the System framework - newdeplibs=`$echo "X $newdeplibs" | $Xsed -e 's/ -lc / -framework System /'` - ;; - esac - - if test "$droppeddeps" = yes; then - if test "$module" = yes; then - echo - echo "*** Warning: libtool could not satisfy all declared inter-library" - echo "*** dependencies of module $libname. Therefore, libtool will create" - echo "*** a static module, that should work as long as the dlopening" - echo "*** application is linked with the -dlopen flag." - if test -z "$global_symbol_pipe"; then - echo - echo "*** However, this would only work if libtool was able to extract symbol" - echo "*** lists from a program, using \`nm' or equivalent, but libtool could" - echo "*** not find such a program. So, this module is probably useless." - echo "*** \`nm' from GNU binutils and a full rebuild may help." - fi - if test "$build_old_libs" = no; then - oldlibs="$output_objdir/$libname.$libext" - build_libtool_libs=module - build_old_libs=yes - else - build_libtool_libs=no - fi - else - echo "*** The inter-library dependencies that have been dropped here will be" - echo "*** automatically added whenever a program is linked with this library" - echo "*** or is declared to -dlopen it." - - if test $allow_undefined = no; then - echo - echo "*** Since this library must not contain undefined symbols," - echo "*** because either the platform does not support them or" - echo "*** it was explicitly requested with -no-undefined," - echo "*** libtool will only create a static version of it." - if test "$build_old_libs" = no; then - oldlibs="$output_objdir/$libname.$libext" - build_libtool_libs=module - build_old_libs=yes - else - build_libtool_libs=no - fi - fi - fi - fi - # Done checking deplibs! - deplibs=$newdeplibs - fi - - # All the library-specific variables (install_libdir is set above). - library_names= - old_library= - dlname= - - # Test again, we may have decided not to build it any more - if test "$build_libtool_libs" = yes; then - if test $hardcode_into_libs = yes; then - # Hardcode the library paths - hardcode_libdirs= - dep_rpath= - rpath="$finalize_rpath" - test "$mode" != relink && rpath="$compile_rpath$rpath" - for libdir in $rpath; do - if test -n "$hardcode_libdir_flag_spec"; then - if test -n "$hardcode_libdir_separator"; then - if test -z "$hardcode_libdirs"; then - hardcode_libdirs="$libdir" - else - # Just accumulate the unique libdirs. - case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in - *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*) - ;; - *) - hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir" - ;; - esac - fi - else - eval flag=\"$hardcode_libdir_flag_spec\" - dep_rpath="$dep_rpath $flag" - fi - elif test -n "$runpath_var"; then - case "$perm_rpath " in - *" $libdir "*) ;; - *) perm_rpath="$perm_rpath $libdir" ;; - esac - fi - done - # Substitute the hardcoded libdirs into the rpath. - if test -n "$hardcode_libdir_separator" && - test -n "$hardcode_libdirs"; then - libdir="$hardcode_libdirs" - eval dep_rpath=\"$hardcode_libdir_flag_spec\" - fi - if test -n "$runpath_var" && test -n "$perm_rpath"; then - # We should set the runpath_var. - rpath= - for dir in $perm_rpath; do - rpath="$rpath$dir:" - done - eval "$runpath_var='$rpath\$$runpath_var'; export $runpath_var" - fi - test -n "$dep_rpath" && deplibs="$dep_rpath $deplibs" - fi - - shlibpath="$finalize_shlibpath" - test "$mode" != relink && shlibpath="$compile_shlibpath$shlibpath" - if test -n "$shlibpath"; then - eval "$shlibpath_var='$shlibpath\$$shlibpath_var'; export $shlibpath_var" - fi - - # Get the real and link names of the library. - eval library_names=\"$library_names_spec\" - set dummy $library_names - realname="$2" - shift; shift - - if test -n "$soname_spec"; then - eval soname=\"$soname_spec\" - else - soname="$realname" - fi - test -z "$dlname" && dlname=$soname - - lib="$output_objdir/$realname" - for link - do - linknames="$linknames $link" - done - - # Ensure that we have .o objects for linkers which dislike .lo - # (e.g. aix) in case we are running --disable-static - for obj in $libobjs; do - xdir=`$echo "X$obj" | $Xsed -e 's%/[^/]*$%%'` - if test "X$xdir" = "X$obj"; then - xdir="." - else - xdir="$xdir" - fi - baseobj=`$echo "X$obj" | $Xsed -e 's%^.*/%%'` - oldobj=`$echo "X$baseobj" | $Xsed -e "$lo2o"` - if test ! -f $xdir/$oldobj; then - $show "(cd $xdir && ${LN_S} $baseobj $oldobj)" - $run eval '(cd $xdir && ${LN_S} $baseobj $oldobj)' || exit $? - fi - done - - # Use standard objects if they are pic - test -z "$pic_flag" && libobjs=`$echo "X$libobjs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP` - - # Prepare the list of exported symbols - if test -z "$export_symbols"; then - if test "$always_export_symbols" = yes || test -n "$export_symbols_regex"; then - $show "generating symbol list for \`$libname.la'" - export_symbols="$output_objdir/$libname.exp" - $run $rm $export_symbols - eval cmds=\"$export_symbols_cmds\" - save_ifs="$IFS"; IFS='~' - for cmd in $cmds; do - IFS="$save_ifs" - $show "$cmd" - $run eval "$cmd" || exit $? - done - IFS="$save_ifs" - if test -n "$export_symbols_regex"; then - $show "egrep -e \"$export_symbols_regex\" \"$export_symbols\" > \"${export_symbols}T\"" - $run eval 'egrep -e "$export_symbols_regex" "$export_symbols" > "${export_symbols}T"' - $show "$mv \"${export_symbols}T\" \"$export_symbols\"" - $run eval '$mv "${export_symbols}T" "$export_symbols"' - fi - fi - fi - - if test -n "$export_symbols" && test -n "$include_expsyms"; then - $run eval '$echo "X$include_expsyms" | $SP2NL >> "$export_symbols"' - fi - - if test -n "$convenience"; then - if test -n "$whole_archive_flag_spec"; then - eval libobjs=\"\$libobjs $whole_archive_flag_spec\" - else - gentop="$output_objdir/${outputname}x" - $show "${rm}r $gentop" - $run ${rm}r "$gentop" - $show "mkdir $gentop" - $run mkdir "$gentop" - status=$? - if test $status -ne 0 && test ! -d "$gentop"; then - exit $status - fi - generated="$generated $gentop" - - for xlib in $convenience; do - # Extract the objects. - case $xlib in - [\\/]* | [A-Za-z]:[\\/]*) xabs="$xlib" ;; - *) xabs=`pwd`"/$xlib" ;; - esac - xlib=`$echo "X$xlib" | $Xsed -e 's%^.*/%%'` - xdir="$gentop/$xlib" - - $show "${rm}r $xdir" - $run ${rm}r "$xdir" - $show "mkdir $xdir" - $run mkdir "$xdir" - status=$? - if test $status -ne 0 && test ! -d "$xdir"; then - exit $status - fi - $show "(cd $xdir && $AR x $xabs)" - $run eval "(cd \$xdir && $AR x \$xabs)" || exit $? - - libobjs="$libobjs "`find $xdir -name \*.o -print -o -name \*.lo -print | $NL2SP` - done - fi - fi - - if test "$thread_safe" = yes && test -n "$thread_safe_flag_spec"; then - eval flag=\"$thread_safe_flag_spec\" - linker_flags="$linker_flags $flag" - fi - - # Make a backup of the uninstalled library when relinking - if test "$mode" = relink; then - $run eval '(cd $output_objdir && $rm ${realname}U && $mv $realname ${realname}U)' || exit $? - fi - - # Do each of the archive commands. - if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then - eval cmds=\"$archive_expsym_cmds\" - else - eval cmds=\"$archive_cmds\" - fi - save_ifs="$IFS"; IFS='~' - for cmd in $cmds; do - IFS="$save_ifs" - $show "$cmd" - $run eval "$cmd" || exit $? - done - IFS="$save_ifs" - - # Restore the uninstalled library and exit - if test "$mode" = relink; then - $run eval '(cd $output_objdir && $rm ${realname}T && $mv $realname ${realname}T && $mv "$realname"U $realname)' || exit $? - exit 0 - fi - - # Create links to the real library. - for linkname in $linknames; do - if test "$realname" != "$linkname"; then - $show "(cd $output_objdir && $rm $linkname && $LN_S $realname $linkname)" - $run eval '(cd $output_objdir && $rm $linkname && $LN_S $realname $linkname)' || exit $? - fi - done - - # If -module or -export-dynamic was specified, set the dlname. - if test "$module" = yes || test "$export_dynamic" = yes; then - # On all known operating systems, these are identical. - dlname="$soname" - fi - fi - ;; - - obj) - if test -n "$deplibs"; then - $echo "$modename: warning: \`-l' and \`-L' are ignored for objects" 1>&2 - fi - - if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then - $echo "$modename: warning: \`-dlopen' is ignored for objects" 1>&2 - fi - - if test -n "$rpath"; then - $echo "$modename: warning: \`-rpath' is ignored for objects" 1>&2 - fi - - if test -n "$xrpath"; then - $echo "$modename: warning: \`-R' is ignored for objects" 1>&2 - fi - - if test -n "$vinfo"; then - $echo "$modename: warning: \`-version-info' is ignored for objects" 1>&2 - fi - - if test -n "$release"; then - $echo "$modename: warning: \`-release' is ignored for objects" 1>&2 - fi - - case $output in - *.lo) - if test -n "$objs$old_deplibs"; then - $echo "$modename: cannot build library object \`$output' from non-libtool objects" 1>&2 - exit 1 - fi - libobj="$output" - obj=`$echo "X$output" | $Xsed -e "$lo2o"` - ;; - *) - libobj= - obj="$output" - ;; - esac - - # Delete the old objects. - $run $rm $obj $libobj - - # Objects from convenience libraries. This assumes - # single-version convenience libraries. Whenever we create - # different ones for PIC/non-PIC, this we'll have to duplicate - # the extraction. - reload_conv_objs= - gentop= - # reload_cmds runs $LD directly, so let us get rid of - # -Wl from whole_archive_flag_spec - wl= - - if test -n "$convenience"; then - if test -n "$whole_archive_flag_spec"; then - eval reload_conv_objs=\"\$reload_objs $whole_archive_flag_spec\" - else - gentop="$output_objdir/${obj}x" - $show "${rm}r $gentop" - $run ${rm}r "$gentop" - $show "mkdir $gentop" - $run mkdir "$gentop" - status=$? - if test $status -ne 0 && test ! -d "$gentop"; then - exit $status - fi - generated="$generated $gentop" - - for xlib in $convenience; do - # Extract the objects. - case $xlib in - [\\/]* | [A-Za-z]:[\\/]*) xabs="$xlib" ;; - *) xabs=`pwd`"/$xlib" ;; - esac - xlib=`$echo "X$xlib" | $Xsed -e 's%^.*/%%'` - xdir="$gentop/$xlib" - - $show "${rm}r $xdir" - $run ${rm}r "$xdir" - $show "mkdir $xdir" - $run mkdir "$xdir" - status=$? - if test $status -ne 0 && test ! -d "$xdir"; then - exit $status - fi - $show "(cd $xdir && $AR x $xabs)" - $run eval "(cd \$xdir && $AR x \$xabs)" || exit $? - - reload_conv_objs="$reload_objs "`find $xdir -name \*.o -print -o -name \*.lo -print | $NL2SP` - done - fi - fi - - # Create the old-style object. - reload_objs="$objs$old_deplibs "`$echo "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}$'/d' -e '/\.lib$/d' -e "$lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test - - output="$obj" - eval cmds=\"$reload_cmds\" - save_ifs="$IFS"; IFS='~' - for cmd in $cmds; do - IFS="$save_ifs" - $show "$cmd" - $run eval "$cmd" || exit $? - done - IFS="$save_ifs" - - # Exit if we aren't doing a library object file. - if test -z "$libobj"; then - if test -n "$gentop"; then - $show "${rm}r $gentop" - $run ${rm}r $gentop - fi - - exit 0 - fi - - if test "$build_libtool_libs" != yes; then - if test -n "$gentop"; then - $show "${rm}r $gentop" - $run ${rm}r $gentop - fi - - # Create an invalid libtool object if no PIC, so that we don't - # accidentally link it into a program. - $show "echo timestamp > $libobj" - $run eval "echo timestamp > $libobj" || exit $? - exit 0 - fi - - if test -n "$pic_flag" || test "$pic_mode" != default; then - # Only do commands if we really have different PIC objects. - reload_objs="$libobjs $reload_conv_objs" - output="$libobj" - eval cmds=\"$reload_cmds\" - save_ifs="$IFS"; IFS='~' - for cmd in $cmds; do - IFS="$save_ifs" - $show "$cmd" - $run eval "$cmd" || exit $? - done - IFS="$save_ifs" - else - # Just create a symlink. - $show $rm $libobj - $run $rm $libobj - xdir=`$echo "X$libobj" | $Xsed -e 's%/[^/]*$%%'` - if test "X$xdir" = "X$libobj"; then - xdir="." - else - xdir="$xdir" - fi - baseobj=`$echo "X$libobj" | $Xsed -e 's%^.*/%%'` - oldobj=`$echo "X$baseobj" | $Xsed -e "$lo2o"` - $show "(cd $xdir && $LN_S $oldobj $baseobj)" - $run eval '(cd $xdir && $LN_S $oldobj $baseobj)' || exit $? - fi - - if test -n "$gentop"; then - $show "${rm}r $gentop" - $run ${rm}r $gentop - fi - - exit 0 - ;; - - prog) - case $host in - *cygwin*) output=`echo $output | sed -e 's,.exe$,,;s,$,.exe,'` ;; - esac - if test -n "$vinfo"; then - $echo "$modename: warning: \`-version-info' is ignored for programs" 1>&2 - fi - - if test -n "$release"; then - $echo "$modename: warning: \`-release' is ignored for programs" 1>&2 - fi - - if test "$preload" = yes; then - if test "$dlopen_support" = unknown && test "$dlopen_self" = unknown && - test "$dlopen_self_static" = unknown; then - $echo "$modename: warning: \`AC_LIBTOOL_DLOPEN' not used. Assuming no dlopen support." - fi - fi - - case $host in - *-*-rhapsody* | *-*-darwin1.[012]) - # On Rhapsody replace the C library is the System framework - compile_deplibs=`$echo "X $compile_deplibs" | $Xsed -e 's/ -lc / -framework System /'` - finalize_deplibs=`$echo "X $finalize_deplibs" | $Xsed -e 's/ -lc / -framework System /'` - ;; - esac - - compile_command="$compile_command $compile_deplibs" - finalize_command="$finalize_command $finalize_deplibs" - - if test -n "$rpath$xrpath"; then - # If the user specified any rpath flags, then add them. - for libdir in $rpath $xrpath; do - # This is the magic to use -rpath. - case "$finalize_rpath " in - *" $libdir "*) ;; - *) finalize_rpath="$finalize_rpath $libdir" ;; - esac - done - fi - - # Now hardcode the library paths - rpath= - hardcode_libdirs= - for libdir in $compile_rpath $finalize_rpath; do - if test -n "$hardcode_libdir_flag_spec"; then - if test -n "$hardcode_libdir_separator"; then - if test -z "$hardcode_libdirs"; then - hardcode_libdirs="$libdir" - else - # Just accumulate the unique libdirs. - case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in - *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*) - ;; - *) - hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir" - ;; - esac - fi - else - eval flag=\"$hardcode_libdir_flag_spec\" - rpath="$rpath $flag" - fi - elif test -n "$runpath_var"; then - case "$perm_rpath " in - *" $libdir "*) ;; - *) perm_rpath="$perm_rpath $libdir" ;; - esac - fi - case $host in - *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*) - case :$dllsearchpath: in - *":$libdir:"*) ;; - *) dllsearchpath="$dllsearchpath:$libdir";; - esac - ;; - esac - done - # Substitute the hardcoded libdirs into the rpath. - if test -n "$hardcode_libdir_separator" && - test -n "$hardcode_libdirs"; then - libdir="$hardcode_libdirs" - eval rpath=\" $hardcode_libdir_flag_spec\" - fi - compile_rpath="$rpath" - - rpath= - hardcode_libdirs= - for libdir in $finalize_rpath; do - if test -n "$hardcode_libdir_flag_spec"; then - if test -n "$hardcode_libdir_separator"; then - if test -z "$hardcode_libdirs"; then - hardcode_libdirs="$libdir" - else - # Just accumulate the unique libdirs. - case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in - *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*) - ;; - *) - hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir" - ;; - esac - fi - else - eval flag=\"$hardcode_libdir_flag_spec\" - rpath="$rpath $flag" - fi - elif test -n "$runpath_var"; then - case "$finalize_perm_rpath " in - *" $libdir "*) ;; - *) finalize_perm_rpath="$finalize_perm_rpath $libdir" ;; - esac - fi - done - # Substitute the hardcoded libdirs into the rpath. - if test -n "$hardcode_libdir_separator" && - test -n "$hardcode_libdirs"; then - libdir="$hardcode_libdirs" - eval rpath=\" $hardcode_libdir_flag_spec\" - fi - finalize_rpath="$rpath" - - if test -n "$libobjs" && test "$build_old_libs" = yes; then - # Transform all the library objects into standard objects. - compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP` - finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP` - fi - - dlsyms= - if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then - if test -n "$NM" && test -n "$global_symbol_pipe"; then - dlsyms="${outputname}S.c" - else - $echo "$modename: not configured to extract global symbols from dlpreopened files" 1>&2 - fi - fi - - if test -n "$dlsyms"; then - case $dlsyms in - "") ;; - *.c) - # Discover the nlist of each of the dlfiles. - nlist="$output_objdir/${outputname}.nm" - - $show "$rm $nlist ${nlist}S ${nlist}T" - $run $rm "$nlist" "${nlist}S" "${nlist}T" - - # Parse the name list into a source file. - $show "creating $output_objdir/$dlsyms" - - test -z "$run" && $echo > "$output_objdir/$dlsyms" "\ -/* $dlsyms - symbol resolution table for \`$outputname' dlsym emulation. */ -/* Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP */ - -#ifdef __cplusplus -extern \"C\" { -#endif - -/* Prevent the only kind of declaration conflicts we can make. */ -#define lt_preloaded_symbols some_other_symbol - -/* External symbol declarations for the compiler. */\ -" - - if test "$dlself" = yes; then - $show "generating symbol list for \`$output'" - - test -z "$run" && $echo ': @PROGRAM@ ' > "$nlist" - - # Add our own program objects to the symbol list. - progfiles=`$echo "X$objs$old_deplibs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP` - for arg in $progfiles; do - $show "extracting global C symbols from \`$arg'" - $run eval "$NM $arg | $global_symbol_pipe >> '$nlist'" - done - - if test -n "$exclude_expsyms"; then - $run eval 'egrep -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T' - $run eval '$mv "$nlist"T "$nlist"' - fi - - if test -n "$export_symbols_regex"; then - $run eval 'egrep -e "$export_symbols_regex" "$nlist" > "$nlist"T' - $run eval '$mv "$nlist"T "$nlist"' - fi - - # Prepare the list of exported symbols - if test -z "$export_symbols"; then - export_symbols="$output_objdir/$output.exp" - $run $rm $export_symbols - $run eval "sed -n -e '/^: @PROGRAM@$/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"' - else - $run eval "sed -e 's/\([][.*^$]\)/\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$output.exp"' - $run eval 'grep -f "$output_objdir/$output.exp" < "$nlist" > "$nlist"T' - $run eval 'mv "$nlist"T "$nlist"' - fi - fi - - for arg in $dlprefiles; do - $show "extracting global C symbols from \`$arg'" - name=`echo "$arg" | sed -e 's%^.*/%%'` - $run eval 'echo ": $name " >> "$nlist"' - $run eval "$NM $arg | $global_symbol_pipe >> '$nlist'" - done - - if test -z "$run"; then - # Make sure we have at least an empty file. - test -f "$nlist" || : > "$nlist" - - if test -n "$exclude_expsyms"; then - egrep -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T - $mv "$nlist"T "$nlist" - fi - - # Try sorting and uniquifying the output. - if grep -v "^: " < "$nlist" | sort +2 | uniq > "$nlist"S; then - : - else - grep -v "^: " < "$nlist" > "$nlist"S - fi - - if test -f "$nlist"S; then - eval "$global_symbol_to_cdecl"' < "$nlist"S >> "$output_objdir/$dlsyms"' - else - echo '/* NONE */' >> "$output_objdir/$dlsyms" - fi - - $echo >> "$output_objdir/$dlsyms" "\ - -#undef lt_preloaded_symbols - -#if defined (__STDC__) && __STDC__ -# define lt_ptr void * -#else -# define lt_ptr char * -# define const -#endif - -/* The mapping between symbol names and symbols. */ -const struct { - const char *name; - lt_ptr address; -} -lt_preloaded_symbols[] = -{\ -" - - eval "$global_symbol_to_c_name_address" < "$nlist" >> "$output_objdir/$dlsyms" - - $echo >> "$output_objdir/$dlsyms" "\ - {0, (lt_ptr) 0} -}; - -/* This works around a problem in FreeBSD linker */ -#ifdef FREEBSD_WORKAROUND -static const void *lt_preloaded_setup() { - return lt_preloaded_symbols; -} -#endif - -#ifdef __cplusplus -} -#endif\ -" - fi - - pic_flag_for_symtable= - case $host in - # compiling the symbol table file with pic_flag works around - # a FreeBSD bug that causes programs to crash when -lm is - # linked before any other PIC object. But we must not use - # pic_flag when linking with -static. The problem exists in - # FreeBSD 2.2.6 and is fixed in FreeBSD 3.1. - *-*-freebsd2*|*-*-freebsd3.0*|*-*-freebsdelf3.0*) - case "$compile_command " in - *" -static "*) ;; - *) pic_flag_for_symtable=" $pic_flag -DPIC -DFREEBSD_WORKAROUND";; - esac;; - *-*-hpux*) - case "$compile_command " in - *" -static "*) ;; - *) pic_flag_for_symtable=" $pic_flag -DPIC";; - esac - esac - - # Now compile the dynamic symbol file. - $show "(cd $output_objdir && $CC -c$no_builtin_flag$pic_flag_for_symtable \"$dlsyms\")" - $run eval '(cd $output_objdir && $CC -c$no_builtin_flag$pic_flag_for_symtable "$dlsyms")' || exit $? - - # Clean up the generated files. - $show "$rm $output_objdir/$dlsyms $nlist ${nlist}S ${nlist}T" - $run $rm "$output_objdir/$dlsyms" "$nlist" "${nlist}S" "${nlist}T" - - # Transform the symbol file into the correct name. - compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"` - finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"` - ;; - *) - $echo "$modename: unknown suffix for \`$dlsyms'" 1>&2 - exit 1 - ;; - esac - else - # We keep going just in case the user didn't refer to - # lt_preloaded_symbols. The linker will fail if global_symbol_pipe - # really was required. - - # Nullify the symbol file. - compile_command=`$echo "X$compile_command" | $Xsed -e "s% @SYMFILE@%%"` - finalize_command=`$echo "X$finalize_command" | $Xsed -e "s% @SYMFILE@%%"` - fi - - if test $need_relink = no || test "$build_libtool_libs" != yes; then - # Replace the output file specification. - compile_command=`$echo "X$compile_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'` - link_command="$compile_command$compile_rpath" - - # We have no uninstalled library dependencies, so finalize right now. - $show "$link_command" - $run eval "$link_command" - status=$? - - # Delete the generated files. - if test -n "$dlsyms"; then - $show "$rm $output_objdir/${outputname}S.${objext}" - $run $rm "$output_objdir/${outputname}S.${objext}" - fi - - exit $status - fi - - if test -n "$shlibpath_var"; then - # We should set the shlibpath_var - rpath= - for dir in $temp_rpath; do - case $dir in - [\\/]* | [A-Za-z]:[\\/]*) - # Absolute path. - rpath="$rpath$dir:" - ;; - *) - # Relative path: add a thisdir entry. - rpath="$rpath\$thisdir/$dir:" - ;; - esac - done - temp_rpath="$rpath" - fi - - if test -n "$compile_shlibpath$finalize_shlibpath"; then - compile_command="$shlibpath_var=\"$compile_shlibpath$finalize_shlibpath\$$shlibpath_var\" $compile_command" - fi - if test -n "$finalize_shlibpath"; then - finalize_command="$shlibpath_var=\"$finalize_shlibpath\$$shlibpath_var\" $finalize_command" - fi - - compile_var= - finalize_var= - if test -n "$runpath_var"; then - if test -n "$perm_rpath"; then - # We should set the runpath_var. - rpath= - for dir in $perm_rpath; do - rpath="$rpath$dir:" - done - compile_var="$runpath_var=\"$rpath\$$runpath_var\" " - fi - if test -n "$finalize_perm_rpath"; then - # We should set the runpath_var. - rpath= - for dir in $finalize_perm_rpath; do - rpath="$rpath$dir:" - done - finalize_var="$runpath_var=\"$rpath\$$runpath_var\" " - fi - fi - - if test "$no_install" = yes; then - # We don't need to create a wrapper script. - link_command="$compile_var$compile_command$compile_rpath" - # Replace the output file specification. - link_command=`$echo "X$link_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'` - # Delete the old output file. - $run $rm $output - # Link the executable and exit - $show "$link_command" - $run eval "$link_command" || exit $? - exit 0 - fi - - if test "$hardcode_action" = relink; then - # Fast installation is not supported - link_command="$compile_var$compile_command$compile_rpath" - relink_command="$finalize_var$finalize_command$finalize_rpath" - - $echo "$modename: warning: this platform does not like uninstalled shared libraries" 1>&2 - $echo "$modename: \`$output' will be relinked during installation" 1>&2 - else - if test "$fast_install" != no; then - link_command="$finalize_var$compile_command$finalize_rpath" - if test "$fast_install" = yes; then - relink_command=`$echo "X$compile_var$compile_command$compile_rpath" | $Xsed -e 's%@OUTPUT@%\$progdir/\$file%g'` - else - # fast_install is set to needless - relink_command= - fi - else - link_command="$compile_var$compile_command$compile_rpath" - relink_command="$finalize_var$finalize_command$finalize_rpath" - fi - fi - - # Replace the output file specification. - link_command=`$echo "X$link_command" | $Xsed -e 's%@OUTPUT@%'"$output_objdir/$outputname"'%g'` - - # Delete the old output files. - $run $rm $output $output_objdir/$outputname $output_objdir/lt-$outputname - - $show "$link_command" - $run eval "$link_command" || exit $? - - # Now create the wrapper script. - $show "creating $output" - - # Quote the relink command for shipping. - if test -n "$relink_command"; then - # Preserve any variables that may affect compiler behavior - for var in $variables_saved_for_relink; do - if eval test -z \"\${$var+set}\"; then - relink_command="{ test -z \"\${$var+set}\" || unset $var || { $var=; export $var; }; }; $relink_command" - elif eval var_value=\$$var; test -z "$var_value"; then - relink_command="$var=; export $var; $relink_command" - else - var_value=`$echo "X$var_value" | $Xsed -e "$sed_quote_subst"` - relink_command="$var=\"$var_value\"; export $var; $relink_command" - fi - done - relink_command="cd `pwd`; $relink_command" - relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"` - fi - - # Quote $echo for shipping. - if test "X$echo" = "X$SHELL $0 --fallback-echo"; then - case $0 in - [\\/]* | [A-Za-z]:[\\/]*) qecho="$SHELL $0 --fallback-echo";; - *) qecho="$SHELL `pwd`/$0 --fallback-echo";; - esac - qecho=`$echo "X$qecho" | $Xsed -e "$sed_quote_subst"` - else - qecho=`$echo "X$echo" | $Xsed -e "$sed_quote_subst"` - fi - - # Only actually do things if our run command is non-null. - if test -z "$run"; then - # win32 will think the script is a binary if it has - # a .exe suffix, so we strip it off here. - case $output in - *.exe) output=`echo $output|sed 's,.exe$,,'` ;; - esac - # test for cygwin because mv fails w/o .exe extensions - case $host in - *cygwin*) exeext=.exe ;; - *) exeext= ;; - esac - $rm $output - trap "$rm $output; exit 1" 1 2 15 - - $echo > $output "\ -#! $SHELL - -# $output - temporary wrapper script for $objdir/$outputname -# Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP -# -# The $output program cannot be directly executed until all the libtool -# libraries that it depends on are installed. -# -# This wrapper script should never be moved out of the build directory. -# If it is, it will not operate correctly. - -# Sed substitution that helps us do robust quoting. It backslashifies -# metacharacters that are still active within double-quoted strings. -Xsed='sed -e 1s/^X//' -sed_quote_subst='$sed_quote_subst' - -# The HP-UX ksh and POSIX shell print the target directory to stdout -# if CDPATH is set. -if test \"\${CDPATH+set}\" = set; then CDPATH=:; export CDPATH; fi - -relink_command=\"$relink_command\" - -# This environment variable determines our operation mode. -if test \"\$libtool_install_magic\" = \"$magic\"; then - # install mode needs the following variable: - notinst_deplibs='$notinst_deplibs' -else - # When we are sourced in execute mode, \$file and \$echo are already set. - if test \"\$libtool_execute_magic\" != \"$magic\"; then - echo=\"$qecho\" - file=\"\$0\" - # Make sure echo works. - if test \"X\$1\" = X--no-reexec; then - # Discard the --no-reexec flag, and continue. - shift - elif test \"X\`(\$echo '\t') 2>/dev/null\`\" = 'X\t'; then - # Yippee, \$echo works! - : - else - # Restart under the correct shell, and then maybe \$echo will work. - exec $SHELL \"\$0\" --no-reexec \${1+\"\$@\"} - fi - fi\ -" - $echo >> $output "\ - - # Find the directory that this script lives in. - thisdir=\`\$echo \"X\$file\" | \$Xsed -e 's%/[^/]*$%%'\` - test \"x\$thisdir\" = \"x\$file\" && thisdir=. - - # Follow symbolic links until we get to the real thisdir. - file=\`ls -ld \"\$file\" | sed -n 's/.*-> //p'\` - while test -n \"\$file\"; do - destdir=\`\$echo \"X\$file\" | \$Xsed -e 's%/[^/]*\$%%'\` - - # If there was a directory component, then change thisdir. - if test \"x\$destdir\" != \"x\$file\"; then - case \"\$destdir\" in - [\\\\/]* | [A-Za-z]:[\\\\/]*) thisdir=\"\$destdir\" ;; - *) thisdir=\"\$thisdir/\$destdir\" ;; - esac - fi - - file=\`\$echo \"X\$file\" | \$Xsed -e 's%^.*/%%'\` - file=\`ls -ld \"\$thisdir/\$file\" | sed -n 's/.*-> //p'\` - done - - # Try to get the absolute directory name. - absdir=\`cd \"\$thisdir\" && pwd\` - test -n \"\$absdir\" && thisdir=\"\$absdir\" -" - - if test "$fast_install" = yes; then - echo >> $output "\ - program=lt-'$outputname'$exeext - progdir=\"\$thisdir/$objdir\" - - if test ! -f \"\$progdir/\$program\" || \\ - { file=\`ls -1dt \"\$progdir/\$program\" \"\$progdir/../\$program\" 2>/dev/null | sed 1q\`; \\ - test \"X\$file\" != \"X\$progdir/\$program\"; }; then - - file=\"\$\$-\$program\" - - if test ! -d \"\$progdir\"; then - $mkdir \"\$progdir\" - else - $rm \"\$progdir/\$file\" - fi" - - echo >> $output "\ - - # relink executable if necessary - if test -n \"\$relink_command\"; then - if relink_command_output=\`eval \$relink_command 2>&1\`; then : - else - $echo \"\$relink_command_output\" >&2 - $rm \"\$progdir/\$file\" - exit 1 - fi - fi - - $mv \"\$progdir/\$file\" \"\$progdir/\$program\" 2>/dev/null || - { $rm \"\$progdir/\$program\"; - $mv \"\$progdir/\$file\" \"\$progdir/\$program\"; } - $rm \"\$progdir/\$file\" - fi" - else - echo >> $output "\ - program='$outputname' - progdir=\"\$thisdir/$objdir\" -" - fi - - echo >> $output "\ - - if test -f \"\$progdir/\$program\"; then" - - # Export our shlibpath_var if we have one. - if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then - $echo >> $output "\ - # Add our own library path to $shlibpath_var - $shlibpath_var=\"$temp_rpath\$$shlibpath_var\" - - # Some systems cannot cope with colon-terminated $shlibpath_var - # The second colon is a workaround for a bug in BeOS R4 sed - $shlibpath_var=\`\$echo \"X\$$shlibpath_var\" | \$Xsed -e 's/::*\$//'\` - - export $shlibpath_var -" - fi - - # fixup the dll searchpath if we need to. - if test -n "$dllsearchpath"; then - $echo >> $output "\ - # Add the dll search path components to the executable PATH - PATH=$dllsearchpath:\$PATH -" - fi - - $echo >> $output "\ - if test \"\$libtool_execute_magic\" != \"$magic\"; then - # Run the actual program with our arguments. -" - case $host in - # win32 systems need to use the prog path for dll - # lookup to work - *-*-cygwin* | *-*-pw32*) - $echo >> $output "\ - exec \$progdir/\$program \${1+\"\$@\"} -" - ;; - - # Backslashes separate directories on plain windows - *-*-mingw | *-*-os2*) - $echo >> $output "\ - exec \$progdir\\\\\$program \${1+\"\$@\"} -" - ;; - - *) - $echo >> $output "\ - # Export the path to the program. - PATH=\"\$progdir:\$PATH\" - export PATH - - exec \$program \${1+\"\$@\"} -" - ;; - esac - $echo >> $output "\ - \$echo \"\$0: cannot exec \$program \${1+\"\$@\"}\" - exit 1 - fi - else - # The program doesn't exist. - \$echo \"\$0: error: \$progdir/\$program does not exist\" 1>&2 - \$echo \"This script is just a wrapper for \$program.\" 1>&2 - echo \"See the $PACKAGE documentation for more information.\" 1>&2 - exit 1 - fi -fi\ -" - chmod +x $output - fi - exit 0 - ;; - esac - - # See if we need to build an old-fashioned archive. - for oldlib in $oldlibs; do - - if test "$build_libtool_libs" = convenience; then - oldobjs="$libobjs_save" - addlibs="$convenience" - build_libtool_libs=no - else - if test "$build_libtool_libs" = module; then - oldobjs="$libobjs_save" - build_libtool_libs=no - else - oldobjs="$objs$old_deplibs "`$echo "X$libobjs_save" | $SP2NL | $Xsed -e '/\.'${libext}'$/d' -e '/\.lib$/d' -e "$lo2o" | $NL2SP` - fi - addlibs="$old_convenience" - fi - - if test -n "$addlibs"; then - gentop="$output_objdir/${outputname}x" - $show "${rm}r $gentop" - $run ${rm}r "$gentop" - $show "mkdir $gentop" - $run mkdir "$gentop" - status=$? - if test $status -ne 0 && test ! -d "$gentop"; then - exit $status - fi - generated="$generated $gentop" - - # Add in members from convenience archives. - for xlib in $addlibs; do - # Extract the objects. - case $xlib in - [\\/]* | [A-Za-z]:[\\/]*) xabs="$xlib" ;; - *) xabs=`pwd`"/$xlib" ;; - esac - xlib=`$echo "X$xlib" | $Xsed -e 's%^.*/%%'` - xdir="$gentop/$xlib" - - $show "${rm}r $xdir" - $run ${rm}r "$xdir" - $show "mkdir $xdir" - $run mkdir "$xdir" - status=$? - if test $status -ne 0 && test ! -d "$xdir"; then - exit $status - fi - $show "(cd $xdir && $AR x $xabs)" - $run eval "(cd \$xdir && $AR x \$xabs)" || exit $? - - oldobjs="$oldobjs "`find $xdir -name \*.${objext} -print -o -name \*.lo -print | $NL2SP` - done - fi - - # Do each command in the archive commands. - if test -n "$old_archive_from_new_cmds" && test "$build_libtool_libs" = yes; then - eval cmds=\"$old_archive_from_new_cmds\" - else - # Ensure that we have .o objects in place in case we decided - # not to build a shared library, and have fallen back to building - # static libs even though --disable-static was passed! - for oldobj in $oldobjs; do - if test ! -f $oldobj; then - xdir=`$echo "X$oldobj" | $Xsed -e 's%/[^/]*$%%'` - if test "X$xdir" = "X$oldobj"; then - xdir="." - else - xdir="$xdir" - fi - baseobj=`$echo "X$oldobj" | $Xsed -e 's%^.*/%%'` - obj=`$echo "X$baseobj" | $Xsed -e "$o2lo"` - $show "(cd $xdir && ${LN_S} $obj $baseobj)" - $run eval '(cd $xdir && ${LN_S} $obj $baseobj)' || exit $? - fi - done - - eval cmds=\"$old_archive_cmds\" - fi - save_ifs="$IFS"; IFS='~' - for cmd in $cmds; do - IFS="$save_ifs" - $show "$cmd" - $run eval "$cmd" || exit $? - done - IFS="$save_ifs" - done - - if test -n "$generated"; then - $show "${rm}r$generated" - $run ${rm}r$generated - fi - - # Now create the libtool archive. - case $output in - *.la) - old_library= - test "$build_old_libs" = yes && old_library="$libname.$libext" - $show "creating $output" - - # Preserve any variables that may affect compiler behavior - for var in $variables_saved_for_relink; do - if eval test -z \"\${$var+set}\"; then - relink_command="{ test -z \"\${$var+set}\" || unset $var || { $var=; export $var; }; }; $relink_command" - elif eval var_value=\$$var; test -z "$var_value"; then - relink_command="$var=; export $var; $relink_command" - else - var_value=`$echo "X$var_value" | $Xsed -e "$sed_quote_subst"` - relink_command="$var=\"$var_value\"; export $var; $relink_command" - fi - done - # Quote the link command for shipping. - relink_command="cd `pwd`; $SHELL $0 --mode=relink $libtool_args" - relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"` - - # Only create the output if not a dry run. - if test -z "$run"; then - for installed in no yes; do - if test "$installed" = yes; then - if test -z "$install_libdir"; then - break - fi - output="$output_objdir/$outputname"i - # Replace all uninstalled libtool libraries with the installed ones - newdependency_libs= - for deplib in $dependency_libs; do - case $deplib in - *.la) - name=`$echo "X$deplib" | $Xsed -e 's%^.*/%%'` - eval libdir=`sed -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` - if test -z "$libdir"; then - $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2 - exit 1 - fi - newdependency_libs="$newdependency_libs $libdir/$name" - ;; - *) newdependency_libs="$newdependency_libs $deplib" ;; - esac - done - dependency_libs="$newdependency_libs" - newdlfiles= - for lib in $dlfiles; do - name=`$echo "X$lib" | $Xsed -e 's%^.*/%%'` - eval libdir=`sed -n -e 's/^libdir=\(.*\)$/\1/p' $lib` - if test -z "$libdir"; then - $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2 - exit 1 - fi - newdlfiles="$newdlfiles $libdir/$name" - done - dlfiles="$newdlfiles" - newdlprefiles= - for lib in $dlprefiles; do - name=`$echo "X$lib" | $Xsed -e 's%^.*/%%'` - eval libdir=`sed -n -e 's/^libdir=\(.*\)$/\1/p' $lib` - if test -z "$libdir"; then - $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2 - exit 1 - fi - newdlprefiles="$newdlprefiles $libdir/$name" - done - dlprefiles="$newdlprefiles" - fi - $rm $output - # place dlname in correct position for cygwin - tdlname=$dlname - case $host,$output,$installed,$module,$dlname in - *cygwin*,*lai,yes,no,*.dll) tdlname=../bin/$dlname ;; - esac - $echo > $output "\ -# $outputname - a libtool library file -# Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP -# -# Please DO NOT delete this file! -# It is necessary for linking the library. - -# The name that we can dlopen(3). -dlname='$tdlname' - -# Names of this library. -library_names='$library_names' - -# The name of the static archive. -old_library='$old_library' - -# Libraries that this one depends upon. -dependency_libs='$dependency_libs' - -# Version information for $libname. -current=$current -age=$age -revision=$revision - -# Is this an already installed library? -installed=$installed - -# Files to dlopen/dlpreopen -dlopen='$dlfiles' -dlpreopen='$dlprefiles' - -# Directory that this library needs to be installed in: -libdir='$install_libdir'" - if test "$installed" = no && test $need_relink = yes; then - $echo >> $output "\ -relink_command=\"$relink_command\"" - fi - done - fi - - # Do a symbolic link so that the libtool archive can be found in - # LD_LIBRARY_PATH before the program is installed. - $show "(cd $output_objdir && $rm $outputname && $LN_S ../$outputname $outputname)" - $run eval '(cd $output_objdir && $rm $outputname && $LN_S ../$outputname $outputname)' || exit $? - ;; - esac - exit 0 - ;; - - # libtool install mode - install) - modename="$modename: install" - - # There may be an optional sh(1) argument at the beginning of - # install_prog (especially on Windows NT). - if test "$nonopt" = "$SHELL" || test "$nonopt" = /bin/sh || - # Allow the use of GNU shtool's install command. - $echo "X$nonopt" | $Xsed | grep shtool > /dev/null; then - # Aesthetically quote it. - arg=`$echo "X$nonopt" | $Xsed -e "$sed_quote_subst"` - case $arg in - *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*) - arg="\"$arg\"" - ;; - esac - install_prog="$arg " - arg="$1" - shift - else - install_prog= - arg="$nonopt" - fi - - # The real first argument should be the name of the installation program. - # Aesthetically quote it. - arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"` - case $arg in - *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*) - arg="\"$arg\"" - ;; - esac - install_prog="$install_prog$arg" - - # We need to accept at least all the BSD install flags. - dest= - files= - opts= - prev= - install_type= - isdir=no - stripme= - for arg - do - if test -n "$dest"; then - files="$files $dest" - dest="$arg" - continue - fi - - case $arg in - -d) isdir=yes ;; - -f) prev="-f" ;; - -g) prev="-g" ;; - -m) prev="-m" ;; - -o) prev="-o" ;; - -s) - stripme=" -s" - continue - ;; - -*) ;; - - *) - # If the previous option needed an argument, then skip it. - if test -n "$prev"; then - prev= - else - dest="$arg" - continue - fi - ;; - esac - - # Aesthetically quote the argument. - arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"` - case $arg in - *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*) - arg="\"$arg\"" - ;; - esac - install_prog="$install_prog $arg" - done - - if test -z "$install_prog"; then - $echo "$modename: you must specify an install program" 1>&2 - $echo "$help" 1>&2 - exit 1 - fi - - if test -n "$prev"; then - $echo "$modename: the \`$prev' option requires an argument" 1>&2 - $echo "$help" 1>&2 - exit 1 - fi - - if test -z "$files"; then - if test -z "$dest"; then - $echo "$modename: no file or destination specified" 1>&2 - else - $echo "$modename: you must specify a destination" 1>&2 - fi - $echo "$help" 1>&2 - exit 1 - fi - - # Strip any trailing slash from the destination. - dest=`$echo "X$dest" | $Xsed -e 's%/$%%'` - - # Check to see that the destination is a directory. - test -d "$dest" && isdir=yes - if test "$isdir" = yes; then - destdir="$dest" - destname= - else - destdir=`$echo "X$dest" | $Xsed -e 's%/[^/]*$%%'` - test "X$destdir" = "X$dest" && destdir=. - destname=`$echo "X$dest" | $Xsed -e 's%^.*/%%'` - - # Not a directory, so check to see that there is only one file specified. - set dummy $files - if test $# -gt 2; then - $echo "$modename: \`$dest' is not a directory" 1>&2 - $echo "$help" 1>&2 - exit 1 - fi - fi - case $destdir in - [\\/]* | [A-Za-z]:[\\/]*) ;; - *) - for file in $files; do - case $file in - *.lo) ;; - *) - $echo "$modename: \`$destdir' must be an absolute directory name" 1>&2 - $echo "$help" 1>&2 - exit 1 - ;; - esac - done - ;; - esac - - # This variable tells wrapper scripts just to set variables rather - # than running their programs. - libtool_install_magic="$magic" - - staticlibs= - future_libdirs= - current_libdirs= - for file in $files; do - - # Do each installation. - case $file in - *.$libext) - # Do the static libraries later. - staticlibs="$staticlibs $file" - ;; - - *.la) - # Check to see that this really is a libtool archive. - if (sed -e '2q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then : - else - $echo "$modename: \`$file' is not a valid libtool archive" 1>&2 - $echo "$help" 1>&2 - exit 1 - fi - - library_names= - old_library= - relink_command= - # If there is no directory component, then add one. - case $file in - */* | *\\*) . $file ;; - *) . ./$file ;; - esac - - # Add the libdir to current_libdirs if it is the destination. - if test "X$destdir" = "X$libdir"; then - case "$current_libdirs " in - *" $libdir "*) ;; - *) current_libdirs="$current_libdirs $libdir" ;; - esac - else - # Note the libdir as a future libdir. - case "$future_libdirs " in - *" $libdir "*) ;; - *) future_libdirs="$future_libdirs $libdir" ;; - esac - fi - - dir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'`/ - test "X$dir" = "X$file/" && dir= - dir="$dir$objdir" - - if test -n "$relink_command"; then - $echo "$modename: warning: relinking \`$file'" 1>&2 - $show "$relink_command" - if $run eval "$relink_command"; then : - else - $echo "$modename: error: relink \`$file' with the above command before installing it" 1>&2 - continue - fi - fi - - # See the names of the shared library. - set dummy $library_names - if test -n "$2"; then - realname="$2" - shift - shift - - srcname="$realname" - test -n "$relink_command" && srcname="$realname"T - - # Install the shared library and build the symlinks. - $show "$install_prog $dir/$srcname $destdir/$realname" - $run eval "$install_prog $dir/$srcname $destdir/$realname" || exit $? - if test -n "$stripme" && test -n "$striplib"; then - $show "$striplib $destdir/$realname" - $run eval "$striplib $destdir/$realname" || exit $? - fi - - if test $# -gt 0; then - # Delete the old symlinks, and create new ones. - for linkname - do - if test "$linkname" != "$realname"; then - $show "(cd $destdir && $rm $linkname && $LN_S $realname $linkname)" - $run eval "(cd $destdir && $rm $linkname && $LN_S $realname $linkname)" - fi - done - fi - - # Do each command in the postinstall commands. - lib="$destdir/$realname" - eval cmds=\"$postinstall_cmds\" - save_ifs="$IFS"; IFS='~' - for cmd in $cmds; do - IFS="$save_ifs" - $show "$cmd" - $run eval "$cmd" || exit $? - done - IFS="$save_ifs" - fi - - # Install the pseudo-library for information purposes. - name=`$echo "X$file" | $Xsed -e 's%^.*/%%'` - instname="$dir/$name"i - $show "$install_prog $instname $destdir/$name" - $run eval "$install_prog $instname $destdir/$name" || exit $? - - # Maybe install the static library, too. - test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library" - ;; - - *.lo) - # Install (i.e. copy) a libtool object. - - # Figure out destination file name, if it wasn't already specified. - if test -n "$destname"; then - destfile="$destdir/$destname" - else - destfile=`$echo "X$file" | $Xsed -e 's%^.*/%%'` - destfile="$destdir/$destfile" - fi - - # Deduce the name of the destination old-style object file. - case $destfile in - *.lo) - staticdest=`$echo "X$destfile" | $Xsed -e "$lo2o"` - ;; - *.$objext) - staticdest="$destfile" - destfile= - ;; - *) - $echo "$modename: cannot copy a libtool object to \`$destfile'" 1>&2 - $echo "$help" 1>&2 - exit 1 - ;; - esac - - # Install the libtool object if requested. - if test -n "$destfile"; then - $show "$install_prog $file $destfile" - $run eval "$install_prog $file $destfile" || exit $? - fi - - # Install the old object if enabled. - if test "$build_old_libs" = yes; then - # Deduce the name of the old-style object file. - staticobj=`$echo "X$file" | $Xsed -e "$lo2o"` - - $show "$install_prog $staticobj $staticdest" - $run eval "$install_prog \$staticobj \$staticdest" || exit $? - fi - exit 0 - ;; - - *) - # Figure out destination file name, if it wasn't already specified. - if test -n "$destname"; then - destfile="$destdir/$destname" - else - destfile=`$echo "X$file" | $Xsed -e 's%^.*/%%'` - destfile="$destdir/$destfile" - fi - - # Do a test to see if this is really a libtool program. - if (sed -e '4q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then - notinst_deplibs= - relink_command= - - # If there is no directory component, then add one. - case $file in - */* | *\\*) . $file ;; - *) . ./$file ;; - esac - - # Check the variables that should have been set. - if test -z "$notinst_deplibs"; then - $echo "$modename: invalid libtool wrapper script \`$file'" 1>&2 - exit 1 - fi - - finalize=yes - for lib in $notinst_deplibs; do - # Check to see that each library is installed. - libdir= - if test -f "$lib"; then - # If there is no directory component, then add one. - case $lib in - */* | *\\*) . $lib ;; - *) . ./$lib ;; - esac - fi - libfile="$libdir/"`$echo "X$lib" | $Xsed -e 's%^.*/%%g'` ### testsuite: skip nested quoting test - if test -n "$libdir" && test ! -f "$libfile"; then - $echo "$modename: warning: \`$lib' has not been installed in \`$libdir'" 1>&2 - finalize=no - fi - done - - relink_command= - # If there is no directory component, then add one. - case $file in - */* | *\\*) . $file ;; - *) . ./$file ;; - esac - - outputname= - if test "$fast_install" = no && test -n "$relink_command"; then - if test "$finalize" = yes && test -z "$run"; then - tmpdir="/tmp" - test -n "$TMPDIR" && tmpdir="$TMPDIR" - tmpdir="$tmpdir/libtool-$$" - if $mkdir -p "$tmpdir" && chmod 700 "$tmpdir"; then : - else - $echo "$modename: error: cannot create temporary directory \`$tmpdir'" 1>&2 - continue - fi - file=`$echo "X$file" | $Xsed -e 's%^.*/%%'` - outputname="$tmpdir/$file" - # Replace the output file specification. - relink_command=`$echo "X$relink_command" | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g'` - - $show "$relink_command" - if $run eval "$relink_command"; then : - else - $echo "$modename: error: relink \`$file' with the above command before installing it" 1>&2 - ${rm}r "$tmpdir" - continue - fi - file="$outputname" - else - $echo "$modename: warning: cannot relink \`$file'" 1>&2 - fi - else - # Install the binary that we compiled earlier. - file=`$echo "X$file" | $Xsed -e "s%\([^/]*\)$%$objdir/\1%"` - fi - fi - - # remove .exe since cygwin /usr/bin/install will append another - # one anyways - case $install_prog,$host in - /usr/bin/install*,*cygwin*) - case $file:$destfile in - *.exe:*.exe) - # this is ok - ;; - *.exe:*) - destfile=$destfile.exe - ;; - *:*.exe) - destfile=`echo $destfile | sed -e 's,.exe$,,'` - ;; - esac - ;; - esac - $show "$install_prog$stripme $file $destfile" - $run eval "$install_prog\$stripme \$file \$destfile" || exit $? - test -n "$outputname" && ${rm}r "$tmpdir" - ;; - esac - done - - for file in $staticlibs; do - name=`$echo "X$file" | $Xsed -e 's%^.*/%%'` - - # Set up the ranlib parameters. - oldlib="$destdir/$name" - - $show "$install_prog $file $oldlib" - $run eval "$install_prog \$file \$oldlib" || exit $? - - if test -n "$stripme" && test -n "$striplib"; then - $show "$old_striplib $oldlib" - $run eval "$old_striplib $oldlib" || exit $? - fi - - # Do each command in the postinstall commands. - eval cmds=\"$old_postinstall_cmds\" - save_ifs="$IFS"; IFS='~' - for cmd in $cmds; do - IFS="$save_ifs" - $show "$cmd" - $run eval "$cmd" || exit $? - done - IFS="$save_ifs" - done - - if test -n "$future_libdirs"; then - $echo "$modename: warning: remember to run \`$progname --finish$future_libdirs'" 1>&2 - fi - - if test -n "$current_libdirs"; then - # Maybe just do a dry run. - test -n "$run" && current_libdirs=" -n$current_libdirs" - exec_cmd='$SHELL $0 --finish$current_libdirs' - else - exit 0 - fi - ;; - - # libtool finish mode - finish) - modename="$modename: finish" - libdirs="$nonopt" - admincmds= - - if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then - for dir - do - libdirs="$libdirs $dir" - done - - for libdir in $libdirs; do - if test -n "$finish_cmds"; then - # Do each command in the finish commands. - eval cmds=\"$finish_cmds\" - save_ifs="$IFS"; IFS='~' - for cmd in $cmds; do - IFS="$save_ifs" - $show "$cmd" - $run eval "$cmd" || admincmds="$admincmds - $cmd" - done - IFS="$save_ifs" - fi - if test -n "$finish_eval"; then - # Do the single finish_eval. - eval cmds=\"$finish_eval\" - $run eval "$cmds" || admincmds="$admincmds - $cmds" - fi - done - fi - - # Exit here if they wanted silent mode. - test "$show" = ":" && exit 0 - - echo "----------------------------------------------------------------------" - echo "Libraries have been installed in:" - for libdir in $libdirs; do - echo " $libdir" - done - echo - echo "If you ever happen to want to link against installed libraries" - echo "in a given directory, LIBDIR, you must either use libtool, and" - echo "specify the full pathname of the library, or use the \`-LLIBDIR'" - echo "flag during linking and do at least one of the following:" - if test -n "$shlibpath_var"; then - echo " - add LIBDIR to the \`$shlibpath_var' environment variable" - echo " during execution" - fi - if test -n "$runpath_var"; then - echo " - add LIBDIR to the \`$runpath_var' environment variable" - echo " during linking" - fi - if test -n "$hardcode_libdir_flag_spec"; then - libdir=LIBDIR - eval flag=\"$hardcode_libdir_flag_spec\" - - echo " - use the \`$flag' linker flag" - fi - if test -n "$admincmds"; then - echo " - have your system administrator run these commands:$admincmds" - fi - if test -f /etc/ld.so.conf; then - echo " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'" - fi - echo - echo "See any operating system documentation about shared libraries for" - echo "more information, such as the ld(1) and ld.so(8) manual pages." - echo "----------------------------------------------------------------------" - exit 0 - ;; - - # libtool execute mode - execute) - modename="$modename: execute" - - # The first argument is the command name. - cmd="$nonopt" - if test -z "$cmd"; then - $echo "$modename: you must specify a COMMAND" 1>&2 - $echo "$help" - exit 1 - fi - - # Handle -dlopen flags immediately. - for file in $execute_dlfiles; do - if test ! -f "$file"; then - $echo "$modename: \`$file' is not a file" 1>&2 - $echo "$help" 1>&2 - exit 1 - fi - - dir= - case $file in - *.la) - # Check to see that this really is a libtool archive. - if (sed -e '2q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then : - else - $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2 - $echo "$help" 1>&2 - exit 1 - fi - - # Read the libtool library. - dlname= - library_names= - - # If there is no directory component, then add one. - case $file in - */* | *\\*) . $file ;; - *) . ./$file ;; - esac - - # Skip this library if it cannot be dlopened. - if test -z "$dlname"; then - # Warn if it was a shared library. - test -n "$library_names" && $echo "$modename: warning: \`$file' was not linked with \`-export-dynamic'" - continue - fi - - dir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'` - test "X$dir" = "X$file" && dir=. - - if test -f "$dir/$objdir/$dlname"; then - dir="$dir/$objdir" - else - $echo "$modename: cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'" 1>&2 - exit 1 - fi - ;; - - *.lo) - # Just add the directory containing the .lo file. - dir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'` - test "X$dir" = "X$file" && dir=. - ;; - - *) - $echo "$modename: warning \`-dlopen' is ignored for non-libtool libraries and objects" 1>&2 - continue - ;; - esac - - # Get the absolute pathname. - absdir=`cd "$dir" && pwd` - test -n "$absdir" && dir="$absdir" - - # Now add the directory to shlibpath_var. - if eval "test -z \"\$$shlibpath_var\""; then - eval "$shlibpath_var=\"\$dir\"" - else - eval "$shlibpath_var=\"\$dir:\$$shlibpath_var\"" - fi - done - - # This variable tells wrapper scripts just to set shlibpath_var - # rather than running their programs. - libtool_execute_magic="$magic" - - # Check if any of the arguments is a wrapper script. - args= - for file - do - case $file in - -*) ;; - *) - # Do a test to see if this is really a libtool program. - if (sed -e '4q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then - # If there is no directory component, then add one. - case $file in - */* | *\\*) . $file ;; - *) . ./$file ;; - esac - - # Transform arg to wrapped name. - file="$progdir/$program" - fi - ;; - esac - # Quote arguments (to preserve shell metacharacters). - file=`$echo "X$file" | $Xsed -e "$sed_quote_subst"` - args="$args \"$file\"" - done - - if test -z "$run"; then - if test -n "$shlibpath_var"; then - # Export the shlibpath_var. - eval "export $shlibpath_var" - fi - - # Restore saved enviroment variables - if test "${save_LC_ALL+set}" = set; then - LC_ALL="$save_LC_ALL"; export LC_ALL - fi - if test "${save_LANG+set}" = set; then - LANG="$save_LANG"; export LANG - fi - - # Now prepare to actually exec the command. - exec_cmd='"$cmd"$args' - else - # Display what would be done. - if test -n "$shlibpath_var"; then - eval "\$echo \"\$shlibpath_var=\$$shlibpath_var\"" - $echo "export $shlibpath_var" - fi - $echo "$cmd$args" - exit 0 - fi - ;; - - # libtool clean and uninstall mode - clean | uninstall) - modename="$modename: $mode" - rm="$nonopt" - files= - rmforce= - exit_status=0 - - # This variable tells wrapper scripts just to set variables rather - # than running their programs. - libtool_install_magic="$magic" - - for arg - do - case $arg in - -f) rm="$rm $arg"; rmforce=yes ;; - -*) rm="$rm $arg" ;; - *) files="$files $arg" ;; - esac - done - - if test -z "$rm"; then - $echo "$modename: you must specify an RM program" 1>&2 - $echo "$help" 1>&2 - exit 1 - fi - - rmdirs= - - for file in $files; do - dir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'` - if test "X$dir" = "X$file"; then - dir=. - objdir="$objdir" - else - objdir="$dir/$objdir" - fi - name=`$echo "X$file" | $Xsed -e 's%^.*/%%'` - test $mode = uninstall && objdir="$dir" - - # Remember objdir for removal later, being careful to avoid duplicates - if test $mode = clean; then - case " $rmdirs " in - *" $objdir "*) ;; - *) rmdirs="$rmdirs $objdir" ;; - esac - fi - - # Don't error if the file doesn't exist and rm -f was used. - if (test -L "$file") >/dev/null 2>&1 \ - || (test -h "$file") >/dev/null 2>&1 \ - || test -f "$file"; then - : - elif test -d "$file"; then - exit_status=1 - continue - elif test "$rmforce" = yes; then - continue - fi - - rmfiles="$file" - - case $name in - *.la) - # Possibly a libtool archive, so verify it. - if (sed -e '2q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then - . $dir/$name - - # Delete the libtool libraries and symlinks. - for n in $library_names; do - rmfiles="$rmfiles $objdir/$n" - done - test -n "$old_library" && rmfiles="$rmfiles $objdir/$old_library" - test $mode = clean && rmfiles="$rmfiles $objdir/$name $objdir/${name}i" - - if test $mode = uninstall; then - if test -n "$library_names"; then - # Do each command in the postuninstall commands. - eval cmds=\"$postuninstall_cmds\" - save_ifs="$IFS"; IFS='~' - for cmd in $cmds; do - IFS="$save_ifs" - $show "$cmd" - $run eval "$cmd" - if test $? != 0 && test "$rmforce" != yes; then - exit_status=1 - fi - done - IFS="$save_ifs" - fi - - if test -n "$old_library"; then - # Do each command in the old_postuninstall commands. - eval cmds=\"$old_postuninstall_cmds\" - save_ifs="$IFS"; IFS='~' - for cmd in $cmds; do - IFS="$save_ifs" - $show "$cmd" - $run eval "$cmd" - if test $? != 0 && test "$rmforce" != yes; then - exit_status=1 - fi - done - IFS="$save_ifs" - fi - # FIXME: should reinstall the best remaining shared library. - fi - fi - ;; - - *.lo) - if test "$build_old_libs" = yes; then - oldobj=`$echo "X$name" | $Xsed -e "$lo2o"` - rmfiles="$rmfiles $dir/$oldobj" - fi - ;; - - *) - # Do a test to see if this is a libtool program. - if test $mode = clean && - (sed -e '4q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then - relink_command= - . $dir/$file - - rmfiles="$rmfiles $objdir/$name $objdir/${name}S.${objext}" - if test "$fast_install" = yes && test -n "$relink_command"; then - rmfiles="$rmfiles $objdir/lt-$name" - fi - fi - ;; - esac - $show "$rm $rmfiles" - $run $rm $rmfiles || exit_status=1 - done - - # Try to remove the ${objdir}s in the directories where we deleted files - for dir in $rmdirs; do - if test -d "$dir"; then - $show "rmdir $dir" - $run rmdir $dir >/dev/null 2>&1 - fi - done - - exit $exit_status - ;; - - "") - $echo "$modename: you must specify a MODE" 1>&2 - $echo "$generic_help" 1>&2 - exit 1 - ;; - esac - - if test -z "$exec_cmd"; then - $echo "$modename: invalid operation mode \`$mode'" 1>&2 - $echo "$generic_help" 1>&2 - exit 1 - fi -fi # test -z "$show_help" - -if test -n "$exec_cmd"; then - eval exec $exec_cmd - exit 1 -fi - -# We need to display help for each of the modes. -case $mode in -"") $echo \ -"Usage: $modename [OPTION]... [MODE-ARG]... - -Provide generalized library-building support services. - - --config show all configuration variables - --debug enable verbose shell tracing --n, --dry-run display commands without modifying any files - --features display basic configuration information and exit - --finish same as \`--mode=finish' - --help display this help message and exit - --mode=MODE use operation mode MODE [default=inferred from MODE-ARGS] - --quiet same as \`--silent' - --silent don't print informational messages - --version print version information - -MODE must be one of the following: - - clean remove files from the build directory - compile compile a source file into a libtool object - execute automatically set library path, then run a program - finish complete the installation of libtool libraries - install install libraries or executables - link create a library or an executable - uninstall remove libraries from an installed directory - -MODE-ARGS vary depending on the MODE. Try \`$modename --help --mode=MODE' for -a more detailed description of MODE." - exit 0 - ;; - -clean) - $echo \ -"Usage: $modename [OPTION]... --mode=clean RM [RM-OPTION]... FILE... - -Remove files from the build directory. - -RM is the name of the program to use to delete files associated with each FILE -(typically \`/bin/rm'). RM-OPTIONS are options (such as \`-f') to be passed -to RM. - -If FILE is a libtool library, object or program, all the files associated -with it are deleted. Otherwise, only FILE itself is deleted using RM." - ;; - -compile) - $echo \ -"Usage: $modename [OPTION]... --mode=compile COMPILE-COMMAND... SOURCEFILE - -Compile a source file into a libtool library object. - -This mode accepts the following additional options: - - -o OUTPUT-FILE set the output file name to OUTPUT-FILE - -prefer-pic try to building PIC objects only - -prefer-non-pic try to building non-PIC objects only - -static always build a \`.o' file suitable for static linking - -COMPILE-COMMAND is a command to be used in creating a \`standard' object file -from the given SOURCEFILE. - -The output file name is determined by removing the directory component from -SOURCEFILE, then substituting the C source code suffix \`.c' with the -library object suffix, \`.lo'." - ;; - -execute) - $echo \ -"Usage: $modename [OPTION]... --mode=execute COMMAND [ARGS]... - -Automatically set library path, then run a program. - -This mode accepts the following additional options: - - -dlopen FILE add the directory containing FILE to the library path - -This mode sets the library path environment variable according to \`-dlopen' -flags. - -If any of the ARGS are libtool executable wrappers, then they are translated -into their corresponding uninstalled binary, and any of their required library -directories are added to the library path. - -Then, COMMAND is executed, with ARGS as arguments." - ;; - -finish) - $echo \ -"Usage: $modename [OPTION]... --mode=finish [LIBDIR]... - -Complete the installation of libtool libraries. - -Each LIBDIR is a directory that contains libtool libraries. - -The commands that this mode executes may require superuser privileges. Use -the \`--dry-run' option if you just want to see what would be executed." - ;; - -install) - $echo \ -"Usage: $modename [OPTION]... --mode=install INSTALL-COMMAND... - -Install executables or libraries. - -INSTALL-COMMAND is the installation command. The first component should be -either the \`install' or \`cp' program. - -The rest of the components are interpreted as arguments to that command (only -BSD-compatible install options are recognized)." - ;; - -link) - $echo \ -"Usage: $modename [OPTION]... --mode=link LINK-COMMAND... - -Link object files or libraries together to form another library, or to -create an executable program. - -LINK-COMMAND is a command using the C compiler that you would use to create -a program from several object files. - -The following components of LINK-COMMAND are treated specially: - - -all-static do not do any dynamic linking at all - -avoid-version do not add a version suffix if possible - -dlopen FILE \`-dlpreopen' FILE if it cannot be dlopened at runtime - -dlpreopen FILE link in FILE and add its symbols to lt_preloaded_symbols - -export-dynamic allow symbols from OUTPUT-FILE to be resolved with dlsym(3) - -export-symbols SYMFILE - try to export only the symbols listed in SYMFILE - -export-symbols-regex REGEX - try to export only the symbols matching REGEX - -LLIBDIR search LIBDIR for required installed libraries - -lNAME OUTPUT-FILE requires the installed library libNAME - -module build a library that can dlopened - -no-fast-install disable the fast-install mode - -no-install link a not-installable executable - -no-undefined declare that a library does not refer to external symbols - -o OUTPUT-FILE create OUTPUT-FILE from the specified objects - -release RELEASE specify package release information - -rpath LIBDIR the created library will eventually be installed in LIBDIR - -R[ ]LIBDIR add LIBDIR to the runtime path of programs and libraries - -static do not do any dynamic linking of libtool libraries - -version-info CURRENT[:REVISION[:AGE]] - specify library version info [each variable defaults to 0] - -All other options (arguments beginning with \`-') are ignored. - -Every other argument is treated as a filename. Files ending in \`.la' are -treated as uninstalled libtool libraries, other files are standard or library -object files. - -If the OUTPUT-FILE ends in \`.la', then a libtool library is created, -only library objects (\`.lo' files) may be specified, and \`-rpath' is -required, except when creating a convenience library. - -If OUTPUT-FILE ends in \`.a' or \`.lib', then a standard library is created -using \`ar' and \`ranlib', or on Windows using \`lib'. - -If OUTPUT-FILE ends in \`.lo' or \`.${objext}', then a reloadable object file -is created, otherwise an executable program is created." - ;; - -uninstall) - $echo \ -"Usage: $modename [OPTION]... --mode=uninstall RM [RM-OPTION]... FILE... - -Remove libraries from an installation directory. - -RM is the name of the program to use to delete files associated with each FILE -(typically \`/bin/rm'). RM-OPTIONS are options (such as \`-f') to be passed -to RM. - -If FILE is a libtool library, all the files associated with it are deleted. -Otherwise, only FILE itself is deleted using RM." - ;; - -*) - $echo "$modename: invalid operation mode \`$mode'" 1>&2 - $echo "$help" 1>&2 - exit 1 - ;; -esac - -echo -$echo "Try \`$modename --help' for more information about other modes." - -exit 0 - -# Local Variables: -# mode:shell-script -# sh-indentation:2 -# End: diff --git a/contrib/amd/m4/macros/c_void_p.m4 b/contrib/amd/m4/macros/c_void_p.m4 deleted file mode 100644 index 50c246f..0000000 --- a/contrib/amd/m4/macros/c_void_p.m4 +++ /dev/null @@ -1,22 +0,0 @@ -dnl ###################################################################### -dnl check if compiler can handle "void *" -AC_DEFUN(AMU_C_VOID_P, -[ -AC_CACHE_CHECK(if compiler can handle void *, -ac_cv_c_void_p, -[ -# try to compile a program which uses void * -AC_TRY_COMPILE( -[ ], -[ -void *vp; -], ac_cv_c_void_p=yes, ac_cv_c_void_p=no) -]) -if test "$ac_cv_c_void_p" = yes -then - AC_DEFINE(voidp, void *) -else - AC_DEFINE(voidp, char *) -fi -]) -dnl ====================================================================== diff --git a/contrib/amd/m4/macros/cache_check_dynamic.m4 b/contrib/amd/m4/macros/cache_check_dynamic.m4 deleted file mode 100644 index b8eb598..0000000 --- a/contrib/amd/m4/macros/cache_check_dynamic.m4 +++ /dev/null @@ -1,26 +0,0 @@ -dnl ###################################################################### -dnl New versions of the cache functions which also dynamically evaluate the -dnl cache-id field, so that it may contain shell variables to expand -dnl dynamically for the creation of $ac_cv_* variables on the fly. -dnl In addition, this function allows you to call COMMANDS which generate -dnl output on the command line, because it prints its own AC_MSG_CHECKING -dnl after COMMANDS are run. -dnl -dnl ====================================================================== -dnl AMU_CACHE_CHECK_DYNAMIC(MESSAGE, CACHE-ID, COMMANDS) -define(AMU_CACHE_CHECK_DYNAMIC, -[ -ac_tmp=`echo $2` -if eval "test \"`echo '$''{'$ac_tmp'+set}'`\" = set"; then - AC_MSG_CHECKING([$1]) - echo $ECHO_N "(cached) $ECHO_C" 1>&AS_MESSAGE_FD([]) -dnl XXX: for older autoconf versions -dnl echo $ac_n "(cached) $ac_c" 1>&AS_MESSAGE_FD([]) -else - $3 - AC_MSG_CHECKING([$1]) -fi -ac_tmp_val=`eval eval "echo '$''{'$ac_tmp'}'"` -AC_MSG_RESULT($ac_tmp_val) -]) -dnl ====================================================================== diff --git a/contrib/amd/m4/macros/check_amu_fs.m4 b/contrib/amd/m4/macros/check_amu_fs.m4 deleted file mode 100644 index 391deb3..0000000 --- a/contrib/amd/m4/macros/check_amu_fs.m4 +++ /dev/null @@ -1,40 +0,0 @@ -dnl ###################################################################### -dnl check if an automounter filesystem exists (it almost always does). -dnl Usage: AC_CHECK_AMU_FS(, , []) -dnl Print the message in , and declare HAVE_AMU_FS_ true. -dnl If is defined, then define this filesystem as tru only of the -dnl filesystem for is true. -AC_DEFUN(AMU_CHECK_AMU_FS, -[ -# store variable name of fs -ac_upcase_am_fs_name=`echo $1 | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` -ac_safe=HAVE_AMU_FS_$ac_upcase_am_fs_name -# check for cache and set it if needed -AMU_CACHE_CHECK_DYNAMIC(for $2 filesystem ($1), -ac_cv_am_fs_$1, -[ -# true by default -eval "ac_cv_am_fs_$1=yes" -# if exists but is defined to "no", set this filesystem to no. -if test -n "$3" -then - # flse by default if arg 3 was supplied - eval "ac_cv_am_fs_$1=no" - if test "`eval echo '$''{ac_cv_fs_'$3'}'`" = yes - then - eval "ac_cv_am_fs_$1=yes" - fi - # some filesystems do not have a mnttab entry, but exist based on headers - if test "`eval echo '$''{ac_cv_fs_header_'$3'}'`" = yes - then - eval "ac_cv_am_fs_$1=yes" - fi -fi -]) -# check if need to define variable -if test "`eval echo '$''{ac_cv_am_fs_'$1'}'`" = yes -then - AC_DEFINE_UNQUOTED($ac_safe) -fi -]) -dnl ====================================================================== diff --git a/contrib/amd/m4/macros/check_checkmount_style.m4 b/contrib/amd/m4/macros/check_checkmount_style.m4 deleted file mode 100644 index a2e7555..0000000 --- a/contrib/amd/m4/macros/check_checkmount_style.m4 +++ /dev/null @@ -1,28 +0,0 @@ -dnl ###################################################################### -dnl check style of fixmount check_mount() function -AC_DEFUN(AMU_CHECK_CHECKMOUNT_STYLE, -[ -AC_CACHE_CHECK(style of fixmount check_mount(), -ac_cv_style_checkmount, -[ -# select the correct style for unmounting filesystems -case "${host_os_name}" in - svr4* | sysv4* | solaris2* | sunos5* ) - ac_cv_style_checkmount=svr4 ;; - bsd44* | bsdi* | freebsd* | netbsd* | openbsd* | darwin* | rhapsody* ) - ac_cv_style_checkmount=bsd44 ;; - aix* ) - ac_cv_style_checkmount=aix ;; - osf* ) - ac_cv_style_checkmount=osf ;; - ultrix* ) - ac_cv_style_checkmount=ultrix ;; - * ) - ac_cv_style_checkmount=default ;; -esac -]) -am_utils_checkmount_style_file="check_mount.c" -am_utils_link_files=${am_utils_link_files}fixmount/${am_utils_checkmount_style_file}:conf/checkmount/checkmount_${ac_cv_style_checkmount}.c" " - -]) -dnl ====================================================================== diff --git a/contrib/amd/m4/macros/check_extern.m4 b/contrib/amd/m4/macros/check_extern.m4 deleted file mode 100644 index a278426..0000000 --- a/contrib/amd/m4/macros/check_extern.m4 +++ /dev/null @@ -1,98 +0,0 @@ -dnl ###################################################################### -dnl check for external definition for a function (not external variables) -dnl Usage AMU_CHECK_EXTERN(extern) -dnl Checks for external definition for "extern" that is delimited on the -dnl left and the right by a character that is not a valid symbol character. -dnl -dnl Note that $pattern below is very carefully crafted to match any system -dnl external definition, with __P posix prototypes, with or without an extern -dnl word, etc. Think twice before changing this. -AC_DEFUN(AMU_CHECK_EXTERN, -[ -# store variable name for external definition -ac_upcase_extern_name=`echo $1 | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` -ac_safe=HAVE_EXTERN_$ac_upcase_extern_name -# check for cached value and set it if needed -AMU_CACHE_CHECK_DYNAMIC(external function definition for $1, -ac_cv_extern_$1, -[ -# the old pattern assumed that the complete external definition is on one -# line but on some systems it is split over several lines, so only match -# beginning of the extern definition including the opening parenthesis. -#pattern="(extern)?.*[^a-zA-Z0-9_]$1[^a-zA-Z0-9_]?.*\(.*\).*;" -pattern="(extern)?.*[[^a-zA-Z0-9_]]$1[[^a-zA-Z0-9_]]?.*\(" -AC_EGREP_CPP(${pattern}, -[ -#ifdef HAVE_SYS_TYPES_H -# include -#endif /* HAVE_SYS_TYPES_H */ -#ifdef HAVE_SYS_WAIT_H -# include -#endif /* HAVE_SYS_WAIT_H */ -#if TIME_WITH_SYS_TIME -# include -# include -#else /* not TIME_WITH_SYS_TIME */ -# if HAVE_SYS_TIME_H -# include -# else /* not HAVE_SYS_TIME_H */ -# include -# endif /* not HAVE_SYS_TIME_H */ -#endif /* not TIME_WITH_SYS_TIME */ - -#ifdef HAVE_STDIO_H -# include -#endif /* HAVE_STDIO_H */ -#ifdef HAVE_STDLIB_H -# include -#endif /* HAVE_STDLIB_H */ -#if HAVE_UNISTD_H -# include -#endif /* HAVE_UNISTD_H */ -#if HAVE_STRING_H -# include -#endif /* HAVE_STRING_H */ -#ifdef HAVE_STRINGS_H -# include -#endif /* HAVE_STRINGS_H */ -#ifdef HAVE_NETDB_H -# include -#endif /* HAVE_NETDB_H */ -#ifdef HAVE_CLUSTER_H -# include -#endif /* HAVE_CLUSTER_H */ -#ifdef HAVE_RPC_RPC_H -/* - * Turn on PORTMAP, so that additional header files would get included - * and the important definition for UDPMSGSIZE is included too. - */ -# ifndef PORTMAP -# define PORTMAP -# endif /* not PORTMAP */ -# include -# ifndef XDRPROC_T_TYPE -typedef bool_t (*xdrproc_t) __P ((XDR *, __ptr_t, ...)); -# endif /* not XDRPROC_T_TYPE */ -#endif /* HAVE_RPC_RPC_H */ - -], eval "ac_cv_extern_$1=yes", eval "ac_cv_extern_$1=no") -]) -# check if need to define variable -if test "`eval echo '$''{ac_cv_extern_'$1'}'`" = yes -then - AC_DEFINE_UNQUOTED($ac_safe) -fi -]) -dnl ====================================================================== - -dnl ###################################################################### -dnl run AMU_CHECK_EXTERN on each argument given -dnl Usage: AMU_CHECK_EXTERNS(arg arg arg ...) -AC_DEFUN(AMU_CHECK_EXTERNS, -[ -for ac_tmp_arg in $1 -do -AMU_CHECK_EXTERN($ac_tmp_arg) -done -]) -dnl ====================================================================== diff --git a/contrib/amd/m4/macros/check_fhandle.m4 b/contrib/amd/m4/macros/check_fhandle.m4 deleted file mode 100644 index c1ecbc4..0000000 --- a/contrib/amd/m4/macros/check_fhandle.m4 +++ /dev/null @@ -1,25 +0,0 @@ -dnl ###################################################################### -dnl Find if type 'fhandle' exists -AC_DEFUN(AMU_CHECK_FHANDLE, -[ -AC_CACHE_CHECK(if plain fhandle type exists, -ac_cv_have_fhandle, -[ -# try to compile a program which may have a definition for the type -# set to a default value -ac_cv_have_fhandle=no -# look for "struct nfs_fh" -if test "$ac_cv_have_fhandle" = no -then -AC_TRY_COMPILE_NFS( -[ fhandle a; -], ac_cv_have_fhandle=yes, ac_cv_have_fhandle=no) -fi - -]) -if test "$ac_cv_have_fhandle" != no -then - AC_DEFINE(HAVE_FHANDLE) -fi -]) -dnl ====================================================================== diff --git a/contrib/amd/m4/macros/check_field.m4 b/contrib/amd/m4/macros/check_field.m4 deleted file mode 100644 index 9659787..0000000 --- a/contrib/amd/m4/macros/check_field.m4 +++ /dev/null @@ -1,110 +0,0 @@ -dnl ###################################################################### -dnl FIXED VERSION OF AUTOCONF 2.50 AC_CHECK_MEMBER. g/cc will fail to check -dnl a member if the .member is itself a data structure, because you cannot -dnl compare, in C, a data structure against NULL; you can compare a native -dnl data type (int, char) or a pointer. Solution: do what I did in my -dnl original member checking macro: try to take the address of the member. -dnl You can always take the address of anything. -dnl -Erez Zadok, Feb 6, 2002. -dnl -# AC_CHECK_MEMBER2(AGGREGATE.MEMBER, -# [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND], -# [INCLUDES]) -# --------------------------------------------------------- -# AGGREGATE.MEMBER is for instance `struct passwd.pw_gecos', shell -# variables are not a valid argument. -AC_DEFUN([AC_CHECK_MEMBER2], -[AS_LITERAL_IF([$1], [], - [AC_FATAL([$0: requires literal arguments])])dnl -m4_if(m4_regexp([$1], [\.]), -1, - [AC_FATAL([$0: Did not see any dot in `$1'])])dnl -AS_VAR_PUSHDEF([ac_Member], [ac_cv_member_$1])dnl -dnl Extract the aggregate name, and the member name -AC_CACHE_CHECK([for $1], ac_Member, -[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([AC_INCLUDES_DEFAULT([$4])], -[dnl AGGREGATE ac_aggr; -static m4_patsubst([$1], [\..*]) ac_aggr; -dnl ac_aggr.MEMBER; -if (&(ac_aggr.m4_patsubst([$1], [^[^.]*\.]))) -return 0;])], - [AS_VAR_SET(ac_Member, yes)], - [AS_VAR_SET(ac_Member, no)])]) -AS_IF([test AS_VAR_GET(ac_Member) = yes], [$2], [$3])dnl -AS_VAR_POPDEF([ac_Member])dnl -])# AC_CHECK_MEMBER - -# AC_CHECK_MEMBERS2([AGGREGATE.MEMBER, ...], -# [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND] -# [INCLUDES]) -# --------------------------------------------------------- -# The first argument is an m4 list. -AC_DEFUN([AC_CHECK_MEMBERS2], -[m4_foreach([AC_Member], [$1], - [AC_CHECK_MEMBER2(AC_Member, - [AC_DEFINE_UNQUOTED(AS_TR_CPP(HAVE_[]AC_Member), 1, - [Define if `]m4_patsubst(AC_Member, - [^[^.]*\.])[' is - member of `]m4_patsubst(AC_Member, [\..*])['.]) -$2], - [$3], - [$4])])]) - - -dnl ###################################################################### -dnl find if structure $1 has field field $2 -AC_DEFUN(AMU_CHECK_FIELD, -[ -AC_CHECK_MEMBERS2($1, , ,[ -AMU_MOUNT_HEADERS( -[ -/* now set the typedef */ -#ifdef HAVE_STRUCT_MNTENT -typedef struct mntent mntent_t; -#else /* not HAVE_STRUCT_MNTENT */ -# ifdef HAVE_STRUCT_MNTTAB -typedef struct mnttab mntent_t; -# endif /* HAVE_STRUCT_MNTTAB */ -#endif /* not HAVE_STRUCT_MNTENT */ - -/* - * for various filesystem specific mount arguments - */ - -#ifdef HAVE_SYS_FS_PC_FS_H -# include -#endif /* HAVE_SYS_FS_PC_FS_H */ -#ifdef HAVE_MSDOSFS_MSDOSFSMOUNT_H -# include -#endif /* HAVE_MSDOSFS_MSDOSFSMOUNT_H */ - -#ifdef HAVE_SYS_FS_EFS_CLNT_H -# include -#endif /* HAVE_SYS_FS_EFS_CLNT_H */ -#ifdef HAVE_SYS_FS_XFS_CLNT_H -# include -#endif /* HAVE_SYS_FS_XFS_CLNT_H */ -#ifdef HAVE_SYS_FS_UFS_MOUNT_H -# include -#endif /* HAVE_SYS_FS_UFS_MOUNT_H */ -#ifdef HAVE_SYS_FS_AUTOFS_H -# include -#endif /* HAVE_SYS_FS_AUTOFS_H */ -#ifdef HAVE_RPCSVC_AUTOFS_PROT_H -# include -#else /* not HAVE_RPCSVC_AUTOFS_PROT_H */ -# ifdef HAVE_SYS_FS_AUTOFS_PROT_H -# include -# endif /* HAVE_SYS_FS_AUTOFS_PROT_H */ -#endif /* not HAVE_RPCSVC_AUTOFS_PROT_H */ -#ifdef HAVE_HSFS_HSFS_H -# include -#endif /* HAVE_HSFS_HSFS_H */ - -#ifdef HAVE_IFADDRS_H -# include -#endif /* HAVE_IFADDRS_H */ - -]) -]) -]) -dnl ====================================================================== diff --git a/contrib/amd/m4/macros/check_fs_headers.m4 b/contrib/amd/m4/macros/check_fs_headers.m4 deleted file mode 100644 index 39052ca..0000000 --- a/contrib/amd/m4/macros/check_fs_headers.m4 +++ /dev/null @@ -1,53 +0,0 @@ -dnl ###################################################################### -dnl check if a filesystem exists (if any of its header files exist). -dnl Usage: AC_CHECK_FS_HEADERS(..., , []) -dnl Check if any of the headers exist. If any exist, then -dnl define HAVE_FS_. If exits, then define -dnl HAVE_FS_ instead... -AC_DEFUN(AMU_CHECK_FS_HEADERS, -[ -# find what name to give to the fs -if test -n "$3" -then - ac_fs_name=$3 -else - ac_fs_name=$2 -fi -# store variable name of fs -ac_upcase_fs_name=`echo $2 | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` -ac_fs_headers_safe=HAVE_FS_$ac_upcase_fs_name -# check for cache and set it if needed -AMU_CACHE_CHECK_DYNAMIC(for $ac_fs_name filesystem in <$1>, -ac_cv_fs_header_$ac_fs_name, -[ -# define to "no" by default -eval "ac_cv_fs_header_$ac_fs_name=no" -# and look to see if it was found -AC_CHECK_HEADERS($1, -[ eval "ac_cv_fs_header_$ac_fs_name=yes" - break -])]) -# check if need to define variable -if test "`eval echo '$''{ac_cv_fs_header_'$ac_fs_name'}'`" = yes -then - AC_DEFINE_UNQUOTED($ac_fs_headers_safe) -# append ops_.o object to AMD_FS_OBJS for automatic compilation -# if first time we add something to this list, then also tell autoconf -# to replace instances of it in Makefiles. - if test -z "$AMD_FS_OBJS" - then - AMD_FS_OBJS="ops_${ac_fs_name}.o" - AC_SUBST(AMD_FS_OBJS) - else - # since this object file could have already been added before - # we need to ensure we do not add it twice. - case "${AMD_FS_OBJS}" in - *ops_${ac_fs_name}.o* ) ;; - * ) - AMD_FS_OBJS="$AMD_FS_OBJS ops_${ac_fs_name}.o" - ;; - esac - fi -fi -]) -dnl ====================================================================== diff --git a/contrib/amd/m4/macros/check_fs_mntent.m4 b/contrib/amd/m4/macros/check_fs_mntent.m4 deleted file mode 100644 index 22b16ff..0000000 --- a/contrib/amd/m4/macros/check_fs_mntent.m4 +++ /dev/null @@ -1,176 +0,0 @@ -dnl ###################################################################### -dnl check if a filesystem type exists (if its header files exist) -dnl Usage: AC_CHECK_FS_MNTENT(, []) -dnl -dnl Check in some headers for MNTTYPE_ macro. If that exist, -dnl then define HAVE_FS_. If exits, then define -dnl HAVE_FS_ instead... -AC_DEFUN(AMU_CHECK_FS_MNTENT, -[ -# find what name to give to the fs -if test -n "$2" -then - ac_fs_name=$2 - ac_fs_as_name=" (from: $1)" -else - ac_fs_name=$1 - ac_fs_as_name="" -fi -# store variable name of filesystem -ac_upcase_fs_name=`echo $ac_fs_name | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` -ac_safe=HAVE_FS_$ac_upcase_fs_name -# check for cache and set it if needed -AMU_CACHE_CHECK_DYNAMIC(for $ac_fs_name$ac_fs_as_name mntent definition, -ac_cv_fs_$ac_fs_name, -[ -# assume not found -eval "ac_cv_fs_$ac_fs_name=no" -for ac_fs_tmp in $1 -do - ac_upcase_fs_symbol=`echo $ac_fs_tmp | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` - - # first look for MNTTYPE_* - AC_EGREP_CPP(yes, - AMU_MOUNT_HEADERS( - [ -#ifdef MNTTYPE_$ac_upcase_fs_symbol - yes -#endif /* MNTTYPE_$ac_upcase_fs_symbol */ - ]), [eval "ac_cv_fs_$ac_fs_name=yes"], [eval "ac_cv_fs_$ac_fs_name=no"] ) - # check if need to terminate "for" loop - if test "`eval echo '$''{ac_cv_fs_'$ac_fs_name'}'`" != no - then - break - fi - - # now try to look for MOUNT_ macro - AC_EGREP_CPP(yes, - AMU_MOUNT_HEADERS( - [ -#ifdef MOUNT_$ac_upcase_fs_symbol - yes -#endif /* MOUNT_$ac_upcase_fs_symbol */ - ]), [eval "ac_cv_fs_$ac_fs_name=yes"], [eval "ac_cv_fs_$ac_fs_name=no"] ) - # check if need to terminate "for" loop - if test "`eval echo '$''{ac_cv_fs_'$ac_fs_name'}'`" != no - then - break - fi - - # now try to look for MNT_ macro - AC_EGREP_CPP(yes, - AMU_MOUNT_HEADERS( - [ -#ifdef MNT_$ac_upcase_fs_symbol - yes -#endif /* MNT_$ac_upcase_fs_symbol */ - ]), [eval "ac_cv_fs_$ac_fs_name=yes"], [eval "ac_cv_fs_$ac_fs_name=no"] ) - # check if need to terminate "for" loop - if test "`eval echo '$''{ac_cv_fs_'$ac_fs_name'}'`" != no - then - break - fi - - # now try to look for GT_ macro (ultrix) - AC_EGREP_CPP(yes, - AMU_MOUNT_HEADERS( - [ -#ifdef GT_$ac_upcase_fs_symbol - yes -#endif /* GT_$ac_upcase_fs_symbol */ - ]), [eval "ac_cv_fs_$ac_fs_name=yes"], [eval "ac_cv_fs_$ac_fs_name=no"] ) - # check if need to terminate "for" loop - if test "`eval echo '$''{ac_cv_fs_'$ac_fs_name'}'`" != no - then - break - fi - - # look for a loadable filesystem module (linux) - if test -f /lib/modules/$host_os_version/fs/$ac_fs_tmp.o - then - eval "ac_cv_fs_$ac_fs_name=yes" - break - fi - - # look for a loadable filesystem module (linux 2.4+) - if test -f /lib/modules/$host_os_version/kernel/fs/$ac_fs_tmp/$ac_fs_tmp.o - then - eval "ac_cv_fs_$ac_fs_name=yes" - break - fi - - # look for a loadable filesystem module (linux redhat-5.1) - if test -f /lib/modules/preferred/fs/$ac_fs_tmp.o - then - eval "ac_cv_fs_$ac_fs_name=yes" - break - fi - - # in addition look for statically compiled filesystem (linux) - if egrep "[[^a-zA-Z0-9_]]$ac_fs_tmp$" /proc/filesystems >/dev/null 2>&1 - then - eval "ac_cv_fs_$ac_fs_name=yes" - break - fi - - if test "$ac_fs_tmp" = "nfs3" -a "$ac_cv_header_linux_nfs_mount_h" = "yes" - then - # hack hack hack - # in 6.1, which has fallback to v2/udp, we might want - # to always use version 4. - # in 6.0 we do not have much choice - # - let nfs_mount_version="`grep NFS_MOUNT_VERSION /usr/include/linux/nfs_mount.h | awk '{print $''3;}'`" - if test $nfs_mount_version -ge 4 - then - eval "ac_cv_fs_$ac_fs_name=yes" - break - fi - fi - - # run a test program for bsdi3 - AC_TRY_RUN( - [ -#include -#include -main() -{ - int i; - struct vfsconf vf; - i = getvfsbyname("$ac_fs_tmp", &vf); - if (i < 0) - exit(1); - else - exit(0); -} - ], [eval "ac_cv_fs_$ac_fs_name=yes" - break - ] - ) - -done -]) -# check if need to define variable -if test "`eval echo '$''{ac_cv_fs_'$ac_fs_name'}'`" = yes -then - AC_DEFINE_UNQUOTED($ac_safe) -# append ops_.o object to AMD_FS_OBJS for automatic compilation -# if first time we add something to this list, then also tell autoconf -# to replace instances of it in Makefiles. - if test -z "$AMD_FS_OBJS" - then - AMD_FS_OBJS="ops_${ac_fs_name}.o" - AC_SUBST(AMD_FS_OBJS) - else - # since this object file could have already been added before - # we need to ensure we do not add it twice. - case "${AMD_FS_OBJS}" in - *ops_${ac_fs_name}.o* ) ;; - * ) - AMD_FS_OBJS="$AMD_FS_OBJS ops_${ac_fs_name}.o" - ;; - esac - fi -fi -]) -dnl ====================================================================== diff --git a/contrib/amd/m4/macros/check_gnu_getopt.m4 b/contrib/amd/m4/macros/check_gnu_getopt.m4 deleted file mode 100644 index be7be62..0000000 --- a/contrib/amd/m4/macros/check_gnu_getopt.m4 +++ /dev/null @@ -1,42 +0,0 @@ -dnl ###################################################################### -dnl Do we have a GNUish getopt -AC_DEFUN(AMU_CHECK_GNU_GETOPT, -[ -AC_CACHE_CHECK([for GNU getopt], ac_cv_sys_gnu_getopt, [ -AC_TRY_RUN([ -#include -#include -int main() -{ - int argc = 3; - char *argv[] = { "actest", "arg", "-x", NULL }; - int c; - FILE* rf; - int isGNU = 0; - - rf = fopen("conftestresult", "w"); - if (rf == NULL) exit(1); - - while ( (c = getopt(argc, argv, "x")) != -1 ) { - switch ( c ) { - case 'x': - isGNU=1; - break; - default: - exit(1); - } - } - fprintf(rf, isGNU ? "yes" : "no"); - exit(0); -} -],[ -ac_cv_sys_gnu_getopt="`cat conftestresult`" -],[ -AC_MSG_ERROR(could not test for getopt()) -]) -]) -if test "$ac_cv_sys_gnu_getopt" = "yes" -then - AC_DEFINE(HAVE_GNU_GETOPT) -fi -]) diff --git a/contrib/amd/m4/macros/check_hide_mount_type.m4 b/contrib/amd/m4/macros/check_hide_mount_type.m4 deleted file mode 100644 index d16cab8..0000000 --- a/contrib/amd/m4/macros/check_hide_mount_type.m4 +++ /dev/null @@ -1,31 +0,0 @@ -dnl ###################################################################### -dnl Define mount type to hide amd mounts from df(1) -dnl -dnl This has to be determined individually per OS. Depending on whatever -dnl mount options are defined in the system header files such as -dnl MNTTYPE_IGNORE or MNTTYPE_AUTO, or others does not work: some OSs define -dnl some of these then use other stuff; some do not define them at all in -dnl the headers, but still use it; and more. After a long attempt to get -dnl this automatically configured, I came to the conclusion that the semi- -dnl automatic per-host-os determination here is the best. -dnl -AC_DEFUN(AMU_CHECK_HIDE_MOUNT_TYPE, -[ -AC_CACHE_CHECK(for mount type to hide from df, -ac_cv_hide_mount_type, -[ -case "${host_os}" in - irix* | hpux* ) - ac_cv_hide_mount_type="ignore" - ;; - sunos4* ) - ac_cv_hide_mount_type="auto" - ;; - * ) - ac_cv_hide_mount_type="nfs" - ;; -esac -]) -AC_DEFINE_UNQUOTED(HIDE_MOUNT_TYPE, "$ac_cv_hide_mount_type") -]) -dnl ====================================================================== diff --git a/contrib/amd/m4/macros/check_lib2.m4 b/contrib/amd/m4/macros/check_lib2.m4 deleted file mode 100644 index 69125c6..0000000 --- a/contrib/amd/m4/macros/check_lib2.m4 +++ /dev/null @@ -1,66 +0,0 @@ -dnl a bug-fixed version of autoconf 2.12. -dnl first try to link library without $5, and only of that failed, -dnl try with $5 if specified. -dnl it adds $5 to $LIBS if it was needed -Erez. -dnl AC_CHECK_LIB2(LIBRARY, FUNCTION [, ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND -dnl [, OTHER-LIBRARIES]]]) -AC_DEFUN(AMU_CHECK_LIB2, -[AC_MSG_CHECKING([for $2 in -l$1]) -dnl Use a cache variable name containing both the library and function name, -dnl because the test really is for library $1 defining function $2, not -dnl just for library $1. Separate tests with the same $1 and different $2s -dnl may have different results. -ac_lib_var=`echo $1['_']$2 | sed 'y%./+-%__p_%'` -AC_CACHE_VAL(ac_cv_lib_$ac_lib_var, -[ac_save_LIBS="$LIBS" - -# first try with base library, without auxiliary library -LIBS="-l$1 $LIBS" -AC_TRY_LINK(dnl -ifelse([$2], [main], , dnl Avoid conflicting decl of main. -[/* Override any gcc2 internal prototype to avoid an error. */ -] -[/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char $2(); -]), - [$2()], - eval "ac_cv_lib_$ac_lib_var=\"$1\"", - eval "ac_cv_lib_$ac_lib_var=no") - -# if OK, set to no auxiliary library, else try auxiliary library -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = no"; then - LIBS="-l$1 $5 $LIBS" - AC_TRY_LINK(dnl - ifelse([$2], [main], , dnl Avoid conflicting decl of main. - [/* Override any gcc2 internal prototype to avoid an error. */ - ] - [/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ - char $2(); - ]), - [$2()], - eval "ac_cv_lib_$ac_lib_var=\"$1 $5\"", - eval "ac_cv_lib_$ac_lib_var=no") -fi - -LIBS="$ac_save_LIBS" -])dnl -ac_tmp="`eval echo '$''{ac_cv_lib_'$ac_lib_var'}'`" -if test "${ac_tmp}" != no; then - AC_MSG_RESULT(-l$ac_tmp) - ifelse([$3], , -[ - ac_tr_lib=HAVE_LIB`echo $1 | sed -e 's/[[^a-zA-Z0-9_]]/_/g' \ - -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'` - - AC_DEFINE_UNQUOTED($ac_tr_lib) - LIBS="-l$ac_tmp $LIBS" -], [$3]) -else - AC_MSG_RESULT(no) -ifelse([$4], , , [$4 -])dnl -fi - -]) diff --git a/contrib/amd/m4/macros/check_map_funcs.m4 b/contrib/amd/m4/macros/check_map_funcs.m4 deleted file mode 100644 index 2723d0e..0000000 --- a/contrib/amd/m4/macros/check_map_funcs.m4 +++ /dev/null @@ -1,47 +0,0 @@ -dnl ###################################################################### -dnl check if a map exists (if some library function exists). -dnl Usage: AC_CHECK_MAP_FUNCS(..., , []) -dnl Check if any of the functions exist. If any exist, then -dnl define HAVE_MAP_. If exits, then defined -dnl HAVE_MAP_ instead... -AC_DEFUN(AMU_CHECK_MAP_FUNCS, -[ -# find what name to give to the map -if test -n "$3" -then - ac_map_name=$3 -else - ac_map_name=$2 -fi -# store variable name of map -ac_upcase_map_name=`echo $2 | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` -ac_safe=HAVE_MAP_$ac_upcase_map_name -# check for cache and set it if needed -AMU_CACHE_CHECK_DYNAMIC(for $ac_map_name maps, -ac_cv_map_$ac_map_name, -[ -# define to "no" by default -eval "ac_cv_map_$ac_map_name=no" -# and look to see if it was found -AC_CHECK_FUNCS($1, -[ - eval "ac_cv_map_$ac_map_name=yes" - break -])]) -# check if need to define variable -if test "`eval echo '$''{ac_cv_map_'$ac_map_name'}'`" = yes -then - AC_DEFINE_UNQUOTED($ac_safe) -# append info_.o object to AMD_INFO_OBJS for automatic compilation -# if first time we add something to this list, then also tell autoconf -# to replace instances of it in Makefiles. - if test -z "$AMD_INFO_OBJS" - then - AMD_INFO_OBJS="info_${ac_map_name}.o" - AC_SUBST(AMD_INFO_OBJS) - else - AMD_INFO_OBJS="$AMD_INFO_OBJS info_${ac_map_name}.o" - fi -fi -]) -dnl ====================================================================== diff --git a/contrib/amd/m4/macros/check_mnt2_cdfs_opt.m4 b/contrib/amd/m4/macros/check_mnt2_cdfs_opt.m4 deleted file mode 100644 index b85c8cbf..0000000 --- a/contrib/amd/m4/macros/check_mnt2_cdfs_opt.m4 +++ /dev/null @@ -1,92 +0,0 @@ -dnl ###################################################################### -dnl Find CDFS-specific mount(2) options (hex numbers) -dnl Usage: AMU_CHECK_MNT2_CDFS_OPT() -dnl Check if there is an entry for MS_ or M_ in sys/mntent.h or -dnl mntent.h, then define MNT2_CDFS_OPT_ to the hex number. -AC_DEFUN(AMU_CHECK_MNT2_CDFS_OPT, -[ -# what name to give to the fs -ac_fs_name=$1 -# store variable name of fs -ac_upcase_fs_name=`echo $ac_fs_name | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` -ac_safe=MNT2_CDFS_OPT_$ac_upcase_fs_name -# check for cache and set it if needed -AMU_CACHE_CHECK_DYNAMIC(for CDFS-specific mount(2) option $ac_fs_name, -ac_cv_mnt2_cdfs_opt_$ac_fs_name, -[ -# undefine by default -eval "ac_cv_mnt2_cdfs_opt_$ac_fs_name=notfound" -value=notfound - -# first, try MS_* (most systems). Must be the first test! -if test "$value" = notfound -then -AMU_EXPAND_CPP_HEX( -AMU_MOUNT_HEADERS -, MS_$ac_upcase_fs_name) -fi - -# if failed, try MNT_* (bsd44 systems) -if test "$value" = notfound -then -AMU_EXPAND_CPP_HEX( -AMU_MOUNT_HEADERS -, MNT_$ac_upcase_fs_name) -fi - -# if failed, try MS_* as an integer (linux systems) -if test "$value" = notfound -then -AMU_EXPAND_CPP_INT( -AMU_MOUNT_HEADERS -, MS_$ac_upcase_fs_name) -fi - -# If failed try M_* (must be last test since svr4 systems define M_DATA etc. -# in -# This test was off for now, because of the conflicts with other systems. -# but I turned it back on by faking the inclusion of already. -if test "$value" = notfound -then -AMU_EXPAND_CPP_HEX( -#ifndef _sys_stream_h -# define _sys_stream_h -#endif /* not _sys_stream_h */ -#ifndef _SYS_STREAM_H -# define _SYS_STREAM_H -#endif /* not _SYS_STREAM_H */ -AMU_MOUNT_HEADERS -, M_$ac_upcase_fs_name) -fi - -# if failed, try ISOFSMNT_* as a hex (bsdi4 systems) -if test "$value" = notfound -then -AMU_EXPAND_CPP_HEX( -AMU_MOUNT_HEADERS -, ISOFSMNT_$ac_upcase_fs_name) -fi - -# set cache variable to value -eval "ac_cv_mnt2_cdfs_opt_$ac_fs_name=$value" -]) -# outside cache check, if ok, define macro -ac_tmp=`eval echo '$''{ac_cv_mnt2_cdfs_opt_'$ac_fs_name'}'` -if test "${ac_tmp}" != notfound -then - AC_DEFINE_UNQUOTED($ac_safe, $ac_tmp) -fi -]) -dnl ====================================================================== - -dnl ###################################################################### -dnl run AMU_CHECK_MNT2_CDFS_OPT on each argument given -dnl Usage: AMU_CHECK_MNT2_CDFS_OPTS(arg arg arg ...) -AC_DEFUN(AMU_CHECK_MNT2_CDFS_OPTS, -[ -for ac_tmp_arg in $1 -do -AMU_CHECK_MNT2_CDFS_OPT($ac_tmp_arg) -done -]) -dnl ====================================================================== diff --git a/contrib/amd/m4/macros/check_mnt2_gen_opt.m4 b/contrib/amd/m4/macros/check_mnt2_gen_opt.m4 deleted file mode 100644 index 68d4874..0000000 --- a/contrib/amd/m4/macros/check_mnt2_gen_opt.m4 +++ /dev/null @@ -1,85 +0,0 @@ -dnl ###################################################################### -dnl Find generic mount(2) options (hex numbers) -dnl Usage: AMU_CHECK_MNT2_GEN_OPT() -dnl Check if there is an entry for MS_, MNT_, or M_ -dnl (in that order) in mntent.h, sys/mntent.h, or mount.h... -dnl then define MNT2_GEN_OPT_ to the hex number. -AC_DEFUN(AMU_CHECK_MNT2_GEN_OPT, -[ -# what name to give to the fs -ac_fs_name=$1 -# store variable name of fs -ac_upcase_fs_name=`echo $ac_fs_name | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` -ac_safe=MNT2_GEN_OPT_$ac_upcase_fs_name -# check for cache and set it if needed -AMU_CACHE_CHECK_DYNAMIC(for generic mount(2) option $ac_fs_name, -ac_cv_mnt2_gen_opt_$ac_fs_name, -[ -# undefine by default -eval "ac_cv_mnt2_gen_opt_$ac_fs_name=notfound" -value=notfound - -# first, try MS_* (most systems). Must be the first test! -if test "$value" = notfound -then -AMU_EXPAND_CPP_HEX( -AMU_MOUNT_HEADERS -, MS_$ac_upcase_fs_name) -fi - -# if failed, try MNT_* (bsd44 systems) -if test "$value" = notfound -then -AMU_EXPAND_CPP_HEX( -AMU_MOUNT_HEADERS -, MNT_$ac_upcase_fs_name) -fi - -# if failed, try MS_* as an integer (linux systems) -if test "$value" = notfound -then -AMU_EXPAND_CPP_INT( -AMU_MOUNT_HEADERS -, MS_$ac_upcase_fs_name) -fi - -# If failed try M_* (must be last test since svr4 systems define M_DATA etc. -# in -# This test was off for now, because of the conflicts with other systems. -# but I turned it back on by faking the inclusion of already. -if test "$value" = notfound -then -AMU_EXPAND_CPP_HEX( -#ifndef _sys_stream_h -# define _sys_stream_h -#endif /* not _sys_stream_h */ -#ifndef _SYS_STREAM_H -# define _SYS_STREAM_H -#endif /* not _SYS_STREAM_H */ -AMU_MOUNT_HEADERS -, M_$ac_upcase_fs_name) -fi - -# set cache variable to value -eval "ac_cv_mnt2_gen_opt_$ac_fs_name=$value" -]) -# outside cache check, if ok, define macro -ac_tmp=`eval echo '$''{ac_cv_mnt2_gen_opt_'$ac_fs_name'}'` -if test "${ac_tmp}" != notfound -then - AC_DEFINE_UNQUOTED($ac_safe, $ac_tmp) -fi -]) -dnl ====================================================================== - -dnl ###################################################################### -dnl run AMU_CHECK_MNT2_GEN_OPT on each argument given -dnl Usage: AMU_CHECK_MNT2_GEN_OPTS(arg arg arg ...) -AC_DEFUN(AMU_CHECK_MNT2_GEN_OPTS, -[ -for ac_tmp_arg in $1 -do -AMU_CHECK_MNT2_GEN_OPT($ac_tmp_arg) -done -]) -dnl ====================================================================== diff --git a/contrib/amd/m4/macros/check_mnt2_nfs_opt.m4 b/contrib/amd/m4/macros/check_mnt2_nfs_opt.m4 deleted file mode 100644 index 4e69eaf..0000000 --- a/contrib/amd/m4/macros/check_mnt2_nfs_opt.m4 +++ /dev/null @@ -1,59 +0,0 @@ -dnl ###################################################################### -dnl Find NFS-specific mount(2) options (hex numbers) -dnl Usage: AMU_CHECK_MNT2_NFS_OPT() -dnl Check if there is an entry for NFSMNT_ in sys/mntent.h or -dnl mntent.h, then define MNT2_NFS_OPT_ to the hex number. -AC_DEFUN(AMU_CHECK_MNT2_NFS_OPT, -[ -# what name to give to the fs -ac_fs_name=$1 -# store variable name of fs -ac_upcase_fs_name=`echo $ac_fs_name | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` -ac_safe=MNT2_NFS_OPT_$ac_upcase_fs_name -# check for cache and set it if needed -AMU_CACHE_CHECK_DYNAMIC(for NFS-specific mount(2) option $ac_fs_name, -ac_cv_mnt2_nfs_opt_$ac_fs_name, -[ -# undefine by default -eval "ac_cv_mnt2_nfs_opt_$ac_fs_name=notfound" -value=notfound - -# first try NFSMNT_* (most systems) -if test "$value" = notfound -then -AMU_EXPAND_CPP_HEX( -AMU_MOUNT_HEADERS -, NFSMNT_$ac_upcase_fs_name) -fi - -# next try NFS_MOUNT_* (linux) -if test "$value" = notfound -then -AMU_EXPAND_CPP_HEX( -AMU_MOUNT_HEADERS -, NFS_MOUNT_$ac_upcase_fs_name) -fi - -# set cache variable to value -eval "ac_cv_mnt2_nfs_opt_$ac_fs_name=$value" -]) -# outside cache check, if ok, define macro -ac_tmp=`eval echo '$''{ac_cv_mnt2_nfs_opt_'$ac_fs_name'}'` -if test "${ac_tmp}" != notfound -then - AC_DEFINE_UNQUOTED($ac_safe, $ac_tmp) -fi -]) -dnl ====================================================================== - -dnl ###################################################################### -dnl run AMU_CHECK_MNT2_NFS_OPT on each argument given -dnl Usage: AMU_CHECK_MNT2_NFS_OPTS(arg arg arg ...) -AC_DEFUN(AMU_CHECK_MNT2_NFS_OPTS, -[ -for ac_tmp_arg in $1 -do -AMU_CHECK_MNT2_NFS_OPT($ac_tmp_arg) -done -]) -dnl ====================================================================== diff --git a/contrib/amd/m4/macros/check_mnttab_file_name.m4 b/contrib/amd/m4/macros/check_mnttab_file_name.m4 deleted file mode 100644 index 6ad11d2..0000000 --- a/contrib/amd/m4/macros/check_mnttab_file_name.m4 +++ /dev/null @@ -1,57 +0,0 @@ -dnl ###################################################################### -dnl Find name of mount table file, and define it as MNTTAB_FILE_NAME -dnl -dnl Solaris defines MNTTAB as /etc/mnttab, the file where /sbin/mount -dnl stores its cache of mounted filesystems. But under SunOS, the same -dnl macro MNTTAB, is defined as the _source_ of filesystems to mount, and -dnl is set to /etc/fstab. That is why I have to first check out -dnl if MOUNTED exists, and if not, check for the MNTTAB macro. -dnl -AC_DEFUN(AMU_CHECK_MNTTAB_FILE_NAME, -[ -AC_CACHE_CHECK(for name of mount table file name, -ac_cv_mnttab_file_name, -[ -# expand cpp value for MNTTAB -AMU_EXPAND_CPP_STRING( -AMU_MOUNT_HEADERS( -[ -/* see M4 comment at the top of the definition of this macro */ -#ifdef MOUNTED -# define _MNTTAB_FILE_NAME MOUNTED -# else /* not MOUNTED */ -# ifdef MNTTAB -# define _MNTTAB_FILE_NAME MNTTAB -# endif /* MNTTAB */ -#endif /* not MOUNTED */ -]), -_MNTTAB_FILE_NAME, -[ ac_cv_mnttab_file_name=$value -], -[ -ac_cv_mnttab_file_name=notfound -# check explicitly for /etc/mnttab -if test "$ac_cv_mnttab_file_name" = notfound -then - if test -f /etc/mnttab - then - ac_cv_mnttab_file_name="/etc/mnttab" - fi -fi -# check explicitly for /etc/mtab -if test "$ac_cv_mnttab_file_name" = notfound -then - if test -f /etc/mtab - then - ac_cv_mnttab_file_name="/etc/mtab" - fi -fi -]) -]) -# test value and create macro as needed -if test "$ac_cv_mnttab_file_name" != notfound -then - AC_DEFINE_UNQUOTED(MNTTAB_FILE_NAME, "$ac_cv_mnttab_file_name") -fi -]) -dnl ====================================================================== diff --git a/contrib/amd/m4/macros/check_mnttab_location.m4 b/contrib/amd/m4/macros/check_mnttab_location.m4 deleted file mode 100644 index 8bf4231..0000000 --- a/contrib/amd/m4/macros/check_mnttab_location.m4 +++ /dev/null @@ -1,26 +0,0 @@ -dnl ###################################################################### -dnl check if the mount table is kept in a file or in the kernel. -AC_DEFUN(AMU_CHECK_MNTTAB_LOCATION, -[ -AMU_CACHE_CHECK_DYNAMIC(where mount table is kept, -ac_cv_mnttab_location, -[ -# assume location is on file -ac_cv_mnttab_location=file -AC_CHECK_FUNCS(mntctl getmntinfo getmountent, -ac_cv_mnttab_location=kernel) -# Solaris 8 Beta Refresh and up use the mntfs pseudo filesystem to store the -# mount table in kernel (cf. mnttab(4): the MS_NOMNTTAB option in -# inhibits that a mount shows up there and thus can be used to -# check for the in-kernel mount table -if test "$ac_cv_mnt2_gen_opt_nomnttab" != notfound -then - ac_cv_mnttab_location=kernel -fi -]) -if test "$ac_cv_mnttab_location" = file -then - AC_DEFINE(MOUNT_TABLE_ON_FILE) -fi -]) -dnl ====================================================================== diff --git a/contrib/amd/m4/macros/check_mnttab_opt.m4 b/contrib/amd/m4/macros/check_mnttab_opt.m4 deleted file mode 100644 index 19e118e..0000000 --- a/contrib/amd/m4/macros/check_mnttab_opt.m4 +++ /dev/null @@ -1,52 +0,0 @@ -dnl ###################################################################### -dnl check the string type of the name of a filesystem mount table entry -dnl option. -dnl Usage: AMU_CHECK_MNTTAB_OPT() -dnl Check if there is an entry for MNTOPT_ in sys/mntent.h or mntent.h -dnl define MNTTAB_OPT_ to the string name (e.g., "ro"). -AC_DEFUN(AMU_CHECK_MNTTAB_OPT, -[ -# what name to give to the fs -ac_fs_name=$1 -# store variable name of fs -ac_upcase_fs_name=`echo $ac_fs_name | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` -ac_safe=MNTTAB_OPT_$ac_upcase_fs_name -# check for cache and set it if needed -AMU_CACHE_CHECK_DYNAMIC(for mount table option $ac_fs_name, -ac_cv_mnttab_opt_$ac_fs_name, -[ -# undefine by default -eval "ac_cv_mnttab_opt_$ac_fs_name=notfound" -# and look to see if it was found -AMU_EXPAND_CPP_STRING( -AMU_MOUNT_HEADERS -, MNTOPT_$ac_upcase_fs_name) -# set cache variable to value -if test "${value}" != notfound -then - eval "ac_cv_mnttab_opt_$ac_fs_name=\\\"$value\\\"" -else - eval "ac_cv_mnttab_opt_$ac_fs_name=$value" -fi -dnl DO NOT CHECK FOR MNT_* b/c bsd44 systems don't use /etc/mnttab, -]) -# outside cache check, if ok, define macro -ac_tmp=`eval echo '$''{ac_cv_mnttab_opt_'$ac_fs_name'}'` -if test "${ac_tmp}" != notfound -then - AC_DEFINE_UNQUOTED($ac_safe, $ac_tmp) -fi -]) -dnl ====================================================================== - -dnl ###################################################################### -dnl run AMU_CHECK_MNTTAB_OPT on each argument given -dnl Usage: AMU_CHECK_MNTTAB_OPTS(arg arg arg ...) -AC_DEFUN(AMU_CHECK_MNTTAB_OPTS, -[ -for ac_tmp_arg in $1 -do -AMU_CHECK_MNTTAB_OPT($ac_tmp_arg) -done -]) -dnl ====================================================================== diff --git a/contrib/amd/m4/macros/check_mnttab_style.m4 b/contrib/amd/m4/macros/check_mnttab_style.m4 deleted file mode 100644 index 2f5218a..0000000 --- a/contrib/amd/m4/macros/check_mnttab_style.m4 +++ /dev/null @@ -1,33 +0,0 @@ -dnl ###################################################################### -dnl check style of accessing the mount table file -AC_DEFUN(AMU_CHECK_MNTTAB_STYLE, -[ -AC_CACHE_CHECK(mount table style, -ac_cv_style_mnttab, -[ -# select the correct style for mount table manipulation functions -case "${host_os_name}" in - aix* ) - ac_cv_style_mnttab=aix ;; - bsd* | bsdi* | freebsd* | netbsd* | openbsd* | darwin* | rhapsody* ) - ac_cv_style_mnttab=bsd ;; - isc3* ) - ac_cv_style_mnttab=isc3 ;; - mach3* ) - ac_cv_style_mnttab=mach3 ;; - osf* ) - ac_cv_style_mnttab=osf ;; - svr4* | sysv4* | solaris2* | sunos5* | aoi* ) - ac_cv_style_mnttab=svr4 ;; - ultrix* ) - ac_cv_style_mnttab=ultrix ;; - * ) - ac_cv_style_mnttab=file ;; -esac -]) -am_utils_link_files=${am_utils_link_files}libamu/mtabutil.c:conf/mtab/mtab_${ac_cv_style_mnttab}.c" " - -# append mtab utilities object to LIBOBJS for automatic compilation -AC_LIBOBJ(mtabutil) -]) -dnl ====================================================================== diff --git a/contrib/amd/m4/macros/check_mnttab_type.m4 b/contrib/amd/m4/macros/check_mnttab_type.m4 deleted file mode 100644 index 98d6b55..0000000 --- a/contrib/amd/m4/macros/check_mnttab_type.m4 +++ /dev/null @@ -1,143 +0,0 @@ -dnl ###################################################################### -dnl check the string type of the name of a filesystem mount table entry. -dnl Usage: AC_CHECK_MNTTAB_TYPE(, [fssymbol]) -dnl Check if there is an entry for MNTTYPE_ in sys/mntent.h and mntent.h -dnl define MNTTAB_TYPE_ to the string name (e.g., "nfs"). If -dnl exist, then define MNTTAB_TYPE_ instead. If is -dnl defined, then can be a list of fs strings to look for. -dnl If no symbols have been defined, but the filesystem has been found -dnl earlier, then set the mount-table type to "" anyway... -AC_DEFUN(AMU_CHECK_MNTTAB_TYPE, -[ -# find what name to give to the fs -if test -n "$2" -then - ac_fs_name=$2 -else - ac_fs_name=$1 -fi -# store variable name of fs -ac_upcase_fs_name=`echo $ac_fs_name | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` -ac_safe=MNTTAB_TYPE_$ac_upcase_fs_name -# check for cache and set it if needed -AMU_CACHE_CHECK_DYNAMIC(for mnttab name for $ac_fs_name filesystem, -ac_cv_mnttab_type_$ac_fs_name, -[ -# undefine by default -eval "ac_cv_mnttab_type_$ac_fs_name=notfound" -# and look to see if it was found -for ac_fs_tmp in $1 -do - if test "$ac_fs_tmp" = "nfs3" -a "$ac_cv_fs_nfs3" = "yes" -a "$ac_cv_header_linux_nfs_h" = "yes" - then - eval "ac_cv_mnttab_type_$ac_fs_name=\\\"$ac_cv_mnttab_type_nfs\\\"" - break - fi - - ac_upcase_fs_symbol=`echo $ac_fs_tmp | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' | tr -d '.'` - - # first look for MNTTYPE_* - AC_EGREP_CPP(yes, - AMU_MOUNT_HEADERS( - [ -#ifdef MNTTYPE_$ac_upcase_fs_symbol - yes -#endif /* MNTTYPE_$ac_upcase_fs_symbol */ - ]), - [ eval "ac_cv_mnttab_type_$ac_fs_name=\\\"$ac_fs_tmp\\\"" - ]) - # check if need to terminate "for" loop - if test "`eval echo '$''{ac_cv_mnttab_type_'$ac_fs_name'}'`" != notfound - then - break - fi - - # look for a loadable filesystem module (linux) - if test -f /lib/modules/$host_os_version/fs/$ac_fs_tmp.o - then - eval "ac_cv_mnttab_type_$ac_fs_name=\\\"$ac_fs_tmp\\\"" - break - fi - - # look for a loadable filesystem module (linux 2.4+) - if test -f /lib/modules/$host_os_version/kernel/fs/$ac_fs_tmp/$ac_fs_tmp.o - then - eval "ac_cv_mnttab_type_$ac_fs_name=\\\"$ac_fs_tmp\\\"" - break - fi - - # look for a loadable filesystem module (linux redhat-5.1) - if test -f /lib/modules/preferred/fs/$ac_fs_tmp.o - then - eval "ac_cv_mnttab_type_$ac_fs_name=\\\"$ac_fs_tmp\\\"" - break - fi - - # next look for statically compiled filesystem (linux) - if egrep "[[^a-zA-Z0-9_]]$ac_fs_tmp$" /proc/filesystems >/dev/null 2>&1 - then - eval "ac_cv_mnttab_type_$ac_fs_name=\\\"$ac_fs_tmp\\\"" - break - fi - - # then try to run a program that derefences a static array (bsd44) - AMU_EXPAND_RUN_STRING( - AMU_MOUNT_HEADERS( - [ -#ifndef INITMOUNTNAMES -# error INITMOUNTNAMES not defined -#endif /* not INITMOUNTNAMES */ - ]), - [ - char const *namelist[] = INITMOUNTNAMES; - if (argc > 1) - printf("\"%s\"", namelist[MOUNT_$ac_upcase_fs_symbol]); - ], [ eval "ac_cv_mnttab_type_$ac_fs_name=\\\"$value\\\"" - ]) - # check if need to terminate "for" loop - if test "`eval echo '$''{ac_cv_mnttab_type_'$ac_fs_name'}'`" != notfound - then - break - fi - - # finally run a test program for bsdi3 - AC_TRY_RUN( - [ -#include -#include -main() -{ - int i; - struct vfsconf vf; - i = getvfsbyname("$ac_fs_tmp", &vf); - if (i < 0) - exit(1); - else - exit(0); -} - ], [eval "ac_cv_mnttab_type_$ac_fs_name=\\\"$ac_fs_tmp\\\"" - break - ] - ) - -done - -# check if not defined, yet the filesystem is defined -if test "`eval echo '$''{ac_cv_mnttab_type_'$ac_fs_name'}'`" = notfound -then -# this should test if $ac_cv_fs_ is "yes" - if test "`eval echo '$''{ac_cv_fs_'$ac_fs_name'}'`" = yes || - test "`eval echo '$''{ac_cv_fs_header_'$ac_fs_name'}'`" = yes - then - eval "ac_cv_mnttab_type_$ac_fs_name=\\\"$ac_fs_name\\\"" - fi -fi -]) -# check if need to define variable -ac_tmp=`eval echo '$''{ac_cv_mnttab_type_'$ac_fs_name'}'` -if test "$ac_tmp" != notfound -then - AC_DEFINE_UNQUOTED($ac_safe, $ac_tmp) -fi -]) -dnl ====================================================================== diff --git a/contrib/amd/m4/macros/check_mount_style.m4 b/contrib/amd/m4/macros/check_mount_style.m4 deleted file mode 100644 index f4cc14e..0000000 --- a/contrib/amd/m4/macros/check_mount_style.m4 +++ /dev/null @@ -1,42 +0,0 @@ -dnl ###################################################################### -dnl check style of mounting filesystems -AC_DEFUN(AMU_CHECK_MOUNT_STYLE, -[ -AC_CACHE_CHECK(style of mounting filesystems, -ac_cv_style_mount, -[ -# select the correct style for mounting filesystems -case "${host_os_name}" in - solaris1* | sunos[[34]]* | bsdi[[12]]* ) - ac_cv_style_mount=default ;; - hpux[[6-9]]* | hpux10* ) - ac_cv_style_mount=hpux ;; - svr4* | sysv4* | solaris* | sunos* | aoi* | hpux* ) - ac_cv_style_mount=svr4 ;; - bsdi* ) - ac_cv_style_mount=bsdi3 ;; - aix* ) - ac_cv_style_mount=aix ;; - irix5* ) - ac_cv_style_mount=irix5 ;; - irix* ) - ac_cv_style_mount=irix6 ;; - isc3* ) - ac_cv_style_mount=isc3 ;; - linux* ) - ac_cv_style_mount=linux ;; - mach3* ) - ac_cv_style_mount=mach3 ;; - stellix* ) - ac_cv_style_mount=stellix ;; - * ) # no style needed. Use default filesystem calls ala BSD - ac_cv_style_mount=default ;; -esac -]) -am_utils_mount_style_file="mountutil.c" -am_utils_link_files=${am_utils_link_files}libamu/${am_utils_mount_style_file}:conf/mount/mount_${ac_cv_style_mount}.c" " - -# append mount utilities object to LIBOBJS for automatic compilation -AC_LIBOBJ(mountutil) -]) -dnl ====================================================================== diff --git a/contrib/amd/m4/macros/check_mount_trap.m4 b/contrib/amd/m4/macros/check_mount_trap.m4 deleted file mode 100644 index ffac8b8..0000000 --- a/contrib/amd/m4/macros/check_mount_trap.m4 +++ /dev/null @@ -1,47 +0,0 @@ -dnl ###################################################################### -dnl check the mount system call trap needed to mount(2) a filesystem -AC_DEFUN(AMU_CHECK_MOUNT_TRAP, -[ -AC_CACHE_CHECK(mount trap system-call style, -ac_cv_mount_trap, -[ -# select the correct style to mount(2) a filesystem -case "${host_os_name}" in - solaris1* | sunos[[34]]* ) - ac_cv_mount_trap=default ;; - hpux[[6-9]]* | hpux10* ) - ac_cv_mount_trap=hpux ;; - svr4* | sysv4* | solaris* | sunos* | aoi* | hpux* ) - ac_cv_mount_trap=svr4 ;; - news4* | riscix* ) - ac_cv_mount_trap=news4 ;; - linux* ) - ac_cv_mount_trap=linux ;; - irix* ) - ac_cv_mount_trap=irix ;; - aux* ) - ac_cv_mount_trap=aux ;; - hcx* ) - ac_cv_mount_trap=hcx ;; - rtu6* ) - ac_cv_mount_trap=rtu6 ;; - dgux* ) - ac_cv_mount_trap=dgux ;; - aix* ) - ac_cv_mount_trap=aix3 ;; - mach2* | mach3* ) - ac_cv_mount_trap=mach3 ;; - ultrix* ) - ac_cv_mount_trap=ultrix ;; - isc3* ) - ac_cv_mount_trap=isc3 ;; - stellix* ) - ac_cv_mount_trap=stellix ;; - * ) - ac_cv_mount_trap=default ;; -esac -]) -am_utils_mount_trap=$srcdir"/conf/trap/trap_"$ac_cv_mount_trap".h" -AC_SUBST_FILE(am_utils_mount_trap) -]) -dnl ====================================================================== diff --git a/contrib/amd/m4/macros/check_mount_type.m4 b/contrib/amd/m4/macros/check_mount_type.m4 deleted file mode 100644 index 55aad06..0000000 --- a/contrib/amd/m4/macros/check_mount_type.m4 +++ /dev/null @@ -1,164 +0,0 @@ -dnl ###################################################################### -dnl check the string type of the name of a filesystem mount table entry. -dnl Usage: AC_CHECK_MOUNT_TYPE(, [fssymbol]) -dnl Check if there is an entry for MNTTYPE_ in sys/mntent.h and mntent.h -dnl define MOUNT_TYPE_ to the string name (e.g., "nfs"). If -dnl exist, then define MOUNT_TYPE_ instead. If is -dnl defined, then can be a list of fs strings to look for. -dnl If no symbols have been defined, but the filesystem has been found -dnl earlier, then set the mount-table type to "" anyway... -AC_DEFUN(AMU_CHECK_MOUNT_TYPE, -[ -# find what name to give to the fs -if test -n "$2" -then - ac_fs_name=$2 -else - ac_fs_name=$1 -fi -# prepare upper-case name of filesystem -ac_upcase_fs_name=`echo $ac_fs_name | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` -############################################################################## -# check for cache and set it if needed -AMU_CACHE_CHECK_DYNAMIC(for mount(2) type/name for $ac_fs_name filesystem, -ac_cv_mount_type_$ac_fs_name, -[ -# undefine by default -eval "ac_cv_mount_type_$ac_fs_name=notfound" -# and look to see if it was found -for ac_fs_tmp in $1 -do - - ac_upcase_fs_symbol=`echo $ac_fs_tmp | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' | tr -d '.'` - - # first look for MNTTYPE_ - AC_EGREP_CPP(yes, - AMU_MOUNT_HEADERS( - [ -#ifdef MNTTYPE_$ac_upcase_fs_symbol - yes -#endif /* MNTTYPE_$ac_upcase_fs_symbol */ - ]), [eval "ac_cv_mount_type_$ac_fs_name=MNTTYPE_$ac_upcase_fs_symbol"], - [eval "ac_cv_mount_type_$ac_fs_name=notfound"] ) - # check if need to terminate "for" loop - if test "`eval echo '$''{ac_cv_mount_type_'$ac_fs_name'}'`" != notfound - then - break - fi - - # next look for MOUNT_ - AC_EGREP_CPP(yes, - AMU_MOUNT_HEADERS( - [ -#ifdef MOUNT_$ac_upcase_fs_symbol - yes -#endif /* MOUNT_$ac_upcase_fs_symbol */ - ]), [eval "ac_cv_mount_type_$ac_fs_name=MOUNT_$ac_upcase_fs_symbol"], - [eval "ac_cv_mount_type_$ac_fs_name=notfound"] ) - # check if need to terminate "for" loop - if test "`eval echo '$''{ac_cv_mount_type_'$ac_fs_name'}'`" != notfound - then - break - fi - - # next look for MNT_ - AC_EGREP_CPP(yes, - AMU_MOUNT_HEADERS( - [ -#ifdef MNT_$ac_upcase_fs_symbol - yes -#endif /* MNT_$ac_upcase_fs_symbol */ - ]), [eval "ac_cv_mount_type_$ac_fs_name=MNT_$ac_upcase_fs_symbol"], - [eval "ac_cv_mount_type_$ac_fs_name=notfound"] ) - # check if need to terminate "for" loop - if test "`eval echo '$''{ac_cv_mount_type_'$ac_fs_name'}'`" != notfound - then - break - fi - - # next look for GT_ (ultrix) - AC_EGREP_CPP(yes, - AMU_MOUNT_HEADERS( - [ -#ifdef GT_$ac_upcase_fs_symbol - yes -#endif /* GT_$ac_upcase_fs_symbol */ - ]), [eval "ac_cv_mount_type_$ac_fs_name=GT_$ac_upcase_fs_symbol"], - [eval "ac_cv_mount_type_$ac_fs_name=notfound"] ) - # check if need to terminate "for" loop - if test "`eval echo '$''{ac_cv_mount_type_'$ac_fs_name'}'`" != notfound - then - break - fi - - # look for a loadable filesystem module (linux) - if test -f /lib/modules/$host_os_version/fs/$ac_fs_tmp.o - then - eval "ac_cv_mount_type_$ac_fs_name=\\\"$ac_fs_tmp\\\"" - break - fi - - # look for a loadable filesystem module (linux 2.4+) - if test -f /lib/modules/$host_os_version/kernel/fs/$ac_fs_tmp/$ac_fs_tmp.o - then - eval "ac_cv_mount_type_$ac_fs_name=\\\"$ac_fs_tmp\\\"" - break - fi - - # look for a loadable filesystem module (linux redhat-5.1) - if test -f /lib/modules/preferred/fs/$ac_fs_tmp.o - then - eval "ac_cv_mount_type_$ac_fs_name=\\\"$ac_fs_tmp\\\"" - break - fi - - # in addition look for statically compiled filesystem (linux) - if egrep "[[^a-zA-Z0-9_]]$ac_fs_tmp$" /proc/filesystems >/dev/null 2>&1 - then - eval "ac_cv_mount_type_$ac_fs_name=\\\"$ac_fs_tmp\\\"" - break - fi - - # run a test program for bsdi3 - AC_TRY_RUN( - [ -#include -#include -main() -{ - int i; - struct vfsconf vf; - i = getvfsbyname("$ac_fs_tmp", &vf); - if (i < 0) - exit(1); - else - exit(0); -} - ], [eval "ac_cv_mount_type_$ac_fs_name=\\\"$ac_fs_tmp\\\"" - break - ] - ) - -done -# check if not defined, yet the filesystem is defined -if test "`eval echo '$''{ac_cv_mount_type_'$ac_fs_name'}'`" = notfound -then -# this should test if $ac_cv_fs_ is "yes" - if test "`eval echo '$''{ac_cv_fs_'$ac_fs_name'}'`" = yes || - test "`eval echo '$''{ac_cv_fs_header_'$ac_fs_name'}'`" = yes - then - eval "ac_cv_mount_type_$ac_fs_name=MNTTYPE_$ac_upcase_fs_name" - fi -fi -]) -# end of cache check for ac_cv_mount_type_$ac_fs_name -############################################################################## -# check if need to define variable -if test "`eval echo '$''{ac_cv_mount_type_'$ac_fs_name'}'`" != notfound -then - ac_safe=MOUNT_TYPE_$ac_upcase_fs_name - ac_tmp=`eval echo '$''{ac_cv_mount_type_'$ac_fs_name'}'` - AC_DEFINE_UNQUOTED($ac_safe, $ac_tmp) -fi -]) -dnl ====================================================================== diff --git a/contrib/amd/m4/macros/check_mtype_printf_type.m4 b/contrib/amd/m4/macros/check_mtype_printf_type.m4 deleted file mode 100644 index 83b4f42..0000000 --- a/contrib/amd/m4/macros/check_mtype_printf_type.m4 +++ /dev/null @@ -1,22 +0,0 @@ -dnl ###################################################################### -dnl check the correct printf-style type for the mount type in the mount() -dnl system call. -dnl If you change this one, you must also fix the check_mtype_type.m4. -AC_DEFUN(AMU_CHECK_MTYPE_PRINTF_TYPE, -[ -AC_CACHE_CHECK(printf string to print type field of mount() call, -ac_cv_mtype_printf_type, -[ -# select the correct printf type -case "${host_os_name}" in - osf* | freebsd2* | bsdi2* | aix* | ultrix* ) - ac_cv_mtype_printf_type="%d" ;; - irix3 | isc3 ) - ac_cv_mtype_printf_type="0x%x" ;; - * ) - ac_cv_mtype_printf_type="%s" ;; -esac -]) -AC_DEFINE_UNQUOTED(MTYPE_PRINTF_TYPE, "$ac_cv_mtype_printf_type") -]) -dnl ====================================================================== diff --git a/contrib/amd/m4/macros/check_mtype_type.m4 b/contrib/amd/m4/macros/check_mtype_type.m4 deleted file mode 100644 index 7a678e5..0000000 --- a/contrib/amd/m4/macros/check_mtype_type.m4 +++ /dev/null @@ -1,19 +0,0 @@ -dnl ###################################################################### -dnl check the correct type for the mount type in the mount() system call -dnl If you change this one, you must also fix the check_mtype_printf_type.m4. -AC_DEFUN(AMU_CHECK_MTYPE_TYPE, -[ -AC_CACHE_CHECK(type of mount type field in mount() call, -ac_cv_mtype_type, -[ -# select the correct type -case "${host_os_name}" in - osf* | freebsd2* | bsdi2* | aix* | ultrix* ) - ac_cv_mtype_type=int ;; - * ) - ac_cv_mtype_type="char *" ;; -esac -]) -AC_DEFINE_UNQUOTED(MTYPE_TYPE, $ac_cv_mtype_type) -]) -dnl ====================================================================== diff --git a/contrib/amd/m4/macros/check_network_transport_type.m4 b/contrib/amd/m4/macros/check_network_transport_type.m4 deleted file mode 100644 index 5689981..0000000 --- a/contrib/amd/m4/macros/check_network_transport_type.m4 +++ /dev/null @@ -1,27 +0,0 @@ -dnl ###################################################################### -dnl check the correct network transport type to use -AC_DEFUN(AMU_CHECK_NETWORK_TRANSPORT_TYPE, -[ -AC_CACHE_CHECK(network transport type, -ac_cv_transport_type, -[ -# select the correct type -case "${host_os_name}" in - solaris1* | sunos[[34]]* | hpux[[6-9]]* | hpux10* ) - ac_cv_transport_type=sockets ;; - solaris* | sunos* | hpux* ) - ac_cv_transport_type=tli ;; - * ) - ac_cv_transport_type=sockets ;; -esac -]) -am_utils_link_files=${am_utils_link_files}libamu/transputil.c:conf/transp/transp_${ac_cv_transport_type}.c" " - -# append transport utilities object to LIBOBJS for automatic compilation -AC_LIBOBJ(transputil) -if test $ac_cv_transport_type = tli -then - AC_DEFINE(HAVE_TRANSPORT_TYPE_TLI) -fi -]) -dnl ====================================================================== diff --git a/contrib/amd/m4/macros/check_nfs_fh_dref.m4 b/contrib/amd/m4/macros/check_nfs_fh_dref.m4 deleted file mode 100644 index ee852ac..0000000 --- a/contrib/amd/m4/macros/check_nfs_fh_dref.m4 +++ /dev/null @@ -1,47 +0,0 @@ -dnl ###################################################################### -dnl check the correct way to dereference the address part of the nfs fhandle -AC_DEFUN(AMU_CHECK_NFS_FH_DREF, -[ -AC_CACHE_CHECK(nfs file-handle address dereferencing style, -ac_cv_nfs_fh_dref_style, -[ -# select the correct nfs address dereferencing style -case "${host_os}" in - hpux[[6-9]]* | hpux10* ) - ac_cv_nfs_fh_dref_style=hpux ;; - sunos3* ) - ac_cv_nfs_fh_dref_style=sunos3 ;; - sunos4* | solaris1* ) - ac_cv_nfs_fh_dref_style=sunos4 ;; - svr4* | sysv4* | solaris* | sunos* | hpux* ) - ac_cv_nfs_fh_dref_style=svr4 ;; - bsd44* | bsdi2* | freebsd2.[[01]]* ) - ac_cv_nfs_fh_dref_style=bsd44 ;; - # all new BSDs changed the type of the - # filehandle in nfs_args from nfsv2fh_t to u_char. - freebsd* | freebsdelf* | bsdi* | netbsd* | openbsd* | darwin* | rhapsody* ) - ac_cv_nfs_fh_dref_style=freebsd22 ;; - aix[[1-3]]* | aix4.[[01]]* ) - ac_cv_nfs_fh_dref_style=aix3 ;; - aix* ) - ac_cv_nfs_fh_dref_style=aix42 ;; - irix* ) - ac_cv_nfs_fh_dref_style=irix ;; - linux* ) - ac_cv_nfs_fh_dref_style=linux ;; - isc3 ) - ac_cv_nfs_fh_dref_style=isc3 ;; - osf[[1-3]]* ) - ac_cv_nfs_fh_dref_style=osf2 ;; - osf* ) - ac_cv_nfs_fh_dref_style=osf4 ;; - nextstep* ) - ac_cv_nfs_fh_dref_style=nextstep ;; - * ) - ac_cv_nfs_fh_dref_style=default ;; -esac -]) -am_utils_nfs_fh_dref=$srcdir"/conf/fh_dref/fh_dref_"$ac_cv_nfs_fh_dref_style".h" -AC_SUBST_FILE(am_utils_nfs_fh_dref) -]) -dnl ====================================================================== diff --git a/contrib/amd/m4/macros/check_nfs_hn_dref.m4 b/contrib/amd/m4/macros/check_nfs_hn_dref.m4 deleted file mode 100644 index ae35212..0000000 --- a/contrib/amd/m4/macros/check_nfs_hn_dref.m4 +++ /dev/null @@ -1,21 +0,0 @@ -dnl ###################################################################### -dnl check the correct way to dereference the hostname part of the nfs fhandle -AC_DEFUN(AMU_CHECK_NFS_HN_DREF, -[ -AC_CACHE_CHECK(nfs hostname dereferencing style, -ac_cv_nfs_hn_dref_style, -[ -# select the correct nfs address dereferencing style -case "${host_os_name}" in - linux* ) - ac_cv_nfs_hn_dref_style=linux ;; - isc3 ) - ac_cv_nfs_hn_dref_style=isc3 ;; - * ) - ac_cv_nfs_hn_dref_style=default ;; -esac -]) -am_utils_nfs_hn_dref=$srcdir"/conf/hn_dref/hn_dref_"$ac_cv_nfs_hn_dref_style".h" -AC_SUBST_FILE(am_utils_nfs_hn_dref) -]) -dnl ====================================================================== diff --git a/contrib/amd/m4/macros/check_nfs_prot_headers.m4 b/contrib/amd/m4/macros/check_nfs_prot_headers.m4 deleted file mode 100644 index 4c59e08..0000000 --- a/contrib/amd/m4/macros/check_nfs_prot_headers.m4 +++ /dev/null @@ -1,94 +0,0 @@ -dnl ###################################################################### -dnl check if system has NFS protocol headers -AC_DEFUN(AMU_CHECK_NFS_PROT_HEADERS, -[ -AC_CACHE_CHECK(location of NFS protocol header files, -ac_cv_nfs_prot_headers, -[ -# select the correct style for mounting filesystems -case "${host_os}" in - irix5* ) - ac_cv_nfs_prot_headers=irix5 ;; - irix* ) - ac_cv_nfs_prot_headers=irix6 ;; - sunos3* ) - ac_cv_nfs_prot_headers=sunos3 ;; - sunos4* | solaris1* ) - ac_cv_nfs_prot_headers=sunos4 ;; - sunos5.[[0-3]]* | solaris2.[[0-3]]* ) - ac_cv_nfs_prot_headers=sunos5_3 ;; - sunos5.4* | solaris2.4* ) - ac_cv_nfs_prot_headers=sunos5_4 ;; - sunos5.5* | solaris2.5* ) - ac_cv_nfs_prot_headers=sunos5_5 ;; - sunos5.6* | solaris2.6* ) - ac_cv_nfs_prot_headers=sunos5_6 ;; - sunos5.7* | solaris2.7* ) - ac_cv_nfs_prot_headers=sunos5_7 ;; - sunos* | solaris* ) - ac_cv_nfs_prot_headers=sunos5_8 ;; - bsdi2*) - ac_cv_nfs_prot_headers=bsdi2 ;; - bsdi* ) - ac_cv_nfs_prot_headers=bsdi3 ;; - freebsd2* ) - ac_cv_nfs_prot_headers=freebsd2 ;; - freebsd* | freebsdelf* ) - ac_cv_nfs_prot_headers=freebsd3 ;; - netbsd1.[[0-2]]* ) - ac_cv_nfs_prot_headers=netbsd ;; - netbsd1.3* ) - ac_cv_nfs_prot_headers=netbsd1_3 ;; - netbsd* | netbsdelf* ) - ac_cv_nfs_prot_headers=netbsd1_4 ;; - openbsd* ) - ac_cv_nfs_prot_headers=openbsd ;; - hpux[[6-9]]* | hpux10* ) - ac_cv_nfs_prot_headers=hpux ;; - hpux* ) - ac_cv_nfs_prot_headers=hpux11 ;; - aix[[1-3]]* ) - ac_cv_nfs_prot_headers=aix3 ;; - aix4.[[01]]* ) - ac_cv_nfs_prot_headers=aix4 ;; - aix4.2* ) - ac_cv_nfs_prot_headers=aix4_2 ;; - aix4.3* ) - ac_cv_nfs_prot_headers=aix4_3 ;; - aix* ) - ac_cv_nfs_prot_headers=aix5_1 ;; - osf[[1-3]]* ) - ac_cv_nfs_prot_headers=osf2 ;; - osf4* ) - ac_cv_nfs_prot_headers=osf4 ;; - osf* ) - ac_cv_nfs_prot_headers=osf5 ;; - svr4* ) - ac_cv_nfs_prot_headers=svr4 ;; - sysv4* ) # this is for NCR2 machines - ac_cv_nfs_prot_headers=ncr2 ;; - linux* ) - ac_cv_nfs_prot_headers=linux ;; - nextstep* ) - ac_cv_nfs_prot_headers=nextstep ;; - ultrix* ) - ac_cv_nfs_prot_headers=ultrix ;; - darwin* | rhapsody* ) - ac_cv_nfs_prot_headers=darwin ;; - * ) - ac_cv_nfs_prot_headers=default ;; -esac -]) - -# make sure correct header is linked in top build directory -am_utils_nfs_prot_file="amu_nfs_prot.h" -am_utils_link_files=${am_utils_link_files}${am_utils_nfs_prot_file}:conf/nfs_prot/nfs_prot_${ac_cv_nfs_prot_headers}.h" " - -# define the name of the header to be included for other M4 macros -AC_DEFINE_UNQUOTED(AMU_NFS_PROTOCOL_HEADER, "${srcdir}/conf/nfs_prot/nfs_prot_${ac_cv_nfs_prot_headers}.h") - -# set headers in a macro for Makefile.am files to use (for dependencies) -AMU_NFS_PROT_HEADER='${top_builddir}/'$am_utils_nfs_prot_file -AC_SUBST(AMU_NFS_PROT_HEADER) -]) -dnl ====================================================================== diff --git a/contrib/amd/m4/macros/check_nfs_sa_dref.m4 b/contrib/amd/m4/macros/check_nfs_sa_dref.m4 deleted file mode 100644 index 55ce734..0000000 --- a/contrib/amd/m4/macros/check_nfs_sa_dref.m4 +++ /dev/null @@ -1,33 +0,0 @@ -dnl ###################################################################### -dnl check the correct way to dereference the address part of the nfs fhandle -AC_DEFUN(AMU_CHECK_NFS_SA_DREF, -[ -AC_CACHE_CHECK(nfs address dereferencing style, -ac_cv_nfs_sa_dref_style, -[ -# select the correct nfs address dereferencing style -case "${host_os}" in - hpux[[6-9]]* | hpux10* | sunos[[34]]* | solaris1* ) - ac_cv_nfs_sa_dref_style=default ;; - svr4* | sysv4* | solaris* | sunos* | hpux* ) - ac_cv_nfs_sa_dref_style=svr4 ;; - 386bsd* | bsdi1* ) - ac_cv_nfs_sa_dref_style=386bsd ;; - bsd44* | bsdi* | freebsd* | netbsd* | openbsd* | darwin* | rhapsody* ) - ac_cv_nfs_sa_dref_style=bsd44 ;; - linux* ) - ac_cv_nfs_sa_dref_style=linux ;; - aix* ) - ac_cv_nfs_sa_dref_style=aix3 ;; - aoi* ) - ac_cv_nfs_sa_dref_style=aoi ;; - isc3 ) - ac_cv_nfs_sa_dref_style=isc3 ;; - * ) - ac_cv_nfs_sa_dref_style=default ;; -esac -]) -am_utils_nfs_sa_dref=$srcdir"/conf/sa_dref/sa_dref_"$ac_cv_nfs_sa_dref_style".h" -AC_SUBST_FILE(am_utils_nfs_sa_dref) -]) -dnl ====================================================================== diff --git a/contrib/amd/m4/macros/check_nfs_socket_connection.m4 b/contrib/amd/m4/macros/check_nfs_socket_connection.m4 deleted file mode 100644 index 264afeb..0000000 --- a/contrib/amd/m4/macros/check_nfs_socket_connection.m4 +++ /dev/null @@ -1,28 +0,0 @@ -dnl ###################################################################### -dnl check if need to turn on, off, or leave alone the NFS "noconn" option -AC_DEFUN(AMU_CHECK_NFS_SOCKET_CONNECTION, -[ -AC_CACHE_CHECK(if to turn on/off noconn option, -ac_cv_nfs_socket_connection, -[ -# set default to no-change -ac_cv_nfs_socket_connection=none -# select the correct style -case "${host_os}" in - openbsd2.[[01]]* ) - ac_cv_nfs_socket_connection=noconn ;; - openbsd* | freebsd* | freebsdelf* ) - ac_cv_nfs_socket_connection=conn ;; -esac -]) -# set correct value -case "$ac_cv_nfs_socket_connection" in - noconn ) - AC_DEFINE(USE_UNCONNECTED_NFS_SOCKETS) - ;; - conn ) - AC_DEFINE(USE_CONNECTED_NFS_SOCKETS) - ;; -esac -]) -dnl ====================================================================== diff --git a/contrib/amd/m4/macros/check_os_libs.m4 b/contrib/amd/m4/macros/check_os_libs.m4 deleted file mode 100644 index 68e604b..0000000 --- a/contrib/amd/m4/macros/check_os_libs.m4 +++ /dev/null @@ -1,28 +0,0 @@ -dnl ###################################################################### -dnl set OS libraries specific to an OS: -dnl libnsl/libsocket are needed only on solaris and some svr4 systems. -dnl Using a typical macro has proven unsuccesful, because on some other -dnl systems such as irix, including libnsl and or libsocket actually breaks -dnl lots of code. So I am forced to use a special purpose macro that sets -dnl the libraries based on the OS. Sigh. -Erez. -AC_DEFUN(AMU_CHECK_OS_LIBS, -[ -AC_CACHE_CHECK(for additional OS libraries, -ac_cv_os_libs, -[ -# select the correct set of libraries to link with -case "${host_os_name}" in - svr4* | sysv4* | solaris2* | sunos5* | aoi* ) - ac_cv_os_libs="-lsocket -lnsl" ;; - * ) - ac_cv_os_libs=none ;; -esac -]) -# set list of libraries to link with -if test "$ac_cv_os_libs" != none -then - LIBS="$ac_cv_os_libs $LIBS" -fi - -]) -dnl ====================================================================== diff --git a/contrib/amd/m4/macros/check_restartable_signal_handler.m4 b/contrib/amd/m4/macros/check_restartable_signal_handler.m4 deleted file mode 100644 index be74ef1..0000000 --- a/contrib/amd/m4/macros/check_restartable_signal_handler.m4 +++ /dev/null @@ -1,22 +0,0 @@ -dnl ###################################################################### -dnl check if a system needs to restart its signal handlers -AC_DEFUN(AMU_CHECK_RESTARTABLE_SIGNAL_HANDLER, -[ -AC_CACHE_CHECK(if system needs to restart signal handlers, -ac_cv_restartable_signal_handler, -[ -# select the correct systems to restart signal handlers -case "${host_os_name}" in - svr3* | svr4* | sysv4* | solaris2* | sunos5* | aoi* | irix* ) - ac_cv_restartable_signal_handler=yes ;; - * ) - ac_cv_restartable_signal_handler=no ;; -esac -]) -# define REINSTALL_SIGNAL_HANDLER if need to -if test "$ac_cv_restartable_signal_handler" = yes -then - AC_DEFINE(REINSTALL_SIGNAL_HANDLER) -fi -]) -dnl ====================================================================== diff --git a/contrib/amd/m4/macros/check_umount_style.m4 b/contrib/amd/m4/macros/check_umount_style.m4 deleted file mode 100644 index a198117..0000000 --- a/contrib/amd/m4/macros/check_umount_style.m4 +++ /dev/null @@ -1,24 +0,0 @@ -dnl ###################################################################### -dnl check style of unmounting filesystems -AC_DEFUN(AMU_CHECK_UMOUNT_STYLE, -[ -AC_CACHE_CHECK(style of unmounting filesystems, -ac_cv_style_umount, -[ -# select the correct style for unmounting filesystems -case "${host_os_name}" in - bsd44* | bsdi* | freebsd* | netbsd* | openbsd* | darwin* | rhapsody* ) - ac_cv_style_umount=bsd44 ;; - osf* ) - ac_cv_style_umount=osf ;; - * ) - ac_cv_style_umount=default ;; -esac -]) -am_utils_umount_style_file="umount_fs.c" -am_utils_link_files=${am_utils_link_files}libamu/${am_utils_umount_style_file}:conf/umount/umount_${ac_cv_style_umount}.c" " - -# append un-mount utilities object to LIBOBJS for automatic compilation -AC_LIBOBJ(umount_fs) -]) -dnl ====================================================================== diff --git a/contrib/amd/m4/macros/check_unmount_args.m4 b/contrib/amd/m4/macros/check_unmount_args.m4 deleted file mode 100644 index 97f4e97..0000000 --- a/contrib/amd/m4/macros/check_unmount_args.m4 +++ /dev/null @@ -1,21 +0,0 @@ -dnl ###################################################################### -dnl check the unmount system call arguments needed for -AC_DEFUN(AMU_CHECK_UNMOUNT_ARGS, -[ -AC_CACHE_CHECK(unmount system-call arguments, -ac_cv_unmount_args, -[ -# select the correct style to mount(2) a filesystem -case "${host_os_name}" in - aix* ) - ac_cv_unmount_args="mnt->mnt_passno, 0" ;; - ultrix* ) - ac_cv_unmount_args="mnt->mnt_passno" ;; - * ) - ac_cv_unmount_args="mnt->mnt_dir" ;; -esac -]) -am_utils_unmount_args=$ac_cv_unmount_args -AC_SUBST(am_utils_unmount_args) -]) -dnl ====================================================================== diff --git a/contrib/amd/m4/macros/check_unmount_call.m4 b/contrib/amd/m4/macros/check_unmount_call.m4 deleted file mode 100644 index 67b2399..0000000 --- a/contrib/amd/m4/macros/check_unmount_call.m4 +++ /dev/null @@ -1,27 +0,0 @@ -dnl ###################################################################### -dnl check for the correct system call to unmount a filesystem. -AC_DEFUN(AMU_CHECK_UNMOUNT_CALL, -[ -dnl make sure this one is called before [AC_CHECK_UNMOUNT_ARGS] -AC_BEFORE([$0], [AC_CHECK_UNMOUNT_ARGS]) -AC_CACHE_CHECK(the system call to unmount a filesystem, -ac_cv_unmount_call, -[ -# check for various unmount a filesystem calls -if test "$ac_cv_func_uvmount" = yes ; then - ac_cv_unmount_call=uvmount -elif test "$ac_cv_func_unmount" = yes ; then - ac_cv_unmount_call=unmount -elif test "$ac_cv_func_umount" = yes ; then - ac_cv_unmount_call=umount -else - ac_cv_unmount_call=no -fi -]) -if test "$ac_cv_unmount_call" != no -then - am_utils_unmount_call=$ac_cv_unmount_call - AC_SUBST(am_utils_unmount_call) -fi -]) -dnl ====================================================================== diff --git a/contrib/amd/m4/macros/expand_cpp_hex.m4 b/contrib/amd/m4/macros/expand_cpp_hex.m4 deleted file mode 100644 index cd8b598..0000000 --- a/contrib/amd/m4/macros/expand_cpp_hex.m4 +++ /dev/null @@ -1,40 +0,0 @@ -dnl ###################################################################### -dnl Expand the value of a CPP macro into a printable hex number. -dnl Takes: header, macro, [action-if-found, [action-if-not-found]] -dnl It runs the header through CPP looking for a match between the macro -dnl and a string pattern, and if sucessful, it prints the string value out. -AC_DEFUN(AMU_EXPAND_CPP_HEX, -[ -# we are looking for a regexp of a string -AC_EGREP_CPP(0x, -[$1] -$2, -value="notfound" -AC_TRY_RUN( -[ -[$1] -main(argc) -int argc; -{ -#ifdef $2 -if (argc > 1) - printf("0x%x", $2); -exit(0); -#else -# error no such option $2 -#endif -exit(1); -}], value=`./conftest dummy 2>>config.log`, value="notfound", value="notfound") -, -value="notfound" -) -if test "$value" = notfound -then - : - $4 -else - : - $3 -fi -]) -dnl ====================================================================== diff --git a/contrib/amd/m4/macros/expand_cpp_int.m4 b/contrib/amd/m4/macros/expand_cpp_int.m4 deleted file mode 100644 index 7dff0ab..0000000 --- a/contrib/amd/m4/macros/expand_cpp_int.m4 +++ /dev/null @@ -1,42 +0,0 @@ -dnl ###################################################################### -dnl Expand the value of a CPP macro into a printable integer number. -dnl Takes: header, macro, [action-if-found, [action-if-not-found]] -dnl It runs the header through CPP looking for a match between the macro -dnl and a string pattern, and if sucessful, it prints the string value out. -AC_DEFUN(AMU_EXPAND_CPP_INT, -[ -# we are looking for a regexp of an integer (must not start with 0 --- those -# are octals). -AC_EGREP_CPP( -[[1-9]][[0-9]]*, -[$1] -$2, -value="notfound" -AC_TRY_RUN( -[ -[$1] -main(argc) -int argc; -{ -#ifdef $2 -if (argc > 1) - printf("%d", $2); -exit(0); -#else -# error no such option $2 -#endif -exit(1); -}], value=`./conftest dummy 2>>config.log`, value="notfound", value="notfound") -, -value="notfound" -) -if test "$value" = notfound -then - : - $4 -else - : - $3 -fi -]) -dnl ====================================================================== diff --git a/contrib/amd/m4/macros/expand_cpp_string.m4 b/contrib/amd/m4/macros/expand_cpp_string.m4 deleted file mode 100644 index c54bc07..0000000 --- a/contrib/amd/m4/macros/expand_cpp_string.m4 +++ /dev/null @@ -1,40 +0,0 @@ -dnl ###################################################################### -dnl Expand the value of a CPP macro into a printable string. -dnl Takes: header, macro, [action-if-found, [action-if-not-found]] -dnl It runs the header through CPP looking for a match between the macro -dnl and a string pattern, and if sucessful, it prints the string value out. -AC_DEFUN(AMU_EXPAND_CPP_STRING, -[ -# we are looking for a regexp of a string -AC_EGREP_CPP(\".*\", -[$1] -$2, -value="notfound" -AC_TRY_RUN( -[ -[$1] -main(argc) -int argc; -{ -#ifdef $2 -if (argc > 1) - printf("%s", $2); -exit(0); -#else -# error no such option $2 -#endif -exit(1); -}], value=`./conftest dummy 2>>config.log`, value="notfound", value="notfound") -, -value="notfound" -) -if test "$value" = notfound -then - : - $4 -else - : - $3 -fi -]) -dnl ====================================================================== diff --git a/contrib/amd/m4/macros/expand_run_string.m4 b/contrib/amd/m4/macros/expand_run_string.m4 deleted file mode 100644 index 02c531e..0000000 --- a/contrib/amd/m4/macros/expand_run_string.m4 +++ /dev/null @@ -1,25 +0,0 @@ -dnl ###################################################################### -dnl Run a program and print its output as a string -dnl Takes: (header, code-to-run, [action-if-found, [action-if-not-found]]) -AC_DEFUN(AMU_EXPAND_RUN_STRING, -[ -value="notfound" -AC_TRY_RUN( -[ -$1 -main(argc) -int argc; -{ -$2 -exit(0); -}], value=`./conftest dummy 2>>config.log`, value="notfound", value="notfound") -if test "$value" = notfound -then - : - $4 -else - : - $3 -fi -]) -dnl ====================================================================== diff --git a/contrib/amd/m4/macros/extern_optarg.m4 b/contrib/amd/m4/macros/extern_optarg.m4 deleted file mode 100644 index 14ac210..0000000 --- a/contrib/amd/m4/macros/extern_optarg.m4 +++ /dev/null @@ -1,36 +0,0 @@ -dnl ###################################################################### -dnl find if "extern char *optarg" exists in headers -AC_DEFUN(AMU_EXTERN_OPTARG, -[ -AC_CACHE_CHECK(if external definition for optarg[] exists, -ac_cv_extern_optarg, -[ -# try to compile program that uses the variable -AC_TRY_COMPILE( -[ -#ifdef HAVE_STDIO_H -# include -#endif /* HAVE_STDIO_H */ -#ifdef HAVE_UNISTD_H -# include -#endif /* HAVE_UNISTD_H */ -#ifdef HAVE_STDLIB_H -# include -#endif /* HAVE_STDLIB_H */ -#ifdef HAVE_SYS_ERRNO_H -# include -#endif /* HAVE_SYS_ERRNO_H */ -#ifdef HAVE_ERRNO_H -# include -#endif /* HAVE_ERRNO_H */ -], -[ -char *cp = optarg; -], ac_cv_extern_optarg=yes, ac_cv_extern_optarg=no) -]) -if test "$ac_cv_extern_optarg" = yes -then - AC_DEFINE(HAVE_EXTERN_OPTARG) -fi -]) -dnl ====================================================================== diff --git a/contrib/amd/m4/macros/extern_sys_errlist.m4 b/contrib/amd/m4/macros/extern_sys_errlist.m4 deleted file mode 100644 index 1684d27..0000000 --- a/contrib/amd/m4/macros/extern_sys_errlist.m4 +++ /dev/null @@ -1,30 +0,0 @@ -dnl ###################################################################### -dnl find if "extern char *sys_errlist[]" exist in headers -AC_DEFUN(AMU_EXTERN_SYS_ERRLIST, -[ -AC_CACHE_CHECK(if external definition for sys_errlist[] exists, -ac_cv_extern_sys_errlist, -[ -# try to locate pattern in header files -#pattern="(extern)?.*char.*sys_errlist.*\[\]" -pattern="(extern)?.*char.*sys_errlist.*" -AC_EGREP_CPP(${pattern}, -[ -#ifdef HAVE_STDIO_H -# include -#endif /* HAVE_STDIO_H */ -#ifdef HAVE_SYS_ERRNO_H -# include -#endif /* HAVE_SYS_ERRNO_H */ -#ifdef HAVE_ERRNO_H -# include -#endif /* HAVE_ERRNO_H */ -], ac_cv_extern_sys_errlist=yes, ac_cv_extern_sys_errlist=no) -]) -# check if need to define variable -if test "$ac_cv_extern_sys_errlist" = yes -then - AC_DEFINE(HAVE_EXTERN_SYS_ERRLIST) -fi -]) -dnl ====================================================================== diff --git a/contrib/amd/m4/macros/field_mntent_t_mnt_time_string.m4 b/contrib/amd/m4/macros/field_mntent_t_mnt_time_string.m4 deleted file mode 100644 index 400a3c6..0000000 --- a/contrib/amd/m4/macros/field_mntent_t_mnt_time_string.m4 +++ /dev/null @@ -1,36 +0,0 @@ -fdnl ###################################################################### -dnl find if mntent_t field mnt_time exists and is of type "char *" -AC_DEFUN(AMU_FIELD_MNTENT_T_MNT_TIME_STRING, -[ -AC_CACHE_CHECK(if mntent_t field mnt_time exist as type string, -ac_cv_field_mntent_t_mnt_time_string, -[ -# try to compile a program -AC_TRY_COMPILE( -AMU_MOUNT_HEADERS( -[ -/* now set the typedef */ -#ifdef HAVE_STRUCT_MNTENT -typedef struct mntent mntent_t; -#else /* not HAVE_STRUCT_MNTENT */ -# ifdef HAVE_STRUCT_MNTTAB -typedef struct mnttab mntent_t; -# else /* not HAVE_STRUCT_MNTTAB */ -# error XXX: could not find definition for struct mntent or struct mnttab! -# endif /* not HAVE_STRUCT_MNTTAB */ -#endif /* not HAVE_STRUCT_MNTENT */ -]), -[ -mntent_t mtt; -char *cp = "test"; -int i; -mtt.mnt_time = cp; -i = mtt.mnt_time[0]; -], ac_cv_field_mntent_t_mnt_time_string=yes, ac_cv_field_mntent_t_mnt_time_string=no) -]) -if test "$ac_cv_field_mntent_t_mnt_time_string" = yes -then - AC_DEFINE(HAVE_MNTENT_T_MNT_TIME_STRING) -fi -]) -dnl ====================================================================== diff --git a/contrib/amd/m4/macros/func_bad_memcmp.m4 b/contrib/amd/m4/macros/func_bad_memcmp.m4 deleted file mode 100644 index 9b988c8..0000000 --- a/contrib/amd/m4/macros/func_bad_memcmp.m4 +++ /dev/null @@ -1,11 +0,0 @@ -dnl My version is similar to the one from Autoconf 2.52, but I also -dnl define HAVE_BAD_MEMCMP so that I can do smarter things to avoid -dnl linkage conflicts with bad memcmp versions that are in libc. -AC_DEFUN(AMU_FUNC_BAD_MEMCMP, -[ -AC_FUNC_MEMCMP -if test "$ac_cv_func_memcmp_working" = no -then -AC_DEFINE(HAVE_BAD_MEMCMP) -fi -]) diff --git a/contrib/amd/m4/macros/func_bad_yp_all.m4 b/contrib/amd/m4/macros/func_bad_yp_all.m4 deleted file mode 100644 index 48ffb45..0000000 --- a/contrib/amd/m4/macros/func_bad_yp_all.m4 +++ /dev/null @@ -1,27 +0,0 @@ -dnl Check for a yp_all() function that does not leak a file descriptor -dnl to the ypserv process. -AC_DEFUN(AMU_FUNC_BAD_YP_ALL, -[ -AC_CACHE_CHECK(for a file-descriptor leakage clean yp_all, -ac_cv_func_yp_all_clean, -[ -# clean by default -ac_cv_func_yp_all_clean=yes -# select the correct type -case "${host_os_name}" in - irix* ) - ac_cv_func_yp_all_clean=no ;; - linux* ) - # RedHat 5.1 systems with glibc glibc-2.0.7-19 or below - # leak a UDP socket from yp_all() - case "`cat /etc/redhat-release /dev/null 2>/dev/null`" in - *5.1* ) - ac_cv_func_yp_all_clean=no ;; - esac -esac -]) -if test $ac_cv_func_yp_all_clean = no -then - AC_DEFINE(HAVE_BAD_YP_ALL) -fi -]) diff --git a/contrib/amd/m4/macros/header_templates.m4 b/contrib/amd/m4/macros/header_templates.m4 deleted file mode 100644 index 98e62b8..0000000 --- a/contrib/amd/m4/macros/header_templates.m4 +++ /dev/null @@ -1,917 +0,0 @@ -dnl FILE: m4/macros/header_templates.m4 -dnl defines descriptions for various am-utils specific macros - -AH_TEMPLATE([HAVE_AMU_FS_AUTO], -[Define if have automount filesystem]) - -AH_TEMPLATE([HAVE_AMU_FS_DIRECT], -[Define if have direct automount filesystem]) - -AH_TEMPLATE([HAVE_AMU_FS_TOPLVL], -[Define if have "top-level" filesystem]) - -AH_TEMPLATE([HAVE_AMU_FS_ERROR], -[Define if have error filesystem]) - -AH_TEMPLATE([HAVE_AMU_FS_INHERIT], -[Define if have inheritance filesystem]) - -AH_TEMPLATE([HAVE_AMU_FS_PROGRAM], -[Define if have program filesystem]) - -AH_TEMPLATE([HAVE_AMU_FS_LINK], -[Define if have symbolic-link filesystem]) - -AH_TEMPLATE([HAVE_AMU_FS_LINKX], -[Define if have symlink with existence check filesystem]) - -AH_TEMPLATE([HAVE_AMU_FS_HOST], -[Define if have NFS host-tree filesystem]) - -AH_TEMPLATE([HAVE_AMU_FS_NFSL], -[Define if have nfsl (NFS with local link check) filesystem]) - -AH_TEMPLATE([HAVE_AMU_FS_NFSX], -[Define if have multi-NFS filesystem]) - -AH_TEMPLATE([HAVE_AMU_FS_UNION], -[Define if have union filesystem]) - -AH_TEMPLATE([HAVE_MAP_FILE], -[Define if have file maps (everyone should have it!)]) - -AH_TEMPLATE([HAVE_MAP_NIS], -[Define if have NIS maps]) - -AH_TEMPLATE([HAVE_MAP_NISPLUS], -[Define if have NIS+ maps]) - -AH_TEMPLATE([HAVE_MAP_DBM], -[Define if have DBM maps]) - -AH_TEMPLATE([HAVE_MAP_NDBM], -[Define if have NDBM maps]) - -AH_TEMPLATE([HAVE_MAP_HESIOD], -[Define if have HESIOD maps]) - -AH_TEMPLATE([HAVE_MAP_LDAP], -[Define if have LDAP maps]) - -AH_TEMPLATE([HAVE_MAP_PASSWD], -[Define if have PASSWD maps]) - -AH_TEMPLATE([HAVE_MAP_UNION], -[Define if have UNION maps]) - -AH_TEMPLATE([HAVE_FS_UFS], -[Define if have UFS filesystem]) - -AH_TEMPLATE([HAVE_FS_XFS], -[Define if have XFS filesystem (irix)]) - -AH_TEMPLATE([HAVE_FS_EFS], -[Define if have EFS filesystem (irix)]) - -AH_TEMPLATE([HAVE_FS_NFS], -[Define if have NFS filesystem]) - -AH_TEMPLATE([HAVE_FS_NFS3], -[Define if have NFS3 filesystem]) - -AH_TEMPLATE([HAVE_FS_PCFS], -[Define if have PCFS filesystem]) - -AH_TEMPLATE([HAVE_FS_LOFS], -[Define if have LOFS filesystem]) - -AH_TEMPLATE([HAVE_FS_HSFS], -[Define if have HSFS filesystem]) - -AH_TEMPLATE([HAVE_FS_CDFS], -[Define if have CDFS filesystem]) - -AH_TEMPLATE([HAVE_FS_TFS], -[Define if have TFS filesystem]) - -AH_TEMPLATE([HAVE_FS_TMPFS], -[Define if have TMPFS filesystem]) - -AH_TEMPLATE([HAVE_FS_MFS], -[Define if have MFS filesystem]) - -AH_TEMPLATE([HAVE_FS_CFS], -[Define if have CFS (crypto) filesystem]) - -AH_TEMPLATE([HAVE_FS_AUTOFS], -[Define if have AUTOFS filesystem]) - -AH_TEMPLATE([HAVE_FS_CACHEFS], -[Define if have CACHEFS filesystem]) - -AH_TEMPLATE([HAVE_FS_NULLFS], -[Define if have NULLFS (loopback on bsd44) filesystem]) - -AH_TEMPLATE([HAVE_FS_UNIONFS], -[Define if have UNIONFS filesystem]) - -AH_TEMPLATE([HAVE_FS_UMAPFS], -[Define if have UMAPFS (uid/gid mapping) filesystem]) - -AH_TEMPLATE([MOUNT_TYPE_UFS], -[Mount(2) type/name for UFS filesystem]) - -AH_TEMPLATE([MOUNT_TYPE_XFS], -[Mount(2) type/name for XFS filesystem (irix)]) - -AH_TEMPLATE([MOUNT_TYPE_EFS], -[Mount(2) type/name for EFS filesystem (irix)]) - -AH_TEMPLATE([MOUNT_TYPE_NFS], -[Mount(2) type/name for NFS filesystem]) - -AH_TEMPLATE([MOUNT_TYPE_NFS3], -[Mount(2) type/name for NFS3 filesystem]) - -AH_TEMPLATE([MOUNT_TYPE_PCFS], -[Mount(2) type/name for PCFS filesystem. XXX: conf/trap/trap_hpux.h may override this definition for HPUX 9.0]) - -AH_TEMPLATE([MOUNT_TYPE_LOFS], -[Mount(2) type/name for LOFS filesystem]) - -AH_TEMPLATE([MOUNT_TYPE_CDFS], -[Mount(2) type/name for CDFS filesystem]) - -AH_TEMPLATE([MOUNT_TYPE_TFS], -[Mount(2) type/name for TFS filesystem]) - -AH_TEMPLATE([MOUNT_TYPE_TMPFS], -[Mount(2) type/name for TMPFS filesystem]) - -AH_TEMPLATE([MOUNT_TYPE_MFS], -[Mount(2) type/name for MFS filesystem]) - -AH_TEMPLATE([MOUNT_TYPE_CFS], -[Mount(2) type/name for CFS (crypto) filesystem]) - -AH_TEMPLATE([MOUNT_TYPE_AUTOFS], -[Mount(2) type/name for AUTOFS filesystem]) - -AH_TEMPLATE([MOUNT_TYPE_CACHEFS], -[Mount(2) type/name for CACHEFS filesystem]) - -AH_TEMPLATE([MOUNT_TYPE_IGNORE], -[Mount(2) type/name for IGNORE filesystem (not real just ignore for df)]) - -AH_TEMPLATE([MOUNT_TYPE_NULLFS], -[Mount(2) type/name for NULLFS (loopback on bsd44) filesystem]) - -AH_TEMPLATE([MOUNT_TYPE_UNIONFS], -[Mount(2) type/name for UNIONFS filesystem]) - -AH_TEMPLATE([MOUNT_TYPE_UMAPFS], -[Mount(2) type/name for UMAPFS (uid/gid mapping) filesystem]) - -AH_TEMPLATE([MNTTAB_TYPE_UFS], -[Mount-table entry name for UFS filesystem]) - -AH_TEMPLATE([MNTTAB_TYPE_XFS], -[Mount-table entry name for XFS filesystem (irix)]) - -AH_TEMPLATE([MNTTAB_TYPE_EFS], -[Mount-table entry name for EFS filesystem (irix)]) - -AH_TEMPLATE([MNTTAB_TYPE_NFS], -[Mount-table entry name for NFS filesystem]) - -AH_TEMPLATE([MNTTAB_TYPE_NFS3], -[Mount-table entry name for NFS3 filesystem]) - -AH_TEMPLATE([MNTTAB_TYPE_PCFS], -[Mount-table entry name for PCFS filesystem]) - -AH_TEMPLATE([MNTTAB_TYPE_LOFS], -[Mount-table entry name for LOFS filesystem]) - -AH_TEMPLATE([MNTTAB_TYPE_CDFS], -[Mount-table entry name for CDFS filesystem]) - -AH_TEMPLATE([MNTTAB_TYPE_TFS], -[Mount-table entry name for TFS filesystem]) - -AH_TEMPLATE([MNTTAB_TYPE_TMPFS], -[Mount-table entry name for TMPFS filesystem]) - -AH_TEMPLATE([MNTTAB_TYPE_MFS], -[Mount-table entry name for MFS filesystem]) - -AH_TEMPLATE([MNTTAB_TYPE_CFS], -[Mount-table entry name for CFS (crypto) filesystem]) - -AH_TEMPLATE([MNTTAB_TYPE_AUTOFS], -[Mount-table entry name for AUTOFS filesystem]) - -AH_TEMPLATE([MNTTAB_TYPE_CACHEFS], -[Mount-table entry name for CACHEFS filesystem]) - -AH_TEMPLATE([MNTTAB_TYPE_NULLFS], -[Mount-table entry name for NULLFS (loopback on bsd44) filesystem]) - -AH_TEMPLATE([MNTTAB_TYPE_UNIONFS], -[Mount-table entry name for UNIONFS filesystem]) - -AH_TEMPLATE([MNTTAB_TYPE_UMAPFS], -[Mount-table entry name for UMAPFS (uid/gid mapping) filesystem]) - -AH_TEMPLATE([MNTTAB_FILE_NAME], -[Name of mount table file name]) - -AH_TEMPLATE([HIDE_MOUNT_TYPE], -[Name of mount type to hide amd mount from df(1)]) - -AH_TEMPLATE([MNTTAB_OPT_RO], -[Mount Table option string: Read only]) - -AH_TEMPLATE([MNTTAB_OPT_RW], -[Mount Table option string: Read/write]) - -AH_TEMPLATE([MNTTAB_OPT_RQ], -[Mount Table option string: Read/write with quotas]) - -AH_TEMPLATE([MNTTAB_OPT_QUOTA], -[Mount Table option string: Check quotas]) - -AH_TEMPLATE([MNTTAB_OPT_NOQUOTA], -[Mount Table option string: Don't check quotas]) - -AH_TEMPLATE([MNTTAB_OPT_ONERROR], -[Mount Table option string: action to taken on error]) - -AH_TEMPLATE([MNTTAB_OPT_TOOSOON], -[Mount Table option string: min. time between inconsistencies]) - -AH_TEMPLATE([MNTTAB_OPT_SOFT], -[Mount Table option string: Soft mount]) - -AH_TEMPLATE([MNTTAB_OPT_SPONGY], -[Mount Table option string: spongy mount]) - -AH_TEMPLATE([MNTTAB_OPT_HARD], -[Mount Table option string: Hard mount]) - -AH_TEMPLATE([MNTTAB_OPT_SUID], -[Mount Table option string: Set uid allowed]) - -AH_TEMPLATE([MNTTAB_OPT_NOSUID], -[Mount Table option string: Set uid not allowed]) - -AH_TEMPLATE([MNTTAB_OPT_GRPID], -[Mount Table option string: SysV-compatible gid on create]) - -AH_TEMPLATE([MNTTAB_OPT_REMOUNT], -[Mount Table option string: Change mount options]) - -AH_TEMPLATE([MNTTAB_OPT_NOSUB], -[Mount Table option string: Disallow mounts on subdirs]) - -AH_TEMPLATE([MNTTAB_OPT_MULTI], -[Mount Table option string: Do multi-component lookup]) - -AH_TEMPLATE([MNTTAB_OPT_INTR], -[Mount Table option string: Allow NFS ops to be interrupted]) - -AH_TEMPLATE([MNTTAB_OPT_NOINTR], -[Mount Table option string: Don't allow interrupted ops]) - -AH_TEMPLATE([MNTTAB_OPT_PORT], -[Mount Table option string: NFS server IP port number]) - -AH_TEMPLATE([MNTTAB_OPT_SECURE], -[Mount Table option string: Secure (AUTH_DES) mounting]) - -AH_TEMPLATE([MNTTAB_OPT_KERB], -[Mount Table option string: Secure (AUTH_Kerb) mounting]) - -AH_TEMPLATE([MNTTAB_OPT_RSIZE], -[Mount Table option string: Max NFS read size (bytes)]) - -AH_TEMPLATE([MNTTAB_OPT_WSIZE], -[Mount Table option string: Max NFS write size (bytes)]) - -AH_TEMPLATE([MNTTAB_OPT_TIMEO], -[Mount Table option string: NFS timeout (1/10 sec)]) - -AH_TEMPLATE([MNTTAB_OPT_RETRANS], -[Mount Table option string: Max retransmissions (soft mnts)]) - -AH_TEMPLATE([MNTTAB_OPT_ACTIMEO], -[Mount Table option string: Attr cache timeout (sec)]) - -AH_TEMPLATE([MNTTAB_OPT_ACREGMIN], -[Mount Table option string: Min attr cache timeout (files)]) - -AH_TEMPLATE([MNTTAB_OPT_ACREGMAX], -[Mount Table option string: Max attr cache timeout (files)]) - -AH_TEMPLATE([MNTTAB_OPT_ACDIRMIN], -[Mount Table option string: Min attr cache timeout (dirs)]) - -AH_TEMPLATE([MNTTAB_OPT_ACDIRMAX], -[Mount Table option string: Max attr cache timeout (dirs)]) - -AH_TEMPLATE([MNTTAB_OPT_NOAC], -[Mount Table option string: Don't cache attributes at all]) - -AH_TEMPLATE([MNTTAB_OPT_NOCTO], -[Mount Table option string: No close-to-open consistency]) - -AH_TEMPLATE([MNTTAB_OPT_BG], -[Mount Table option string: Do mount retries in background]) - -AH_TEMPLATE([MNTTAB_OPT_FG], -[Mount Table option string: Do mount retries in foreground]) - -AH_TEMPLATE([MNTTAB_OPT_RETRY], -[Mount Table option string: Number of mount retries]) - -AH_TEMPLATE([MNTTAB_OPT_DEV], -[Mount Table option string: Device id of mounted fs]) - -AH_TEMPLATE([MNTTAB_OPT_FSID], -[Mount Table option string: Filesystem id of mounted fs]) - -AH_TEMPLATE([MNTTAB_OPT_POSIX], -[Mount Table option string: Get static pathconf for mount]) - -AH_TEMPLATE([MNTTAB_OPT_MAP], -[Mount Table option string: Automount map]) - -AH_TEMPLATE([MNTTAB_OPT_DIRECT], -[Mount Table option string: Automount direct map mount]) - -AH_TEMPLATE([MNTTAB_OPT_INDIRECT], -[Mount Table option string: Automount indirect map mount]) - -AH_TEMPLATE([MNTTAB_OPT_LLOCK], -[Mount Table option string: Local locking (no lock manager)]) - -AH_TEMPLATE([MNTTAB_OPT_IGNORE], -[Mount Table option string: Ignore this entry]) - -AH_TEMPLATE([MNTTAB_OPT_NOAUTO], -[Mount Table option string: No auto (what?)]) - -AH_TEMPLATE([MNTTAB_OPT_NOCONN], -[Mount Table option string: No connection]) - -AH_TEMPLATE([MNTTAB_OPT_VERS], -[Mount Table option string: protocol version number indicator]) - -AH_TEMPLATE([MNTTAB_OPT_PROTO], -[Mount Table option string: protocol network_id indicator]) - -AH_TEMPLATE([MNTTAB_OPT_SYNCDIR], -[Mount Table option string: Synchronous local directory ops]) - -AH_TEMPLATE([MNTTAB_OPT_NOSETSEC], -[Mount Table option string: Do no allow setting sec attrs]) - -AH_TEMPLATE([MNTTAB_OPT_SYMTTL], -[Mount Table option string: set symlink cache time-to-live]) - -AH_TEMPLATE([MNTTAB_OPT_COMPRESS], -[Mount Table option string: compress]) - -AH_TEMPLATE([MNTTAB_OPT_PGTHRESH], -[Mount Table option string: paging threshold]) - -AH_TEMPLATE([MNTTAB_OPT_MAXGROUPS], -[Mount Table option string: max groups]) - -AH_TEMPLATE([MNTTAB_OPT_PROPLIST], -[Mount Table option string: support property lists (ACLs)]) - -AH_TEMPLATE([MNT2_GEN_OPT_ASYNC], -[asynchronous filesystem access]) - -AH_TEMPLATE([MNT2_GEN_OPT_AUTOMNTFS], -[automounter filesystem (ignore) flag, used in bsdi-4.1]) - -AH_TEMPLATE([MNT2_GEN_OPT_AUTOMOUNTED], -[automounter filesystem flag, used in Mac OS X / Darwin]) - -AH_TEMPLATE([MNT2_GEN_OPT_BIND], -[directory hardlink]) - -AH_TEMPLATE([MNT2_GEN_OPT_CACHE], -[cache (what?)]) - -AH_TEMPLATE([MNT2_GEN_OPT_DATA], -[6-argument mount]) - -AH_TEMPLATE([MNT2_GEN_OPT_FSS], -[old (4-argument) mount (compatibility)]) - -AH_TEMPLATE([MNT2_GEN_OPT_IGNORE], -[ignore mount entry in df output]) - -AH_TEMPLATE([MNT2_GEN_OPT_JFS], -[journaling filesystem (AIX's UFS/FFS)]) - -AH_TEMPLATE([MNT2_GEN_OPT_GRPID], -[old BSD group-id on create]) - -AH_TEMPLATE([MNT2_GEN_OPT_MULTI], -[do multi-component lookup on files]) - -AH_TEMPLATE([MNT2_GEN_OPT_NEWTYPE], -[use type string instead of int]) - -AH_TEMPLATE([MNT2_GEN_OPT_NFS], -[NFS mount]) - -AH_TEMPLATE([MNT2_GEN_OPT_NOCACHE], -[nocache (what?)]) - -AH_TEMPLATE([MNT2_GEN_OPT_NODEV], -[do not interpret special device files]) - -AH_TEMPLATE([MNT2_GEN_OPT_NOEXEC], -[no exec calls allowed]) - -AH_TEMPLATE([MNT2_GEN_OPT_NONDEV], -[do not interpret special device files]) - -AH_TEMPLATE([MNT2_GEN_OPT_NOSUB], -[Disallow mounts beneath this mount]) - -AH_TEMPLATE([MNT2_GEN_OPT_NOSUID], -[Setuid programs disallowed]) - -AH_TEMPLATE([MNT2_GEN_OPT_NOTRUNC], -[Return ENAMETOOLONG for long filenames]) - -AH_TEMPLATE([MNT2_GEN_OPT_OPTIONSTR], -[Pass mount option string to kernel]) - -AH_TEMPLATE([MNT2_GEN_OPT_OVERLAY], -[allow overlay mounts]) - -AH_TEMPLATE([MNT2_GEN_OPT_QUOTA], -[check quotas]) - -AH_TEMPLATE([MNT2_GEN_OPT_RDONLY], -[Read-only]) - -AH_TEMPLATE([MNT2_GEN_OPT_REMOUNT], -[change options on an existing mount]) - -AH_TEMPLATE([MNT2_GEN_OPT_RONLY], -[read only]) - -AH_TEMPLATE([MNT2_GEN_OPT_SYNC], -[synchronize data immediately to filesystem]) - -AH_TEMPLATE([MNT2_GEN_OPT_SYNCHRONOUS], -[synchronous filesystem access (same as SYNC)]) - -AH_TEMPLATE([MNT2_GEN_OPT_SYS5], -[Mount with Sys 5-specific semantics]) - -AH_TEMPLATE([MNT2_GEN_OPT_UNION], -[Union mount]) - -AH_TEMPLATE([MNT2_NFS_OPT_AUTO], -[hide mount type from df(1)]) - -AH_TEMPLATE([MNT2_NFS_OPT_ACDIRMAX], -[set max secs for dir attr cache]) - -AH_TEMPLATE([MNT2_NFS_OPT_ACDIRMIN], -[set min secs for dir attr cache]) - -AH_TEMPLATE([MNT2_NFS_OPT_ACREGMAX], -[set max secs for file attr cache]) - -AH_TEMPLATE([MNT2_NFS_OPT_ACREGMIN], -[set min secs for file attr cache]) - -AH_TEMPLATE([MNT2_NFS_OPT_AUTHERR], -[Authentication error]) - -AH_TEMPLATE([MNT2_NFS_OPT_DEADTHRESH], -[set dead server retry thresh]) - -AH_TEMPLATE([MNT2_NFS_OPT_DISMINPROG], -[Dismount in progress]) - -AH_TEMPLATE([MNT2_NFS_OPT_DISMNT], -[Dismounted]) - -AH_TEMPLATE([MNT2_NFS_OPT_DUMBTIMR], -[Don't estimate rtt dynamically]) - -AH_TEMPLATE([MNT2_NFS_OPT_GRPID], -[System V-style gid inheritance]) - -AH_TEMPLATE([MNT2_NFS_OPT_HASAUTH], -[Has authenticator]) - -AH_TEMPLATE([MNT2_NFS_OPT_FSNAME], -[provide name of server's fs to system]) - -AH_TEMPLATE([MNT2_NFS_OPT_HOSTNAME], -[set hostname for error printf]) - -AH_TEMPLATE([MNT2_NFS_OPT_IGNORE], -[ignore mount point]) - -AH_TEMPLATE([MNT2_NFS_OPT_INT], -[allow interrupts on hard mount]) - -AH_TEMPLATE([MNT2_NFS_OPT_INTR], -[allow interrupts on hard mount]) - -AH_TEMPLATE([MNT2_NFS_OPT_INTERNAL], -[Bits set internally]) - -AH_TEMPLATE([MNT2_NFS_OPT_KERB], -[Use Kerberos authentication]) - -AH_TEMPLATE([MNT2_NFS_OPT_KERBEROS], -[use kerberos credentials]) - -AH_TEMPLATE([MNT2_NFS_OPT_KNCONF], -[transport's knetconfig structure]) - -AH_TEMPLATE([MNT2_NFS_OPT_LEASETERM], -[set lease term (nqnfs)]) - -AH_TEMPLATE([MNT2_NFS_OPT_LLOCK], -[Local locking (no lock manager)]) - -AH_TEMPLATE([MNT2_NFS_OPT_MAXGRPS], -[set maximum grouplist size]) - -AH_TEMPLATE([MNT2_NFS_OPT_MNTD], -[Mnt server for mnt point]) - -AH_TEMPLATE([MNT2_NFS_OPT_MYWRITE], -[Assume writes were mine]) - -AH_TEMPLATE([MNT2_NFS_OPT_NFSV3], -[mount NFS Version 3]) - -AH_TEMPLATE([MNT2_NFS_OPT_NOAC], -[don't cache attributes]) - -AH_TEMPLATE([MNT2_NFS_OPT_NOCONN], -[Don't Connect the socket]) - -AH_TEMPLATE([MNT2_NFS_OPT_NOCTO], -[no close-to-open consistency]) - -AH_TEMPLATE([MNT2_NFS_OPT_NOINT], -[disallow interrupts on hard mounts]) - -AH_TEMPLATE([MNT2_NFS_OPT_NQLOOKLEASE], -[Get lease for lookup]) - -AH_TEMPLATE([MNT2_NFS_OPT_NONLM], -[Don't use locking]) - -AH_TEMPLATE([MNT2_NFS_OPT_NQNFS], -[Use Nqnfs protocol]) - -AH_TEMPLATE([MNT2_NFS_OPT_POSIX], -[static pathconf kludge info]) - -AH_TEMPLATE([MNT2_NFS_OPT_RCVLOCK], -[Rcv socket lock]) - -AH_TEMPLATE([MNT2_NFS_OPT_RDIRALOOK], -[Do lookup with readdir (nqnfs)]) - -AH_TEMPLATE([MNT2_NFS_OPT_PROPLIST], -[allow property list operations (ACLs over NFS)]) - -AH_TEMPLATE([MNT2_NFS_OPTS_RDIRPLUS], -[Use Readdirplus for NFSv3]) - -AH_TEMPLATE([MNT2_NFS_OPT_READAHEAD], -[set read ahead]) - -AH_TEMPLATE([MNT2_NFS_OPT_READDIRSIZE], -[Set readdir size]) - -AH_TEMPLATE([MNT2_NFS_OPT_RESVPORT], -[Allocate a reserved port]) - -AH_TEMPLATE([MNT2_NFS_OPT_RETRANS], -[set number of request retries]) - -AH_TEMPLATE([MNT2_NFS_OPT_RONLY], -[read only]) - -AH_TEMPLATE([MNT2_NFS_OPT_RPCTIMESYNC], -[use RPC to do secure NFS time sync]) - -AH_TEMPLATE([MNT2_NFS_OPT_RSIZE], -[set read size]) - -AH_TEMPLATE([MNT2_NFS_OPT_SECURE], -[secure mount]) - -AH_TEMPLATE([MNT2_NFS_OPT_SNDLOCK], -[Send socket lock]) - -AH_TEMPLATE([MNT2_NFS_OPT_SOFT], -[soft mount (hard is default)]) - -AH_TEMPLATE([MNT2_NFS_OPT_SPONGY], -[spongy mount]) - -AH_TEMPLATE([MNT2_NFS_OPT_TIMEO], -[set initial timeout]) - -AH_TEMPLATE([MNT2_NFS_OPT_TCP], -[use TCP for mounts]) - -AH_TEMPLATE([MNT2_NFS_OPT_VER3], -[linux NFSv3]) - -AH_TEMPLATE([MNT2_NFS_OPT_WAITAUTH], -[Wait for authentication]) - -AH_TEMPLATE([MNT2_NFS_OPT_WANTAUTH], -[Wants an authenticator]) - -AH_TEMPLATE([MNT2_NFS_OPT_WANTRCV], -[Want receive socket lock]) - -AH_TEMPLATE([MNT2_NFS_OPT_WANTSND], -[Want send socket lock]) - -AH_TEMPLATE([MNT2_NFS_OPT_WSIZE], -[set write size]) - -AH_TEMPLATE([MNT2_NFS_OPT_SYMTTL], -[set symlink cache time-to-live]) - -AH_TEMPLATE([MNT2_NFS_OPT_PGTHRESH], -[paging threshold]) - -AH_TEMPLATE([MNT2_NFS_OPT_XLATECOOKIE], -[32<->64 dir cookie translation]) - -AH_TEMPLATE([MNT2_CDFS_OPT_DEFPERM], -[Ignore permission bits]) - -AH_TEMPLATE([MNT2_CDFS_OPT_NODEFPERM], -[Use on-disk permission bits]) - -AH_TEMPLATE([MNT2_CDFS_OPT_NOVERSION], -[Strip off extension from version string]) - -AH_TEMPLATE([MNT2_CDFS_OPT_RRIP], -[Use Rock Ridge Interchange Protocol (RRIP) extensions]) - -AH_TEMPLATE([HAVE_MNTENT_T_MNT_TIME_STRING], -[does mntent_t have mnt_time field and is of type "char *" ?]) - -AH_TEMPLATE([REINSTALL_SIGNAL_HANDLER], -[should signal handlers be reinstalled?]) - -AH_TEMPLATE([DEBUG], -[Turn off general debugging by default]) - -AH_TEMPLATE([DEBUG_MEM], -[Turn off memory debugging by default]) - -AH_TEMPLATE([PACKAGE_NAME], -[Define package name (must be defined by configure.in)]) - -AH_TEMPLATE([PACKAGE_VERSION], -[Define version of package (must be defined by configure.in)]) - -AH_TEMPLATE([PACKAGE_BUGREPORT], -[Define bug-reporting address (must be defined by configure.in)]) - -AH_TEMPLATE([HOST_CPU], -[Define name of host machine's cpu (eg. sparc)]) - -AH_TEMPLATE([HOST_ARCH], -[Define name of host machine's architecture (eg. sun4)]) - -AH_TEMPLATE([HOST_VENDOR], -[Define name of host machine's vendor (eg. sun)]) - -AH_TEMPLATE([HOST_OS], -[Define name and version of host machine (eg. solaris2.5.1)]) - -AH_TEMPLATE([HOST_OS_NAME], -[Define only name of host machine OS (eg. solaris2)]) - -AH_TEMPLATE([HOST_OS_VERSION], -[Define only version of host machine (eg. 2.5.1)]) - -AH_TEMPLATE([HOST_HEADER_VERSION], -[Define the header version of (linux) hosts (eg. 2.2.10)]) - -AH_TEMPLATE([HOST_NAME], -[Define name of host]) - -AH_TEMPLATE([USER_NAME], -[Define user name]) - -AH_TEMPLATE([CONFIG_DATE], -[Define configuration date]) - -AH_TEMPLATE([HAVE_TRANSPORT_TYPE_TLI], -[what type of network transport type is in use? TLI or sockets?]) - -AH_TEMPLATE([time_t], -[Define to `long' if doesn't define time_t]) - -AH_TEMPLATE([voidp], -[Define to "void *" if compiler can handle, otherwise "char *"]) - -AH_TEMPLATE([am_nfs_fh], -[Define a type/structure for an NFS V2 filehandle]) - -AH_TEMPLATE([am_nfs_fh3], -[Define a type/structure for an NFS V3 filehandle]) - -AH_TEMPLATE([HAVE_NFS_PROT_HEADERS], -[define if the host has NFS protocol headers in system headers]) - -AH_TEMPLATE([AMU_NFS_PROTOCOL_HEADER], -[define name of am-utils' NFS protocol header]) - -AH_TEMPLATE([nfs_args_t], -[Define a type for the nfs_args structure]) - -AH_TEMPLATE([NFS_FH_FIELD], -[Define the field name for the filehandle within nfs_args_t]) - -AH_TEMPLATE([HAVE_FHANDLE], -[Define if plain fhandle type exists]) - -AH_TEMPLATE([SVC_IN_ARG_TYPE], -[Define the type of the 3rd argument ('in') to svc_getargs()]) - -AH_TEMPLATE([XDRPROC_T_TYPE], -[Define to the type of xdr procedure type]) - -AH_TEMPLATE([MOUNT_TABLE_ON_FILE], -[Define if mount table is on file, undefine if in kernel]) - -AH_TEMPLATE([HAVE_STRUCT_MNTENT], -[Define if have struct mntent in one of the standard headers]) - -AH_TEMPLATE([HAVE_STRUCT_MNTTAB], -[Define if have struct mnttab in one of the standard headers]) - -AH_TEMPLATE([HAVE_STRUCT_NFS_ARGS], -[Define if have struct nfs_args in one of the standard nfs headers]) - -AH_TEMPLATE([HAVE_STRUCT_NFS_GFS_MOUNT], -[Define if have struct nfs_gfs_mount in one of the standard nfs headers]) - -AH_TEMPLATE([YP_ORDER_OUTORDER_TYPE], -[Type of the 3rd argument to yp_order()]) - -AH_TEMPLATE([RECVFROM_FROMLEN_TYPE], -[Type of the 6th argument to recvfrom()]) - -AH_TEMPLATE([AUTH_CREATE_GIDLIST_TYPE], -[Type of the 5rd argument to authunix_create()]) - -AH_TEMPLATE([MTYPE_PRINTF_TYPE], -[The string used in printf to print the mount-type field of mount(2)]) - -AH_TEMPLATE([MTYPE_TYPE], -[Type of the mount-type field in the mount() system call]) - -AH_TEMPLATE([pcfs_args_t], -[Define a type for the pcfs_args structure]) - -AH_TEMPLATE([autofs_args_t], -[Define a type for the autofs_args structure]) - -AH_TEMPLATE([cachefs_args_t], -[Define a type for the cachefs_args structure]) - -AH_TEMPLATE([tmpfs_args_t], -[Define a type for the tmpfs_args structure]) - -AH_TEMPLATE([ufs_args_t], -[Define a type for the ufs_args structure]) - -AH_TEMPLATE([efs_args_t], -[Define a type for the efs_args structure]) - -AH_TEMPLATE([xfs_args_t], -[Define a type for the xfs_args structure]) - -AH_TEMPLATE([lofs_args_t], -[Define a type for the lofs_args structure]) - -AH_TEMPLATE([cdfs_args_t], -[Define a type for the cdfs_args structure]) - -AH_TEMPLATE([mfs_args_t], -[Define a type for the mfs_args structure]) - -AH_TEMPLATE([rfs_args_t], -[Define a type for the rfs_args structure]) - -AH_TEMPLATE([HAVE_BAD_MEMCMP], -[define if have a bad version of memcmp()]) - -AH_TEMPLATE([HAVE_BAD_YP_ALL], -[define if have a bad version of yp_all()]) - -AH_TEMPLATE([USE_UNCONNECTED_NFS_SOCKETS], -[define if must use NFS "noconn" option]) - -AH_TEMPLATE([USE_CONNECTED_NFS_SOCKETS], -[define if must NOT use NFS "noconn" option]) - -AH_TEMPLATE([HAVE_GNU_GETOPT], -[define if your system's getopt() is GNU getopt() (are you using glibc)]) - -AH_TEMPLATE([HAVE_EXTERN_SYS_ERRLIST], -[does extern definition for sys_errlist[] exist?]) - -AH_TEMPLATE([HAVE_EXTERN_OPTARG], -[does extern definition for optarg exist?]) - -AH_TEMPLATE([HAVE_EXTERN_CLNT_SPCREATEERROR], -[does extern definition for clnt_spcreateerror() exist?]) - -AH_TEMPLATE([HAVE_EXTERN_CLNT_SPERRNO], -[does extern definition for clnt_sperrno() exist?]) - -AH_TEMPLATE([HAVE_EXTERN_FREE], -[does extern definition for free() exist?]) - -AH_TEMPLATE([HAVE_EXTERN_GET_MYADDRESS], -[does extern definition for get_myaddress() exist?]) - -AH_TEMPLATE([HAVE_EXTERN_GETCCENT], -[does extern definition for getccent() (hpux) exist?]) - -AH_TEMPLATE([HAVE_EXTERN_GETDOMAINNAME], -[does extern definition for getdomainname() exist?]) - -AH_TEMPLATE([HAVE_EXTERN_GETHOSTNAME], -[does extern definition for gethostname() exist?]) - -AH_TEMPLATE([HAVE_EXTERN_GETLOGIN], -[does extern definition for getlogin() exist?]) - -AH_TEMPLATE([HAVE_EXTERN_GETTABLESIZE], -[does extern definition for gettablesize() exist?]) - -AH_TEMPLATE([HAVE_EXTERN_GETPAGESIZE], -[does extern definition for getpagesize() exist?]) - -AH_TEMPLATE([HAVE_EXTERN_INNETGR], -[does extern definition for innetgr() exist?]) - -AH_TEMPLATE([HAVE_EXTERN_MKSTEMP], -[does extern definition for mkstemp() exist?]) - -AH_TEMPLATE([HAVE_EXTERN_SBRK], -[does extern definition for sbrk() exist?]) - -AH_TEMPLATE([HAVE_EXTERN_SETEUID], -[does extern definition for seteuid() exist?]) - -AH_TEMPLATE([HAVE_EXTERN_SETITIMER], -[does extern definition for setitimer() exist?]) - -AH_TEMPLATE([HAVE_EXTERN_STRCASECMP], -[does extern definition for strcasecmp() exist?]) - -AH_TEMPLATE([HAVE_EXTERN_STRDUP], -[does extern definition for strdup() exist?]) - -AH_TEMPLATE([HAVE_EXTERN_STRSTR], -[does extern definition for strstr() exist?]) - -AH_TEMPLATE([HAVE_EXTERN_USLEEP], -[does extern definition for usleep() exist?]) - -AH_TEMPLATE([HAVE_EXTERN_WAIT3], -[does extern definition for wait3() exist?]) - -AH_TEMPLATE([HAVE_EXTERN_VSNPRINTF], -[does extern definition for vsnprintf() exist?]) - -AH_TEMPLATE([HAVE_EXTERN_XDR_CALLMSG], -[does extern definition for xdr_callmsg() exist?]) - -AH_TEMPLATE([HAVE_EXTERN_XDR_OPAQUE_AUTH], -[does extern definition for xdr_opaque_auth() exist?]) diff --git a/contrib/amd/m4/macros/host_macros.m4 b/contrib/amd/m4/macros/host_macros.m4 deleted file mode 100644 index b835d7e..0000000 --- a/contrib/amd/m4/macros/host_macros.m4 +++ /dev/null @@ -1,91 +0,0 @@ -dnl ###################################################################### -dnl AC_HOST_MACROS: define HOST_CPU, HOST_VENDOR, and HOST_OS -AC_DEFUN(AMU_HOST_MACROS, -[ -# these are defined already by the macro 'CANONICAL_HOST' - AC_MSG_CHECKING([host cpu]) - AC_DEFINE_UNQUOTED(HOST_CPU, "$host_cpu") - AC_MSG_RESULT($host_cpu) - - AC_MSG_CHECKING([vendor]) - AC_DEFINE_UNQUOTED(HOST_VENDOR, "$host_vendor") - AC_MSG_RESULT($host_vendor) - - AC_MSG_CHECKING([host full OS name and version]) - # normalize some host OS names - case ${host_os} in - # linux is linux is linux, regardless of RMS. - linux-gnu* | lignux* ) host_os=linux ;; - esac - AC_DEFINE_UNQUOTED(HOST_OS, "$host_os") - AC_MSG_RESULT($host_os) - -# break host_os into host_os_name and host_os_version - AC_MSG_CHECKING([host OS name]) - host_os_name=`echo $host_os | sed 's/\..*//g'` - # normalize some OS names - case ${host_os_name} in - # linux is linux is linux, regardless of RMS. - linux-gnu* | lignux* ) host_os_name=linux ;; - esac - AC_DEFINE_UNQUOTED(HOST_OS_NAME, "$host_os_name") - AC_MSG_RESULT($host_os_name) - -# parse out the OS version of the host - AC_MSG_CHECKING([host OS version]) - host_os_version=`echo $host_os | sed 's/^[[^0-9]]*//g'` - if test -z "$host_os_version" - then - host_os_version=`(uname -r) 2>/dev/null` || host_os_version=unknown - fi - case ${host_os_version} in - # fixes for some OS versions (solaris used to be here) - * ) # do nothing for now - ;; - esac - AC_DEFINE_UNQUOTED(HOST_OS_VERSION, "$host_os_version") - AC_MSG_RESULT($host_os_version) - -# figure out host architecture (different than CPU) - AC_MSG_CHECKING([host OS architecture]) - host_arch=`(uname -m) 2>/dev/null` || host_arch=unknown - # normalize some names - case ${host_arch} in - sun4* ) host_arch=sun4 ;; - sun3x ) host_arch=sun3 ;; - sun ) host_arch=`(arch) 2>/dev/null` || host_arch=unknown ;; - i?86 ) host_arch=i386 ;; # all x86 should show up as i386 - esac - AC_DEFINE_UNQUOTED(HOST_ARCH, "$host_arch") - AC_MSG_RESULT($host_arch) - -# figure out host name - AC_MSG_CHECKING([host name]) - host_name=`(hostname || uname -n) 2>/dev/null` || host_name=unknown - AC_DEFINE_UNQUOTED(HOST_NAME, "$host_name") - AC_MSG_RESULT($host_name) - -# figure out user name - AC_MSG_CHECKING([user name]) - if test -n "$USER" - then - user_name="$USER" - else - if test -n "$LOGNAME" - then - user_name="$LOGNAME" - else - user_name=`(whoami) 2>/dev/null` || user_name=unknown - fi - fi - AC_DEFINE_UNQUOTED(USER_NAME, "$user_name") - AC_MSG_RESULT($user_name) - -# figure out configuration date - AC_MSG_CHECKING([configuration date]) - config_date=`(date) 2>/dev/null` || config_date=unknown_date - AC_DEFINE_UNQUOTED(CONFIG_DATE, "$config_date") - AC_MSG_RESULT($config_date) - -]) -dnl ====================================================================== diff --git a/contrib/amd/m4/macros/linux_headers.m4 b/contrib/amd/m4/macros/linux_headers.m4 deleted file mode 100644 index 8b8c514..0000000 --- a/contrib/amd/m4/macros/linux_headers.m4 +++ /dev/null @@ -1,42 +0,0 @@ -dnl ###################################################################### -dnl ensure that linux kernel headers match running kernel -AC_DEFUN(AMU_LINUX_HEADERS, -[ -# test sanity of running kernel vs. kernel headers - AC_MSG_CHECKING("host headers version") - case ${host_os} in - linux ) - host_header_version="bad" - AMU_EXPAND_RUN_STRING( -[ -#include -#include -], -[ -if (argc > 1) - printf("%s", UTS_RELEASE); -], -[ host_header_version=$value ], -[ echo - AC_MSG_ERROR([cannot find UTS_RELEASE in . - This Linux system may be misconfigured or unconfigured!]) -]) - ;; - * ) host_header_version=$host_os_version ;; - esac - AC_DEFINE_UNQUOTED(HOST_HEADER_VERSION, "$host_header_version") - AC_MSG_RESULT($host_header_version) - - case ${host_os} in - linux ) - if test "$host_os_version" != $host_header_version - then - AC_MSG_WARN([Linux kernel $host_os_version mismatch with $host_header_version headers!]) - fi - ;; -esac -dnl cache these two for debugging purposes -ac_cv_os_version=$host_os_version -ac_cv_header_version=$host_header_version -]) -dnl ====================================================================== diff --git a/contrib/amd/m4/macros/localconfig.m4 b/contrib/amd/m4/macros/localconfig.m4 deleted file mode 100644 index ee56245..0000000 --- a/contrib/amd/m4/macros/localconfig.m4 +++ /dev/null @@ -1,13 +0,0 @@ -dnl ###################################################################### -dnl check if a local configuration file exists -AC_DEFUN(AMU_LOCALCONFIG, -[AC_MSG_CHECKING(a local configuration file) -if test -f localconfig.h -then - AC_DEFINE(HAVE_LOCALCONFIG_H) - AC_MSG_RESULT(yes) -else - AC_MSG_RESULT(no) -fi -]) -dnl ====================================================================== diff --git a/contrib/amd/m4/macros/mount_headers.m4 b/contrib/amd/m4/macros/mount_headers.m4 deleted file mode 100644 index cf7b910..0000000 --- a/contrib/amd/m4/macros/mount_headers.m4 +++ /dev/null @@ -1,12 +0,0 @@ -dnl ###################################################################### -dnl an M4 macro to include a list of common headers being used everywhere -define(AMU_MOUNT_HEADERS, -[ -#include "${srcdir}/include/mount_headers1.h" -#include AMU_NFS_PROTOCOL_HEADER -#include "${srcdir}/include/mount_headers2.h" - -$1 -] -) -dnl ====================================================================== diff --git a/contrib/amd/m4/macros/name_package.m4 b/contrib/amd/m4/macros/name_package.m4 deleted file mode 100644 index 434e592..0000000 --- a/contrib/amd/m4/macros/name_package.m4 +++ /dev/null @@ -1,8 +0,0 @@ -dnl ###################################################################### -dnl Package name -AC_DEFUN(AC_NAME_PACKAGE, -[AC_MSG_CHECKING(package name) -AC_DEFINE_UNQUOTED(PACKAGE, "$1") -AC_MSG_RESULT(\"$1\") -]) -dnl ====================================================================== diff --git a/contrib/amd/m4/macros/name_version.m4 b/contrib/amd/m4/macros/name_version.m4 deleted file mode 100644 index e9b78d6..0000000 --- a/contrib/amd/m4/macros/name_version.m4 +++ /dev/null @@ -1,8 +0,0 @@ -dnl ###################################################################### -dnl Version of package -AC_DEFUN(AC_NAME_VERSION, -[AC_MSG_CHECKING(version of package) -AC_DEFINE_UNQUOTED(VERSION, "$1") -AC_MSG_RESULT(\"$1\") -]) -dnl ====================================================================== diff --git a/contrib/amd/m4/macros/opt_amu_cflags.m4 b/contrib/amd/m4/macros/opt_amu_cflags.m4 deleted file mode 100644 index 75f9661..0000000 --- a/contrib/amd/m4/macros/opt_amu_cflags.m4 +++ /dev/null @@ -1,24 +0,0 @@ -dnl ###################################################################### -dnl Which options to add to CFLAGS for compilation? -dnl NOTE: this is only for final compiltions, not for configure tests) -AC_DEFUN(AMU_OPT_AMU_CFLAGS, -[AC_MSG_CHECKING(for additional C option compilation flags) -AC_ARG_ENABLE(am-cflags, -AC_HELP_STRING([--enable-am-cflags=ARG], - [compile package with ARG additional C flags]), -[ -if test "$enableval" = "" || test "$enableval" = "yes" || test "$enableval" = "no"; then - AC_MSG_ERROR(am-cflags must be supplied if option is used) -fi -# user supplied a cflags option to configure -AMU_CFLAGS="$enableval" -AC_SUBST(AMU_CFLAGS) -AC_MSG_RESULT($enableval) -], [ - # default is to have no additional C flags - AMU_CFLAGS="" - AC_SUBST(AMU_CFLAGS) - AC_MSG_RESULT(none) -]) -]) -dnl ====================================================================== diff --git a/contrib/amd/m4/macros/opt_cppflags.m4 b/contrib/amd/m4/macros/opt_cppflags.m4 deleted file mode 100644 index bcf7d76..0000000 --- a/contrib/amd/m4/macros/opt_cppflags.m4 +++ /dev/null @@ -1,22 +0,0 @@ -dnl ###################################################################### -dnl Initial settings for CPPFLAGS (-I options) -dnl NOTE: this is for configuration as well as compilations! -AC_DEFUN(AMU_OPT_CPPFLAGS, -[AC_MSG_CHECKING(for configuration/compilation (-I) preprocessor flags) -AC_ARG_ENABLE(cppflags, -AC_HELP_STRING([--enable-cppflags=ARG], - [configure/compile with ARG (-I) preprocessor flags]), -[ -if test "$enableval" = "" || test "$enableval" = "yes" || test "$enableval" = "no"; then - AC_MSG_ERROR(cppflags must be supplied if option is used) -fi -# use supplied options -CPPFLAGS="$CPPFLAGS $enableval" -export CPPFLAGS -AC_MSG_RESULT($enableval) -], [ - # default is to have no additional flags - AC_MSG_RESULT(none) -]) -]) -dnl ====================================================================== diff --git a/contrib/amd/m4/macros/opt_debug.m4 b/contrib/amd/m4/macros/opt_debug.m4 deleted file mode 100644 index 18205f2..0000000 --- a/contrib/amd/m4/macros/opt_debug.m4 +++ /dev/null @@ -1,30 +0,0 @@ -dnl ###################################################################### -dnl Debugging: "yes" means general, "mem" means general and memory debugging, -dnl and "no" means none. -AC_DEFUN(AMU_OPT_DEBUG, -[AC_MSG_CHECKING(for debugging options) -AC_ARG_ENABLE(debug, -AC_HELP_STRING([--enable-debug=ARG],[enable debugging (yes/mem/no)]), -[ -if test "$enableval" = yes; then - AC_MSG_RESULT(yes) - AC_DEFINE(DEBUG) - ac_cv_opt_debug=yes -elif test "$enableval" = mem; then - AC_MSG_RESULT(mem) - AC_DEFINE(DEBUG) - AC_DEFINE(DEBUG_MEM) - AC_CHECK_LIB(mapmalloc, malloc_verify) - AC_CHECK_LIB(malloc, mallinfo) - ac_cv_opt_debug=mem -else - AC_MSG_RESULT(no) - ac_cv_opt_debug=no -fi -], -[ - # default is no debugging - AC_MSG_RESULT(no) -]) -]) -dnl ====================================================================== diff --git a/contrib/amd/m4/macros/opt_ldflags.m4 b/contrib/amd/m4/macros/opt_ldflags.m4 deleted file mode 100644 index 9afd9a9..0000000 --- a/contrib/amd/m4/macros/opt_ldflags.m4 +++ /dev/null @@ -1,22 +0,0 @@ -dnl ###################################################################### -dnl Initial settings for LDFLAGS (-L options) -dnl NOTE: this is for configuration as well as compilations! -AC_DEFUN(AMU_OPT_LDFLAGS, -[AC_MSG_CHECKING(for configuration/compilation (-L) library flags) -AC_ARG_ENABLE(ldflags, -AC_HELP_STRING([--enable-ldflags=ARG], - [configure/compile with ARG (-L) library flags]), -[ -if test "$enableval" = "" || test "$enableval" = "yes" || test "$enableval" = "no"; then - AC_MSG_ERROR(ldflags must be supplied if option is used) -fi -# use supplied options -LDFLAGS="$LDFLAGS $enableval" -export LDFLAGS -AC_MSG_RESULT($enableval) -], [ - # default is to have no additional flags - AC_MSG_RESULT(none) -]) -]) -dnl ====================================================================== diff --git a/contrib/amd/m4/macros/opt_libs.m4 b/contrib/amd/m4/macros/opt_libs.m4 deleted file mode 100644 index 3134931..0000000 --- a/contrib/amd/m4/macros/opt_libs.m4 +++ /dev/null @@ -1,22 +0,0 @@ -dnl ###################################################################### -dnl Initial settings for LIBS (-l options) -dnl NOTE: this is for configuration as well as compilations! -AC_DEFUN(AMU_OPT_LIBS, -[AC_MSG_CHECKING(for configuration/compilation (-l) library flags) -AC_ARG_ENABLE(libs, -AC_HELP_STRING([--enable-libs=ARG], - [configure/compile with ARG (-l) library flags]), -[ -if test "$enableval" = "" || test "$enableval" = "yes" || test "$enableval" = "no"; then - AC_MSG_ERROR(libs must be supplied if option is used) -fi -# use supplied options -LIBS="$LIBS $enableval" -export LIBS -AC_MSG_RESULT($enableval) -], [ - # default is to have no additional flags - AC_MSG_RESULT(none) -]) -]) -dnl ====================================================================== diff --git a/contrib/amd/m4/macros/os_cflags.m4 b/contrib/amd/m4/macros/os_cflags.m4 deleted file mode 100644 index 6f82808..0000000 --- a/contrib/amd/m4/macros/os_cflags.m4 +++ /dev/null @@ -1,80 +0,0 @@ -dnl ###################################################################### -dnl Specify additional compile options based on the OS and the compiler -AC_DEFUN(AMU_OS_CFLAGS, -[ -AC_CACHE_CHECK(additional compiler flags, -ac_cv_os_cflags, -[ -case "${host_os}" in - irix6* ) - case "${CC}" in - cc ) - # do not use 64-bit compiler - ac_cv_os_cflags="-n32 -mips3 -Wl,-woff,84" - ;; - esac - ;; - osf[[1-3]]* ) - # get the right version of struct sockaddr - case "${CC}" in - cc ) - ac_cv_os_cflags="-std -D_SOCKADDR_LEN -D_NO_PROTO" - ;; - * ) - ac_cv_os_cflags="-D_SOCKADDR_LEN -D_NO_PROTO" - ;; - esac - ;; - osf* ) - # get the right version of struct sockaddr - case "${CC}" in - cc ) - ac_cv_os_cflags="-std -D_SOCKADDR_LEN" - ;; - * ) - ac_cv_os_cflags="-D_SOCKADDR_LEN" - ;; - esac - ;; - aix[[1-3]]* ) - ac_cv_os_cflags="" ;; - aix4.[[0-2]]* ) - # turn on additional headers - ac_cv_os_cflags="-D_XOPEN_EXTENDED_SOURCE" - ;; - aix* ) - # avoid circular dependencies in yp headers - ac_cv_os_cflags="-DHAVE_BAD_HEADERS -D_XOPEN_EXTENDED_SOURCE" - ;; - OFF-sunos4* ) - # make sure passing whole structures is handled in gcc - case "${CC}" in - gcc ) - ac_cv_os_cflags="-fpcc-struct-return" - ;; - esac - ;; - sunos[[34]]* | solaris1* | solaris2.[[0-5]]* | sunos5.[[0-5]]* ) - ac_cv_os_cflags="" ;; - solaris* | sunos* ) - # turn on 64-bit file offset interface - case "${CC}" in - * ) - ac_cv_os_cflags="-D_LARGEFILE64_SOURCE" - ;; - esac - ;; - hpux* ) - # use Ansi compiler on HPUX - case "${CC}" in - cc ) - ac_cv_os_cflags="-Ae" - ;; - esac - ;; - * ) ac_cv_os_cflags="" ;; -esac -]) -CFLAGS="$CFLAGS $ac_cv_os_cflags" -]) -dnl ====================================================================== diff --git a/contrib/amd/m4/macros/os_cppflags.m4 b/contrib/amd/m4/macros/os_cppflags.m4 deleted file mode 100644 index 8039f4e..0000000 --- a/contrib/amd/m4/macros/os_cppflags.m4 +++ /dev/null @@ -1,18 +0,0 @@ -dnl ###################################################################### -dnl Specify additional cpp options based on the OS and the compiler -AC_DEFUN(AMU_OS_CPPFLAGS, -[ -AC_CACHE_CHECK(additional preprocessor flags, -ac_cv_os_cppflags, -[ -case "${host_os}" in -# off for now, posix may be a broken thing for nextstep3... -# nextstep* ) -# ac_cv_os_cppflags="-D_POSIX_SOURCE" -# ;; - * ) ac_cv_os_cppflags="" ;; -esac -]) -CPPFLAGS="$CPPFLAGS $ac_cv_os_cppflags" -]) -dnl ====================================================================== diff --git a/contrib/amd/m4/macros/os_ldflags.m4 b/contrib/amd/m4/macros/os_ldflags.m4 deleted file mode 100644 index f46debb..0000000 --- a/contrib/amd/m4/macros/os_ldflags.m4 +++ /dev/null @@ -1,22 +0,0 @@ -dnl ###################################################################### -dnl Specify additional linker options based on the OS and the compiler -AC_DEFUN(AMU_OS_LDFLAGS, -[ -AC_CACHE_CHECK(additional linker flags, -ac_cv_os_ldflags, -[ -case "${host_os}" in - solaris2.7* | sunos5.7* ) - # find LDAP: off until Sun includes ldap headers. - case "${CC}" in - * ) - #ac_cv_os_ldflags="-L/usr/lib/fn" - ;; - esac - ;; - * ) ac_cv_os_ldflags="" ;; -esac -]) -LDFLAGS="$LDFLAGS $ac_cv_os_ldflags" -]) -dnl ====================================================================== diff --git a/contrib/amd/m4/macros/package_bugreport.m4 b/contrib/amd/m4/macros/package_bugreport.m4 deleted file mode 100644 index 1590111..0000000 --- a/contrib/amd/m4/macros/package_bugreport.m4 +++ /dev/null @@ -1,8 +0,0 @@ -dnl ###################################################################### -dnl Bugreport name -AC_DEFUN(AMU_PACKAGE_BUGREPORT, -[AC_MSG_CHECKING(bug-reporting address) -AC_DEFINE_UNQUOTED(PACKAGE_BUGREPORT, "$1") -AC_MSG_RESULT(\"$1\") -]) -dnl ====================================================================== diff --git a/contrib/amd/m4/macros/package_name.m4 b/contrib/amd/m4/macros/package_name.m4 deleted file mode 100644 index 711a8b8..0000000 --- a/contrib/amd/m4/macros/package_name.m4 +++ /dev/null @@ -1,8 +0,0 @@ -dnl ###################################################################### -dnl Package name -AC_DEFUN(AMU_PACKAGE_NAME, -[AC_MSG_CHECKING(package name) -AC_DEFINE_UNQUOTED(PACKAGE_NAME, "$1") -AC_MSG_RESULT(\"$1\") -]) -dnl ====================================================================== diff --git a/contrib/amd/m4/macros/package_version.m4 b/contrib/amd/m4/macros/package_version.m4 deleted file mode 100644 index ec419e0..0000000 --- a/contrib/amd/m4/macros/package_version.m4 +++ /dev/null @@ -1,8 +0,0 @@ -dnl ###################################################################### -dnl Version of package -AC_DEFUN(AMU_PACKAGE_VERSION, -[AC_MSG_CHECKING(version of package) -AC_DEFINE_UNQUOTED(PACKAGE_VERSION, "$1") -AC_MSG_RESULT(\"$1\") -]) -dnl ====================================================================== diff --git a/contrib/amd/m4/macros/save_state.m4 b/contrib/amd/m4/macros/save_state.m4 deleted file mode 100644 index 04cd14b..0000000 --- a/contrib/amd/m4/macros/save_state.m4 +++ /dev/null @@ -1,12 +0,0 @@ -dnl ###################################################################### -dnl AC_SAVE_STATE: save confdefs.h onto dbgcf.h and write $ac_cv_* cache -dnl variables that are known so far. -define(AMU_SAVE_STATE, -AC_MSG_NOTICE(*** SAVING CONFIGURE STATE ***) -if test -f confdefs.h -then - cp confdefs.h dbgcf.h -fi -[AC_CACHE_SAVE] -) -dnl ====================================================================== diff --git a/contrib/amd/m4/macros/struct_field_nfs_fh.m4 b/contrib/amd/m4/macros/struct_field_nfs_fh.m4 deleted file mode 100644 index 33598a7..0000000 --- a/contrib/amd/m4/macros/struct_field_nfs_fh.m4 +++ /dev/null @@ -1,35 +0,0 @@ -dnl ###################################################################### -dnl Find the name of the nfs filehandle field in nfs_args_t. -AC_DEFUN(AMU_STRUCT_FIELD_NFS_FH, -[ -dnl make sure this is called before macros which depend on it -AC_BEFORE([$0], [AC_TYPE_NFS_FH]) -AC_CACHE_CHECK(for the name of the nfs filehandle field in nfs_args_t, -ac_cv_struct_field_nfs_fh, -[ -# set to a default value -ac_cv_struct_field_nfs_fh=notfound -# look for name "fh" (most systems) -if test "$ac_cv_struct_field_nfs_fh" = notfound -then -AC_TRY_COMPILE_NFS( -[ nfs_args_t nat; - char *cp = (char *) &(nat.fh); -], ac_cv_struct_field_nfs_fh=fh, ac_cv_struct_field_nfs_fh=notfound) -fi - -# look for name "root" (for example Linux) -if test "$ac_cv_struct_field_nfs_fh" = notfound -then -AC_TRY_COMPILE_NFS( -[ nfs_args_t nat; - char *cp = (char *) &(nat.root); -], ac_cv_struct_field_nfs_fh=root, ac_cv_struct_field_nfs_fh=notfound) -fi -]) -if test "$ac_cv_struct_field_nfs_fh" != notfound -then - AC_DEFINE_UNQUOTED(NFS_FH_FIELD, $ac_cv_struct_field_nfs_fh) -fi -]) -dnl ====================================================================== diff --git a/contrib/amd/m4/macros/struct_mntent.m4 b/contrib/amd/m4/macros/struct_mntent.m4 deleted file mode 100644 index 221d346..0000000 --- a/contrib/amd/m4/macros/struct_mntent.m4 +++ /dev/null @@ -1,21 +0,0 @@ -dnl ###################################################################### -dnl Find if struct mntent exists anywhere in mount.h or mntent.h headers -AC_DEFUN(AMU_STRUCT_MNTENT, -[ -AC_CACHE_CHECK(for struct mntent, -ac_cv_have_struct_mntent, -[ -# try to compile a program which may have a definition for the structure -AC_TRY_COMPILE( -AMU_MOUNT_HEADERS -, -[ -struct mntent mt; -], ac_cv_have_struct_mntent=yes, ac_cv_have_struct_mntent=no) -]) -if test "$ac_cv_have_struct_mntent" = yes -then - AC_DEFINE(HAVE_STRUCT_MNTENT) -fi -]) -dnl ====================================================================== diff --git a/contrib/amd/m4/macros/struct_mnttab.m4 b/contrib/amd/m4/macros/struct_mnttab.m4 deleted file mode 100644 index 6be529f..0000000 --- a/contrib/amd/m4/macros/struct_mnttab.m4 +++ /dev/null @@ -1,21 +0,0 @@ -dnl ###################################################################### -dnl Find if struct mnttab exists anywhere in mount.h or mnttab.h headers -AC_DEFUN(AMU_STRUCT_MNTTAB, -[ -AC_CACHE_CHECK(for struct mnttab, -ac_cv_have_struct_mnttab, -[ -# try to compile a program which may have a definition for the structure -AC_TRY_COMPILE( -AMU_MOUNT_HEADERS -, -[ -struct mnttab mt; -], ac_cv_have_struct_mnttab=yes, ac_cv_have_struct_mnttab=no) -]) -if test "$ac_cv_have_struct_mnttab" = yes -then - AC_DEFINE(HAVE_STRUCT_MNTTAB) -fi -]) -dnl ====================================================================== diff --git a/contrib/amd/m4/macros/struct_nfs_args.m4 b/contrib/amd/m4/macros/struct_nfs_args.m4 deleted file mode 100644 index 6d74214..0000000 --- a/contrib/amd/m4/macros/struct_nfs_args.m4 +++ /dev/null @@ -1,55 +0,0 @@ -dnl ###################################################################### -dnl Find if struct nfs_args exists anywhere in typical headers -AC_DEFUN(AMU_STRUCT_NFS_ARGS, -[ -dnl make sure this is called before [AC_TYPE_NFS_FH] -AC_BEFORE([$0], [AC_TYPE_NFS_FH]) -AC_BEFORE([$0], [AC_STRUCT_FIELD_NFS_FH]) -AC_CACHE_CHECK(for struct nfs_args, -ac_cv_have_struct_nfs_args, -[ -# try to compile a program which may have a definition for the structure -# assume not found -ac_cv_have_struct_nfs_args=notfound - -# look for "struct irix5_nfs_args" (specially set in conf/nfs_prot/) -if test "$ac_cv_have_struct_nfs_args" = notfound -then -AC_TRY_COMPILE_NFS( -[ struct irix5_nfs_args na; -], ac_cv_have_struct_nfs_args="struct irix5_nfs_args", ac_cv_have_struct_nfs_args=notfound) -fi - -# look for "struct aix51_nfs_args" (specially set in conf/nfs_prot/) -if test "$ac_cv_have_struct_nfs_args" = notfound -then -AC_TRY_COMPILE_NFS( -[ struct aix51_nfs_args na; -], ac_cv_have_struct_nfs_args="struct aix51_nfs_args", ac_cv_have_struct_nfs_args=notfound) -fi - -# look for "struct aix42_nfs_args" (specially set in conf/nfs_prot/) -if test "$ac_cv_have_struct_nfs_args" = notfound -then -AC_TRY_COMPILE_NFS( -[ struct aix42_nfs_args na; -], ac_cv_have_struct_nfs_args="struct aix42_nfs_args", ac_cv_have_struct_nfs_args=notfound) -fi - -# look for "struct nfs_args" -if test "$ac_cv_have_struct_nfs_args" = notfound -then -AC_TRY_COMPILE_NFS( -[ struct nfs_args na; -], ac_cv_have_struct_nfs_args="struct nfs_args", ac_cv_have_struct_nfs_args=notfound) -fi - -]) - -if test "$ac_cv_have_struct_nfs_args" != notfound -then - AC_DEFINE(HAVE_STRUCT_NFS_ARGS) - AC_DEFINE_UNQUOTED(nfs_args_t, $ac_cv_have_struct_nfs_args) -fi -]) -dnl ====================================================================== diff --git a/contrib/amd/m4/macros/struct_nfs_fh.m4 b/contrib/amd/m4/macros/struct_nfs_fh.m4 deleted file mode 100644 index 54ec5d88..0000000 --- a/contrib/amd/m4/macros/struct_nfs_fh.m4 +++ /dev/null @@ -1,63 +0,0 @@ -dnl ###################################################################### -dnl Find the structure of an nfs filehandle. -dnl if found, defined am_nfs_fh to it, else leave it undefined. -dnl THE ORDER OF LOOKUPS IN THIS FILE IS VERY IMPORTANT!!! -AC_DEFUN(AMU_STRUCT_NFS_FH, -[ -AC_CACHE_CHECK(for type/structure of NFS V2 filehandle, -ac_cv_struct_nfs_fh, -[ -# try to compile a program which may have a definition for the type -dnl need a series of compilations, which will test out every possible type -dnl such as struct nfs_fh, fhandle_t, nfsv2fh_t, etc. -# set to a default value -ac_cv_struct_nfs_fh=notfound - -# look for "nfs_fh" -if test "$ac_cv_struct_nfs_fh" = notfound -then -AC_TRY_COMPILE_NFS( -[ nfs_fh nh; -], ac_cv_struct_nfs_fh="nfs_fh", ac_cv_struct_nfs_fh=notfound) -fi - -# look for "struct nfs_fh" -if test "$ac_cv_struct_nfs_fh" = notfound -then -AC_TRY_COMPILE_NFS( -[ struct nfs_fh nh; -], ac_cv_struct_nfs_fh="struct nfs_fh", ac_cv_struct_nfs_fh=notfound) -fi - -# look for "struct nfssvcfh" -if test "$ac_cv_struct_nfs_fh" = notfound -then -AC_TRY_COMPILE_NFS( -[ struct nfssvcfh nh; -], ac_cv_struct_nfs_fh="struct nfssvcfh", ac_cv_struct_nfs_fh=notfound) -fi - -# look for "nfsv2fh_t" -if test "$ac_cv_struct_nfs_fh" = notfound -then -AC_TRY_COMPILE_NFS( -[ nfsv2fh_t nh; -], ac_cv_struct_nfs_fh="nfsv2fh_t", ac_cv_struct_nfs_fh=notfound) -fi - -# look for "fhandle_t" -if test "$ac_cv_struct_nfs_fh" = notfound -then -AC_TRY_COMPILE_NFS( -[ fhandle_t nh; -], ac_cv_struct_nfs_fh="fhandle_t", ac_cv_struct_nfs_fh=notfound) -fi - -]) - -if test "$ac_cv_struct_nfs_fh" != notfound -then - AC_DEFINE_UNQUOTED(am_nfs_fh, $ac_cv_struct_nfs_fh) -fi -]) -dnl ====================================================================== diff --git a/contrib/amd/m4/macros/struct_nfs_fh3.m4 b/contrib/amd/m4/macros/struct_nfs_fh3.m4 deleted file mode 100644 index aa87eb8..0000000 --- a/contrib/amd/m4/macros/struct_nfs_fh3.m4 +++ /dev/null @@ -1,62 +0,0 @@ -dnl ###################################################################### -dnl Find the structure of an NFS V3 filehandle. -dnl if found, defined am_nfs_fh3 to it, else leave it undefined. -AC_DEFUN(AMU_STRUCT_NFS_FH3, -[ -AC_CACHE_CHECK(for type/structure of NFS V3 filehandle, -ac_cv_struct_nfs_fh3, -[ -# try to compile a program which may have a definition for the type -dnl need a series of compilations, which will test out every possible type -dnl such as struct nfs_fh3, fhandle3_t, nfsv3fh_t, etc. -# set to a default value -ac_cv_struct_nfs_fh3=notfound - -# look for "nfs_fh3_freebsd3" -if test "$ac_cv_struct_nfs_fh3" = notfound -then -AC_TRY_COMPILE_NFS( -[ nfs_fh3_freebsd3 nh; -], ac_cv_struct_nfs_fh3="nfs_fh3_freebsd3", ac_cv_struct_nfs_fh3=notfound) -fi - -# look for "nfs_fh3" -if test "$ac_cv_struct_nfs_fh3" = notfound -then -AC_TRY_COMPILE_NFS( -[ nfs_fh3 nh; -], ac_cv_struct_nfs_fh3="nfs_fh3", ac_cv_struct_nfs_fh3=notfound) -fi - -# look for "struct nfs_fh3" -if test "$ac_cv_struct_nfs_fh3" = notfound -then -AC_TRY_COMPILE_NFS( -[ struct nfs_fh3 nh; -], ac_cv_struct_nfs_fh3="struct nfs_fh3", ac_cv_struct_nfs_fh3=notfound) -fi - -# look for "nfsv3fh_t" -if test "$ac_cv_struct_nfs_fh3" = notfound -then -AC_TRY_COMPILE_NFS( -[ nfsv3fh_t nh; -], ac_cv_struct_nfs_fh3="nfsv3fh_t", ac_cv_struct_nfs_fh3=notfound) -fi - -# look for "fhandle3_t" -if test "$ac_cv_struct_nfs_fh3" = notfound -then -AC_TRY_COMPILE_NFS( -[ fhandle3_t nh; -], ac_cv_struct_nfs_fh3="fhandle3_t", ac_cv_struct_nfs_fh3=notfound) -fi - -]) - -if test "$ac_cv_struct_nfs_fh3" != notfound -then - AC_DEFINE_UNQUOTED(am_nfs_fh3, $ac_cv_struct_nfs_fh3) -fi -]) -dnl ====================================================================== diff --git a/contrib/amd/m4/macros/struct_nfs_gfs_mount.m4 b/contrib/amd/m4/macros/struct_nfs_gfs_mount.m4 deleted file mode 100644 index 9a05304..0000000 --- a/contrib/amd/m4/macros/struct_nfs_gfs_mount.m4 +++ /dev/null @@ -1,22 +0,0 @@ -dnl ###################################################################### -dnl Find if struct nfs_gfs_mount exists anywhere in typical headers -AC_DEFUN(AMU_STRUCT_NFS_GFS_MOUNT, -[ -dnl make sure this is called before [AC_TYPE_NFS_FH] -AC_BEFORE([$0], [AC_TYPE_NFS_FH]) -AC_BEFORE([$0], [AC_STRUCT_FIELD_NFS_FH]) -AC_CACHE_CHECK(for struct nfs_gfs_mount, -ac_cv_have_struct_nfs_gfs_mount, -[ -# try to compile a program which may have a definition for the structure -AC_TRY_COMPILE_NFS( -[ struct nfs_gfs_mount ngm; -], ac_cv_have_struct_nfs_gfs_mount=yes, ac_cv_have_struct_nfs_gfs_mount=no) -]) -if test "$ac_cv_have_struct_nfs_gfs_mount" = yes -then - AC_DEFINE(HAVE_STRUCT_NFS_GFS_MOUNT) - AC_DEFINE(nfs_args_t, struct nfs_gfs_mount) -fi -]) -dnl ====================================================================== diff --git a/contrib/amd/m4/macros/try_compile_anyfs.m4 b/contrib/amd/m4/macros/try_compile_anyfs.m4 deleted file mode 100644 index d8486f7..0000000 --- a/contrib/amd/m4/macros/try_compile_anyfs.m4 +++ /dev/null @@ -1,172 +0,0 @@ -dnl ###################################################################### -dnl Compile a program with FS headers to try and find a feature. -dnl The headers part are fixed. Only three arguments are allowed: -dnl [$1] is the program to compile (2nd arg to AC_TRY_COMPILE) -dnl [$2] action to take if the program compiled (3rd arg to AC_TRY_COMPILE) -dnl [$3] action to take if program did not compile (4rd arg to AC_TRY_COMPILE) -AC_DEFUN(AC_TRY_COMPILE_ANYFS, -[# try to compile a program which may have a definition for a structure -AC_TRY_COMPILE( -[ -#ifdef HAVE_SYS_TYPES_H -# include -#endif /* HAVE_SYS_TYPES_H */ -#ifdef HAVE_SYS_ERRNO_H -# include -#endif /* HAVE_SYS_ERRNO_H */ -#ifdef HAVE_SYS_PARAM_H -# include -#endif /* HAVE_SYS_PARAM_H */ - -#if TIME_WITH_SYS_TIME -# include -# include -#else /* not TIME_WITH_SYS_TIME */ -# if HAVE_SYS_TIME_H -# include -# else /* not HAVE_SYS_TIME_H */ -# include -# endif /* not HAVE_SYS_TIME_H */ -#endif /* not TIME_WITH_SYS_TIME */ - -#ifdef HAVE_NETINET_IN_H -# include -#endif /* HAVE_NETINET_IN_H */ -#ifdef HAVE_SYS_TIUSER_H -# include -#endif /* HAVE_SYS_TIUSER_H */ - -#ifdef HAVE_SYS_MOUNT_H -# ifndef NFSCLIENT -# define NFSCLIENT -# endif /* not NFSCLIENT */ -# ifndef PCFS -# define PCFS -# endif /* not PCFS */ -# ifndef LOFS -# define LOFS -# endif /* not LOFS */ -# ifndef RFS -# define RFS -# endif /* not RFS */ -# ifndef MSDOSFS -# define MSDOSFS -# endif /* not MSDOSFS */ -# ifndef MFS -# define MFS 1 -# endif /* not MFS */ -# ifndef CD9660 -# define CD9660 -# endif /* not CD9660 */ -# ifndef NFS -# define NFS -# endif /* not NFS */ -# include -#endif /* HAVE_SYS_MOUNT_H */ - -#ifdef HAVE_SYS_VMOUNT_H -# include -#endif /* HAVE_SYS_VMOUNT_H */ - -/* - * There is no point in including this on a glibc2 system - * we're only asking for trouble - */ -#if defined HAVE_LINUX_FS_H && (!defined __GLIBC__ || __GLIBC__ < 2) -/* - * There's a conflict of definitions on redhat alpha linux between - * and . - * Also a conflict in definitions of ntohl/htonl in RH-5.1 sparc64 - * between and (2.1 kernels). - */ -# ifdef HAVE_SOCKETBITS_H -# define _LINUX_SOCKET_H -# undef BLKFLSBUF -# undef BLKGETSIZE -# undef BLKRAGET -# undef BLKRASET -# undef BLKROGET -# undef BLKROSET -# undef BLKRRPART -# undef MS_MGC_VAL -# undef MS_RMT_MASK -# endif /* HAVE_SOCKETBITS_H */ -# ifdef HAVE_LINUX_POSIX_TYPES_H -# include -# endif /* HAVE_LINUX_POSIX_TYPES_H */ -# ifndef _LINUX_BYTEORDER_GENERIC_H -# define _LINUX_BYTEORDER_GENERIC_H -# endif /* _LINUX_BYTEORDER_GENERIC_H */ -# ifndef _LINUX_STRING_H_ -# define _LINUX_STRING_H_ -# endif /* not _LINUX_STRING_H_ */ -# ifdef HAVE_LINUX_KDEV_T_H -# define __KERNEL__ -# include -# undef __KERNEL__ -# endif /* HAVE_LINUX_KDEV_T_H */ -# ifdef HAVE_LINUX_LIST_H -# define __KERNEL__ -# include -# undef __KERNEL__ -# endif /* HAVE_LINUX_LIST_H */ -# include -#endif /* HAVE_LINUX_FS_H && (!__GLIBC__ || __GLIBC__ < 2) */ - -#ifdef HAVE_SYS_FS_AUTOFS_H -# include -#endif /* HAVE_SYS_FS_AUTOFS_H */ -#ifdef HAVE_SYS_FS_CACHEFS_FS_H -# include -#endif /* HAVE_SYS_FS_CACHEFS_FS_H */ - -#ifdef HAVE_SYS_FS_PC_FS_H -# include -#endif /* HAVE_SYS_FS_PC_FS_H */ -#ifdef HAVE_MSDOSFS_MSDOSFSMOUNT_H -# include -#endif /* HAVE_MSDOSFS_MSDOSFSMOUNT_H */ - -#ifdef HAVE_SYS_FS_TMP_H -# include -#endif /* HAVE_SYS_FS_TMP_H */ - -#ifdef HAVE_UFS_UFS_MOUNT_H -# include -#endif /* HAVE_UFS_UFS_MOUNT_H */ -#ifdef HAVE_UFS_UFS_UFSMOUNT_H -# ifndef MAXQUOTAS -# define MAXQUOTAS 2 -# endif /* not MAXQUOTAS */ -struct netexport { int this_is_SO_wrong; }; /* for bsdi-2.1 */ -/* netbsd-1.4 does't protect */ -# ifndef _UFS_UFS_UFSMOUNT_H -# include -# define _UFS_UFS_UFSMOUNT_H -# endif /* not _UFS_UFS_UFSMOUNT_H */ -#endif /* HAVE_UFS_UFS_UFSMOUNT_H */ -#ifdef HAVE_SYS_FS_UFS_MOUNT_H -# include -#endif /* HAVE_SYS_FS_UFS_MOUNT_H */ -#ifdef HAVE_SYS_FS_EFS_CLNT_H -# include -#endif /* HAVE_SYS_FS_EFS_CLNT_H */ -#ifdef HAVE_SYS_FS_XFS_CLNT_H -# include -#endif /* HAVE_SYS_FS_XFS_CLNT_H */ - -#ifdef HAVE_CDFS_CDFS_MOUNT_H -# include -#endif /* HAVE_CDFS_CDFS_MOUNT_H */ -#ifdef HAVE_HSFS_HSFS_H -# include -#endif /* HAVE_HSFS_HSFS_H */ -#ifdef HAVE_CDFS_CDFSMOUNT_H -# include -#endif /* HAVE_CDFS_CDFSMOUNT_H */ -#ifdef HAVE_ISOFS_CD9660_CD9660_MOUNT_H -# include -#endif /* HAVE_ISOFS_CD9660_CD9660_MOUNT_H */ -], [$1], [$2], [$3]) -]) -dnl ====================================================================== diff --git a/contrib/amd/m4/macros/try_compile_nfs.m4 b/contrib/amd/m4/macros/try_compile_nfs.m4 deleted file mode 100644 index f81aab0..0000000 --- a/contrib/amd/m4/macros/try_compile_nfs.m4 +++ /dev/null @@ -1,13 +0,0 @@ -dnl ###################################################################### -dnl Compile a program with NFS headers to try and find a feature. -dnl The headers part are fixed. Only three arguments are allowed: -dnl [$1] is the program to compile (2nd arg to AC_TRY_COMPILE) -dnl [$2] action to take if the program compiled (3rd arg to AC_TRY_COMPILE) -dnl [$3] action to take if program did not compile (4rd arg to AC_TRY_COMPILE) -AC_DEFUN(AC_TRY_COMPILE_NFS, -[# try to compile a program which may have a definition for a structure -AC_TRY_COMPILE( -AMU_MOUNT_HEADERS -, [$1], [$2], [$3]) -]) -dnl ====================================================================== diff --git a/contrib/amd/m4/macros/try_compile_rpc.m4 b/contrib/amd/m4/macros/try_compile_rpc.m4 deleted file mode 100644 index 17b3f4c..0000000 --- a/contrib/amd/m4/macros/try_compile_rpc.m4 +++ /dev/null @@ -1,23 +0,0 @@ -dnl ###################################################################### -dnl Compile a program with RPC headers to try and find a feature. -dnl The headers part are fixed. Only three arguments are allowed: -dnl [$1] is the program to compile (2nd arg to AC_TRY_COMPILE) -dnl [$2] action to take if the program compiled (3rd arg to AC_TRY_COMPILE) -dnl [$3] action to take if program did not compile (4rd arg to AC_TRY_COMPILE) -AC_DEFUN(AC_TRY_COMPILE_RPC, -[# try to compile a program which may have a definition for a structure -AC_TRY_COMPILE( -[ -#ifdef HAVE_SYS_TYPES_H -# include -#endif /* HAVE_SYS_TYPES_H */ -#ifdef HAVE_RPC_RPC_H -# include -#endif /* HAVE_RPC_RPC_H */ -/* Prevent multiple inclusion on Ultrix 4 */ -#if defined(HAVE_RPC_XDR_H) && !defined(__XDR_HEADER__) -# include -#endif /* defined(HAVE_RPC_XDR_H) && !defined(__XDR_HEADER__) */ -], [$1], [$2], [$3]) -]) -dnl ====================================================================== diff --git a/contrib/amd/m4/macros/type_auth_create_gidlist.m4 b/contrib/amd/m4/macros/type_auth_create_gidlist.m4 deleted file mode 100644 index 357c120..0000000 --- a/contrib/amd/m4/macros/type_auth_create_gidlist.m4 +++ /dev/null @@ -1,18 +0,0 @@ -dnl ###################################################################### -dnl check the correct type for the 5th argument to authunix_create() -AC_DEFUN(AMU_TYPE_AUTH_CREATE_GIDLIST, -[ -AC_CACHE_CHECK(argument type of 5rd argument to authunix_create(), -ac_cv_auth_create_gidlist, -[ -# select the correct type -case "${host_os_name}" in - sunos[[34]]* | bsdi2* | sysv4* | hpux10.10 | ultrix* | aix4* ) - ac_cv_auth_create_gidlist="int" ;; - * ) - ac_cv_auth_create_gidlist="gid_t" ;; -esac -]) -AC_DEFINE_UNQUOTED(AUTH_CREATE_GIDLIST_TYPE, $ac_cv_auth_create_gidlist) -]) -dnl ====================================================================== diff --git a/contrib/amd/m4/macros/type_cachefs_args.m4 b/contrib/amd/m4/macros/type_cachefs_args.m4 deleted file mode 100644 index 9f57b46..0000000 --- a/contrib/amd/m4/macros/type_cachefs_args.m4 +++ /dev/null @@ -1,23 +0,0 @@ -dnl ###################################################################### -dnl Find the correct type for CACHEFS mount(2) arguments structure -AC_DEFUN(AMU_TYPE_CACHEFS_ARGS, -[ -AC_CACHE_CHECK(for structure type of cachefs mount(2) arguments, -ac_cv_type_cachefs_args, -[ -# set to a default value -ac_cv_type_cachefs_args=notfound -# look for "struct cachefs_mountargs" -if test "$ac_cv_type_cachefs_args" = notfound -then -AC_TRY_COMPILE_ANYFS( -[ struct cachefs_mountargs a; -], ac_cv_type_cachefs_args="struct cachefs_mountargs", ac_cv_type_cachefs_args=notfound) -fi -]) -if test "$ac_cv_type_cachefs_args" != notfound -then - AC_DEFINE_UNQUOTED(cachefs_args_t, $ac_cv_type_cachefs_args) -fi -]) -dnl ====================================================================== diff --git a/contrib/amd/m4/macros/type_cdfs_args.m4 b/contrib/amd/m4/macros/type_cdfs_args.m4 deleted file mode 100644 index 881d56b..0000000 --- a/contrib/amd/m4/macros/type_cdfs_args.m4 +++ /dev/null @@ -1,57 +0,0 @@ -dnl ###################################################################### -dnl Find the correct type for CDFS mount(2) arguments structure -AC_DEFUN(AMU_TYPE_CDFS_ARGS, -[ -AC_CACHE_CHECK(for structure type of cdfs mount(2) arguments, -ac_cv_type_cdfs_args, -[ -# set to a default value -ac_cv_type_cdfs_args=notfound - -# look for "struct iso_args" -if test "$ac_cv_type_cdfs_args" = notfound -then -AC_TRY_COMPILE_ANYFS( -[ struct iso_args a; -], ac_cv_type_cdfs_args="struct iso_args", ac_cv_type_cdfs_args=notfound) -fi - -# look for "struct iso9660_args" -if test "$ac_cv_type_cdfs_args" = notfound -then -AC_TRY_COMPILE_ANYFS( -[ struct iso9660_args a; -], ac_cv_type_cdfs_args="struct iso9660_args", ac_cv_type_cdfs_args=notfound) -fi - -# look for "struct cdfs_args" -if test "$ac_cv_type_cdfs_args" = notfound -then -AC_TRY_COMPILE_ANYFS( -[ struct cdfs_args a; -], ac_cv_type_cdfs_args="struct cdfs_args", ac_cv_type_cdfs_args=notfound) -fi - -# look for "struct hsfs_args" -if test "$ac_cv_type_cdfs_args" = notfound -then -AC_TRY_COMPILE_ANYFS( -[ struct hsfs_args a; -], ac_cv_type_cdfs_args="struct hsfs_args", ac_cv_type_cdfs_args=notfound) -fi - -# look for "struct iso_specific" (ultrix) -if test "$ac_cv_type_cdfs_args" = notfound -then -AC_TRY_COMPILE_ANYFS( -[ struct iso_specific a; -], ac_cv_type_cdfs_args="struct iso_specific", ac_cv_type_cdfs_args=notfound) -fi - -]) -if test "$ac_cv_type_cdfs_args" != notfound -then - AC_DEFINE_UNQUOTED(cdfs_args_t, $ac_cv_type_cdfs_args) -fi -]) -dnl ====================================================================== diff --git a/contrib/amd/m4/macros/type_efs_args.m4 b/contrib/amd/m4/macros/type_efs_args.m4 deleted file mode 100644 index 8a2e662..0000000 --- a/contrib/amd/m4/macros/type_efs_args.m4 +++ /dev/null @@ -1,25 +0,0 @@ -dnl ###################################################################### -dnl Find the correct type for EFS mount(2) arguments structure -AC_DEFUN(AMU_TYPE_EFS_ARGS, -[ -AC_CACHE_CHECK(for structure type of efs mount(2) arguments, -ac_cv_type_efs_args, -[ -# set to a default value -ac_cv_type_efs_args=notfound - -# look for "struct efs_args" -if test "$ac_cv_type_efs_args" = notfound -then -AC_TRY_COMPILE_ANYFS( -[ struct efs_args a; -], ac_cv_type_efs_args="struct efs_args", ac_cv_type_efs_args=notfound) -fi - -]) -if test "$ac_cv_type_efs_args" != notfound -then - AC_DEFINE_UNQUOTED(efs_args_t, $ac_cv_type_efs_args) -fi -]) -dnl ====================================================================== diff --git a/contrib/amd/m4/macros/type_lofs_args.m4 b/contrib/amd/m4/macros/type_lofs_args.m4 deleted file mode 100644 index e04c551..0000000 --- a/contrib/amd/m4/macros/type_lofs_args.m4 +++ /dev/null @@ -1,30 +0,0 @@ -dnl ###################################################################### -dnl Find the correct type for LOFS mount(2) arguments structure -AC_DEFUN(AMU_TYPE_LOFS_ARGS, -[ -AC_CACHE_CHECK(for structure type of lofs mount(2) arguments, -ac_cv_type_lofs_args, -[ -# set to a default value -ac_cv_type_lofs_args=notfound -# look for "struct lofs_args" -if test "$ac_cv_type_lofs_args" = notfound -then -AC_TRY_COMPILE_ANYFS( -[ struct lofs_args a; -], ac_cv_type_lofs_args="struct lofs_args", ac_cv_type_lofs_args=notfound) -fi -# look for "struct lo_args" -if test "$ac_cv_type_lofs_args" = notfound -then -AC_TRY_COMPILE_ANYFS( -[ struct lo_args a; -], ac_cv_type_lofs_args="struct lo_args", ac_cv_type_lofs_args=notfound) -fi -]) -if test "$ac_cv_type_lofs_args" != notfound -then - AC_DEFINE_UNQUOTED(lofs_args_t, $ac_cv_type_lofs_args) -fi -]) -dnl ====================================================================== diff --git a/contrib/amd/m4/macros/type_mfs_args.m4 b/contrib/amd/m4/macros/type_mfs_args.m4 deleted file mode 100644 index 774ad3c..0000000 --- a/contrib/amd/m4/macros/type_mfs_args.m4 +++ /dev/null @@ -1,23 +0,0 @@ -dnl ###################################################################### -dnl Find the correct type for MFS mount(2) arguments structure -AC_DEFUN(AMU_TYPE_MFS_ARGS, -[ -AC_CACHE_CHECK(for structure type of mfs mount(2) arguments, -ac_cv_type_mfs_args, -[ -# set to a default value -ac_cv_type_mfs_args=notfound -# look for "struct mfs_args" -if test "$ac_cv_type_mfs_args" = notfound -then -AC_TRY_COMPILE_ANYFS( -[ struct mfs_args a; -], ac_cv_type_mfs_args="struct mfs_args", ac_cv_type_mfs_args=notfound) -fi -]) -if test "$ac_cv_type_mfs_args" != notfound -then - AC_DEFINE_UNQUOTED(mfs_args_t, $ac_cv_type_mfs_args) -fi -]) -dnl ====================================================================== diff --git a/contrib/amd/m4/macros/type_pcfs_args.m4 b/contrib/amd/m4/macros/type_pcfs_args.m4 deleted file mode 100644 index c074bdb..0000000 --- a/contrib/amd/m4/macros/type_pcfs_args.m4 +++ /dev/null @@ -1,50 +0,0 @@ -dnl ###################################################################### -dnl Find the correct type for PC/FS mount(2) arguments structure -AC_DEFUN(AMU_TYPE_PCFS_ARGS, -[ -AC_CACHE_CHECK(for structure type of pcfs mount(2) arguments, -ac_cv_type_pcfs_args, -[ -# set to a default value -ac_cv_type_pcfs_args=notfound - -# look for "struct msdos_args" -if test "$ac_cv_type_pcfs_args" = notfound -then -AC_TRY_COMPILE_ANYFS( -[ struct msdos_args a; -], ac_cv_type_pcfs_args="struct msdos_args", ac_cv_type_pcfs_args=notfound) -fi - -# look for "struct pc_args" -if test "$ac_cv_type_pcfs_args" = notfound -then -AC_TRY_COMPILE_ANYFS( -[ struct pc_args a; -], ac_cv_type_pcfs_args="struct pc_args", ac_cv_type_pcfs_args=notfound) -fi - -# look for "struct pcfs_args" -if test "$ac_cv_type_pcfs_args" = notfound -then -AC_TRY_COMPILE_ANYFS( -[ struct pcfs_args a; -], ac_cv_type_pcfs_args="struct pcfs_args", ac_cv_type_pcfs_args=notfound) -fi - -# look for "struct msdosfs_args" -if test "$ac_cv_type_pcfs_args" = notfound -then -AC_TRY_COMPILE_ANYFS( -[ struct msdosfs_args a; -], ac_cv_type_pcfs_args="struct msdosfs_args", ac_cv_type_pcfs_args=notfound) -fi - -]) - -if test "$ac_cv_type_pcfs_args" != notfound -then - AC_DEFINE_UNQUOTED(pcfs_args_t, $ac_cv_type_pcfs_args) -fi -]) -dnl ====================================================================== diff --git a/contrib/amd/m4/macros/type_recvfrom_fromlen.m4 b/contrib/amd/m4/macros/type_recvfrom_fromlen.m4 deleted file mode 100644 index 4c0985b..0000000 --- a/contrib/amd/m4/macros/type_recvfrom_fromlen.m4 +++ /dev/null @@ -1,20 +0,0 @@ -dnl ###################################################################### -dnl check the correct type for the 6th argument to recvfrom() -AC_DEFUN(AMU_TYPE_RECVFROM_FROMLEN, -[ -AC_CACHE_CHECK(non-pointer type of 6th (fromlen) argument to recvfrom(), -ac_cv_recvfrom_fromlen, -[ -# select the correct type -case "${host_os}" in - aix[[1-3]]* ) - ac_cv_recvfrom_fromlen="int" ;; - aix* ) - ac_cv_recvfrom_fromlen="size_t" ;; - * ) - ac_cv_recvfrom_fromlen="int" ;; -esac -]) -AC_DEFINE_UNQUOTED(RECVFROM_FROMLEN_TYPE, $ac_cv_recvfrom_fromlen) -]) -dnl ====================================================================== diff --git a/contrib/amd/m4/macros/type_rfs_args.m4 b/contrib/amd/m4/macros/type_rfs_args.m4 deleted file mode 100644 index 6a58fca..0000000 --- a/contrib/amd/m4/macros/type_rfs_args.m4 +++ /dev/null @@ -1,23 +0,0 @@ -dnl ###################################################################### -dnl Find the correct type for RFS mount(2) arguments structure -AC_DEFUN(AMU_TYPE_RFS_ARGS, -[ -AC_CACHE_CHECK(for structure type of rfs mount(2) arguments, -ac_cv_type_rfs_args, -[ -# set to a default value -ac_cv_type_rfs_args=notfound -# look for "struct rfs_args" -if test "$ac_cv_type_rfs_args" = notfound -then -AC_TRY_COMPILE_ANYFS( -[ struct rfs_args a; -], ac_cv_type_rfs_args="struct rfs_args", ac_cv_type_rfs_args=notfound) -fi -]) -if test "$ac_cv_type_rfs_args" != notfound -then - AC_DEFINE_UNQUOTED(rfs_args_t, $ac_cv_type_rfs_args) -fi -]) -dnl ====================================================================== diff --git a/contrib/amd/m4/macros/type_svc_in_arg.m4 b/contrib/amd/m4/macros/type_svc_in_arg.m4 deleted file mode 100644 index 33a80a4..0000000 --- a/contrib/amd/m4/macros/type_svc_in_arg.m4 +++ /dev/null @@ -1,39 +0,0 @@ -dnl ###################################################################### -dnl Find the type of the 3rd argument (in) to svc_sendreply() call -AC_DEFUN(AMU_TYPE_SVC_IN_ARG, -[ -AC_CACHE_CHECK(for type of 3rd arg ('in') arg to svc_sendreply(), -ac_cv_type_svc_in_arg, -[ -# try to compile a program which may have a definition for the type -dnl need a series of compilations, which will test out every possible type -dnl such as caddr_t, char *, etc. -# set to a default value -ac_cv_type_svc_in_arg=notfound -# look for "caddr_t" -if test "$ac_cv_type_svc_in_arg" = notfound -then -AC_TRY_COMPILE_RPC( -[ SVCXPRT *SX; - xdrproc_t xp; - caddr_t p; - svc_sendreply(SX, xp, p); -], ac_cv_type_svc_in_arg="caddr_t", ac_cv_type_svc_in_arg=notfound) -fi -# look for "char *" -if test "$ac_cv_type_svc_in_arg" = notfound -then -AC_TRY_COMPILE_RPC( -[ SVCXPRT *SX; - xdrproc_t xp; - char *p; - svc_sendreply(SX, xp, p); -], ac_cv_type_svc_in_arg="char *", ac_cv_type_svc_in_arg=notfound) -fi -]) -if test "$ac_cv_type_svc_in_arg" != notfound -then - AC_DEFINE_UNQUOTED(SVC_IN_ARG_TYPE, $ac_cv_type_svc_in_arg) -fi -]) -dnl ====================================================================== diff --git a/contrib/amd/m4/macros/type_time_t.m4 b/contrib/amd/m4/macros/type_time_t.m4 deleted file mode 100644 index 2571338..0000000 --- a/contrib/amd/m4/macros/type_time_t.m4 +++ /dev/null @@ -1,5 +0,0 @@ -dnl ###################################################################### -dnl check for type of time_t (usually in ) -AC_DEFUN(AMU_TYPE_TIME_T, -[AC_CHECK_TYPE(time_t, long)]) -dnl ====================================================================== diff --git a/contrib/amd/m4/macros/type_tmpfs_args.m4 b/contrib/amd/m4/macros/type_tmpfs_args.m4 deleted file mode 100644 index 7938352..0000000 --- a/contrib/amd/m4/macros/type_tmpfs_args.m4 +++ /dev/null @@ -1,23 +0,0 @@ -dnl ###################################################################### -dnl Find the correct type for TMPFS mount(2) arguments structure -AC_DEFUN(AMU_TYPE_TMPFS_ARGS, -[ -AC_CACHE_CHECK(for structure type of tmpfs mount(2) arguments, -ac_cv_type_tmpfs_args, -[ -# set to a default value -ac_cv_type_tmpfs_args=notfound -# look for "struct tmpfs_args" -if test "$ac_cv_type_tmpfs_args" = notfound -then -AC_TRY_COMPILE_ANYFS( -[ struct tmpfs_args a; -], ac_cv_type_tmpfs_args="struct tmpfs_args", ac_cv_type_tmpfs_args=notfound) -fi -]) -if test "$ac_cv_type_tmpfs_args" != notfound -then - AC_DEFINE_UNQUOTED(tmpfs_args_t, $ac_cv_type_tmpfs_args) -fi -]) -dnl ====================================================================== diff --git a/contrib/amd/m4/macros/type_ufs_args.m4 b/contrib/amd/m4/macros/type_ufs_args.m4 deleted file mode 100644 index 2f048f9..0000000 --- a/contrib/amd/m4/macros/type_ufs_args.m4 +++ /dev/null @@ -1,41 +0,0 @@ -dnl ###################################################################### -dnl Find the correct type for UFS mount(2) arguments structure -AC_DEFUN(AMU_TYPE_UFS_ARGS, -[ -AC_CACHE_CHECK(for structure type of ufs mount(2) arguments, -ac_cv_type_ufs_args, -[ -# set to a default value -ac_cv_type_ufs_args=notfound - -# look for "struct ufs_args" -if test "$ac_cv_type_ufs_args" = notfound -then -AC_TRY_COMPILE_ANYFS( -[ struct ufs_args a; -], ac_cv_type_ufs_args="struct ufs_args", ac_cv_type_ufs_args=notfound) -fi - -# look for "struct efs_args" (irix) -if test "$ac_cv_type_ufs_args" = notfound -then -AC_TRY_COMPILE_ANYFS( -[ struct efs_args a; -], ac_cv_type_ufs_args="struct efs_args", ac_cv_type_ufs_args=notfound) -fi - -# look for "struct ufs_specific" (ultrix) -if test "$ac_cv_type_ufs_args" = notfound -then -AC_TRY_COMPILE_ANYFS( -[ struct ufs_specific a; -], ac_cv_type_ufs_args="struct ufs_specific", ac_cv_type_ufs_args=notfound) -fi - -]) -if test "$ac_cv_type_ufs_args" != notfound -then - AC_DEFINE_UNQUOTED(ufs_args_t, $ac_cv_type_ufs_args) -fi -]) -dnl ====================================================================== diff --git a/contrib/amd/m4/macros/type_xdrproc_t.m4 b/contrib/amd/m4/macros/type_xdrproc_t.m4 deleted file mode 100644 index 7f5220b..0000000 --- a/contrib/amd/m4/macros/type_xdrproc_t.m4 +++ /dev/null @@ -1,20 +0,0 @@ -dnl ###################################################################### -dnl check for type of xdrproc_t (usually in ) -AC_DEFUN(AMU_TYPE_XDRPROC_T, -[ -AC_CACHE_CHECK(for xdrproc_t, -ac_cv_type_xdrproc_t, -[ -# try to compile a program which may have a definition for the type -dnl need a series of compilations, which will test out every possible type -# look for "xdrproc_t" -AC_TRY_COMPILE_RPC( -[ xdrproc_t xdr_int; -], ac_cv_type_xdrproc_t=yes, ac_cv_type_xdrproc_t=no) -]) -if test "$ac_cv_type_xdrproc_t" = yes -then - AC_DEFINE_UNQUOTED(XDRPROC_T_TYPE, xdrproc_t) -fi -]) -dnl ====================================================================== diff --git a/contrib/amd/m4/macros/type_xfs_args.m4 b/contrib/amd/m4/macros/type_xfs_args.m4 deleted file mode 100644 index 8397a98..0000000 --- a/contrib/amd/m4/macros/type_xfs_args.m4 +++ /dev/null @@ -1,25 +0,0 @@ -dnl ###################################################################### -dnl Find the correct type for XFS mount(2) arguments structure -AC_DEFUN(AMU_TYPE_XFS_ARGS, -[ -AC_CACHE_CHECK(for structure type of xfs mount(2) arguments, -ac_cv_type_xfs_args, -[ -# set to a default value -ac_cv_type_xfs_args=notfound - -# look for "struct xfs_args" -if test "$ac_cv_type_xfs_args" = notfound -then -AC_TRY_COMPILE_ANYFS( -[ struct xfs_args a; -], ac_cv_type_xfs_args="struct xfs_args", ac_cv_type_xfs_args=notfound) -fi - -]) -if test "$ac_cv_type_xfs_args" != notfound -then - AC_DEFINE_UNQUOTED(xfs_args_t, $ac_cv_type_xfs_args) -fi -]) -dnl ====================================================================== diff --git a/contrib/amd/m4/macros/type_yp_order_outorder.m4 b/contrib/amd/m4/macros/type_yp_order_outorder.m4 deleted file mode 100644 index 8d196b0..0000000 --- a/contrib/amd/m4/macros/type_yp_order_outorder.m4 +++ /dev/null @@ -1,23 +0,0 @@ -dnl ###################################################################### -dnl check the correct type for the 3rd argument to yp_order() -AC_DEFUN(AMU_TYPE_YP_ORDER_OUTORDER, -[ -AC_CACHE_CHECK(pointer type of 3rd argument to yp_order(), -ac_cv_yp_order_outorder, -[ -# select the correct type -case "${host_os}" in - aix[[1-3]]* | aix4.[[0-2]]* | sunos[[34]]* | solaris1* ) - ac_cv_yp_order_outorder=int ;; - solaris* | svr4* | sysv4* | sunos* | hpux* | aix* ) - ac_cv_yp_order_outorder="unsigned long" ;; - osf* ) - # DU4 man page is wrong, headers are right - ac_cv_yp_order_outorder="unsigned int" ;; - * ) - ac_cv_yp_order_outorder=int ;; -esac -]) -AC_DEFINE_UNQUOTED(YP_ORDER_OUTORDER_TYPE, $ac_cv_yp_order_outorder) -]) -dnl ====================================================================== diff --git a/contrib/amd/m4/macros/with_addon.m4 b/contrib/amd/m4/macros/with_addon.m4 deleted file mode 100644 index 21489b1..0000000 --- a/contrib/amd/m4/macros/with_addon.m4 +++ /dev/null @@ -1,26 +0,0 @@ -dnl ###################################################################### -dnl Do we want to compile with "ADDON" support? (hesiod, ldap, etc.) -AC_DEFUN(AMU_WITH_ADDON, -[AC_MSG_CHECKING([if $1 is wanted]) -ac_upcase=`echo $1|tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` -AC_ARG_WITH($1, - AC_HELP_STRING([--with-$1], - [enable $2 support (default=yes if found)] -),[ -if test "$withval" = "yes"; then - with_$1=yes -elif test "$withval" = "no"; then - with_$1=no -else - AC_MSG_ERROR(please use \"yes\" or \"no\" with --with-$1) -fi -],[ -with_$1=yes -]) -if test "$with_$1" = "yes" -then - AC_MSG_RESULT([yes, will enable if all libraries are found]) -else - AC_MSG_RESULT([no]) -fi -]) diff --git a/contrib/amd/missing b/contrib/amd/missing deleted file mode 100755 index 0a7fb5a..0000000 --- a/contrib/amd/missing +++ /dev/null @@ -1,283 +0,0 @@ -#! /bin/sh -# Common stub for a few missing GNU programs while installing. -# Copyright 1996, 1997, 1999, 2000 Free Software Foundation, Inc. -# Originally by Fran,cois Pinard , 1996. - -# 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 -# the Free Software Foundation; either version 2, or (at your option) -# any later version. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. - -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -# 02111-1307, USA. - -# As a special exception to the GNU General Public License, if you -# distribute this file as part of a program that contains a -# configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that program. - -if test $# -eq 0; then - echo 1>&2 "Try \`$0 --help' for more information" - exit 1 -fi - -run=: - -# In the cases where this matters, `missing' is being run in the -# srcdir already. -if test -f configure.ac; then - configure_ac=configure.ac -else - configure_ac=configure.in -fi - -case "$1" in ---run) - # Try to run requested program, and just exit if it succeeds. - run= - shift - "$@" && exit 0 - ;; -esac - -# If it does not exist, or fails to run (possibly an outdated version), -# try to emulate it. -case "$1" in - - -h|--h|--he|--hel|--help) - echo "\ -$0 [OPTION]... PROGRAM [ARGUMENT]... - -Handle \`PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an -error status if there is no known handling for PROGRAM. - -Options: - -h, --help display this help and exit - -v, --version output version information and exit - --run try to run the given command, and emulate it if it fails - -Supported PROGRAM values: - aclocal touch file \`aclocal.m4' - autoconf touch file \`configure' - autoheader touch file \`config.h.in' - automake touch all \`Makefile.in' files - bison create \`y.tab.[ch]', if possible, from existing .[ch] - flex create \`lex.yy.c', if possible, from existing .c - help2man touch the output file - lex create \`lex.yy.c', if possible, from existing .c - makeinfo touch the output file - tar try tar, gnutar, gtar, then tar without non-portable flags - yacc create \`y.tab.[ch]', if possible, from existing .[ch]" - ;; - - -v|--v|--ve|--ver|--vers|--versi|--versio|--version) - echo "missing 0.3 - GNU automake" - ;; - - -*) - echo 1>&2 "$0: Unknown \`$1' option" - echo 1>&2 "Try \`$0 --help' for more information" - exit 1 - ;; - - aclocal) - echo 1>&2 "\ -WARNING: \`$1' is missing on your system. You should only need it if - you modified \`acinclude.m4' or \`${configure_ac}'. You might want - to install the \`Automake' and \`Perl' packages. Grab them from - any GNU archive site." - touch aclocal.m4 - ;; - - autoconf) - echo 1>&2 "\ -WARNING: \`$1' is missing on your system. You should only need it if - you modified \`${configure_ac}'. You might want to install the - \`Autoconf' and \`GNU m4' packages. Grab them from any GNU - archive site." - touch configure - ;; - - autoheader) - echo 1>&2 "\ -WARNING: \`$1' is missing on your system. You should only need it if - you modified \`acconfig.h' or \`${configure_ac}'. You might want - to install the \`Autoconf' and \`GNU m4' packages. Grab them - from any GNU archive site." - files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' ${configure_ac}` - test -z "$files" && files="config.h" - touch_files= - for f in $files; do - case "$f" in - *:*) touch_files="$touch_files "`echo "$f" | - sed -e 's/^[^:]*://' -e 's/:.*//'`;; - *) touch_files="$touch_files $f.in";; - esac - done - touch $touch_files - ;; - - automake) - echo 1>&2 "\ -WARNING: \`$1' is missing on your system. You should only need it if - you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'. - You might want to install the \`Automake' and \`Perl' packages. - Grab them from any GNU archive site." - find . -type f -name Makefile.am -print | - sed 's/\.am$/.in/' | - while read f; do touch "$f"; done - ;; - - bison|yacc) - echo 1>&2 "\ -WARNING: \`$1' is missing on your system. You should only need it if - you modified a \`.y' file. You may need the \`Bison' package - in order for those modifications to take effect. You can get - \`Bison' from any GNU archive site." - rm -f y.tab.c y.tab.h - if [ $# -ne 1 ]; then - eval LASTARG="\${$#}" - case "$LASTARG" in - *.y) - SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'` - if [ -f "$SRCFILE" ]; then - cp "$SRCFILE" y.tab.c - fi - SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'` - if [ -f "$SRCFILE" ]; then - cp "$SRCFILE" y.tab.h - fi - ;; - esac - fi - if [ ! -f y.tab.h ]; then - echo >y.tab.h - fi - if [ ! -f y.tab.c ]; then - echo 'main() { return 0; }' >y.tab.c - fi - ;; - - lex|flex) - echo 1>&2 "\ -WARNING: \`$1' is missing on your system. You should only need it if - you modified a \`.l' file. You may need the \`Flex' package - in order for those modifications to take effect. You can get - \`Flex' from any GNU archive site." - rm -f lex.yy.c - if [ $# -ne 1 ]; then - eval LASTARG="\${$#}" - case "$LASTARG" in - *.l) - SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'` - if [ -f "$SRCFILE" ]; then - cp "$SRCFILE" lex.yy.c - fi - ;; - esac - fi - if [ ! -f lex.yy.c ]; then - echo 'main() { return 0; }' >lex.yy.c - fi - ;; - - help2man) - echo 1>&2 "\ -WARNING: \`$1' is missing on your system. You should only need it if - you modified a dependency of a manual page. You may need the - \`Help2man' package in order for those modifications to take - effect. You can get \`Help2man' from any GNU archive site." - - file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'` - if test -z "$file"; then - file=`echo "$*" | sed -n 's/.*--output=\([^ ]*\).*/\1/p'` - fi - if [ -f "$file" ]; then - touch $file - else - test -z "$file" || exec >$file - echo ".ab help2man is required to generate this page" - exit 1 - fi - ;; - - makeinfo) - if test -z "$run" && (makeinfo --version) > /dev/null 2>&1; then - # We have makeinfo, but it failed. - exit 1 - fi - - echo 1>&2 "\ -WARNING: \`$1' is missing on your system. You should only need it if - you modified a \`.texi' or \`.texinfo' file, or any other file - indirectly affecting the aspect of the manual. The spurious - call might also be the consequence of using a buggy \`make' (AIX, - DU, IRIX). You might want to install the \`Texinfo' package or - the \`GNU make' package. Grab either from any GNU archive site." - file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'` - if test -z "$file"; then - file=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'` - file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $file` - fi - touch $file - ;; - - tar) - shift - if test -n "$run"; then - echo 1>&2 "ERROR: \`tar' requires --run" - exit 1 - fi - - # We have already tried tar in the generic part. - # Look for gnutar/gtar before invocation to avoid ugly error - # messages. - if (gnutar --version > /dev/null 2>&1); then - gnutar ${1+"$@"} && exit 0 - fi - if (gtar --version > /dev/null 2>&1); then - gtar ${1+"$@"} && exit 0 - fi - firstarg="$1" - if shift; then - case "$firstarg" in - *o*) - firstarg=`echo "$firstarg" | sed s/o//` - tar "$firstarg" ${1+"$@"} && exit 0 - ;; - esac - case "$firstarg" in - *h*) - firstarg=`echo "$firstarg" | sed s/h//` - tar "$firstarg" ${1+"$@"} && exit 0 - ;; - esac - fi - - echo 1>&2 "\ -WARNING: I can't seem to be able to run \`tar' with the given arguments. - You may want to install GNU tar or Free paxutils, or check the - command line arguments." - exit 1 - ;; - - *) - echo 1>&2 "\ -WARNING: \`$1' is needed, and you do not seem to have it handy on your - system. You might have modified some files without having the - proper tools for further handling them. Check the \`README' file, - it often tells you about the needed prerequirements for installing - this package. You may also peek at any GNU archive site, in case - some other package would contain this missing \`$1' program." - exit 1 - ;; -esac - -exit 0 diff --git a/contrib/amd/mk-amd-map/mk-amd-map.8 b/contrib/amd/mk-amd-map/mk-amd-map.8 index 9982e40..fe7af50 100644 --- a/contrib/amd/mk-amd-map/mk-amd-map.8 +++ b/contrib/amd/mk-amd-map/mk-amd-map.8 @@ -1,5 +1,5 @@ .\" -.\" Copyright (c) 1997-2003 Erez Zadok +.\" Copyright (c) 1997-2004 Erez Zadok .\" Copyright (c) 1993 Jan-Simon Pendry .\" Copyright (c) 1993 .\" The Regents of the University of California. All rights reserved. @@ -33,7 +33,7 @@ .\" SUCH DAMAGE. .\" .\" from: @(#)mk-amd-map.8 8.1 (Berkeley) 6/28/93 -.\" $Id: mk-amd-map.8,v 1.3.2.3 2002/12/27 22:45:15 ezk Exp $ +.\" $Id: mk-amd-map.8,v 1.3.2.4 2004/01/06 03:15:24 ezk Exp $ .\" $FreeBSD$ .\" .Dd June 28, 1993 diff --git a/contrib/amd/mk-amd-map/mk-amd-map.c b/contrib/amd/mk-amd-map/mk-amd-map.c index 83c34b4..d72850e 100644 --- a/contrib/amd/mk-amd-map/mk-amd-map.c +++ b/contrib/amd/mk-amd-map/mk-amd-map.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997-2003 Erez Zadok + * Copyright (c) 1997-2004 Erez Zadok * Copyright (c) 1990 Jan-Simon Pendry * Copyright (c) 1990 Imperial College of Science, Technology & Medicine * Copyright (c) 1990 The Regents of the University of California. @@ -38,7 +38,7 @@ * * %W% (Berkeley) %G% * - * $Id: mk-amd-map.c,v 1.5.2.5 2003/06/09 16:57:46 ezk Exp $ + * $Id: mk-amd-map.c,v 1.5.2.6 2004/01/06 03:15:25 ezk Exp $ * $FreeBSD$ */ diff --git a/contrib/amd/mkinstalldirs b/contrib/amd/mkinstalldirs deleted file mode 100755 index e4e46e5..0000000 --- a/contrib/amd/mkinstalldirs +++ /dev/null @@ -1,40 +0,0 @@ -#! /bin/sh -# mkinstalldirs --- make directory hierarchy -# Author: Noah Friedman -# Created: 1993-05-16 -# Public domain - -# $Id: mkinstalldirs,v 1.1.2.2 2001/11/14 03:38:34 ezk Exp $ - -errstatus=0 - -for file -do - set fnord `echo ":$file" | sed -ne 's/^:\//#/;s/^://;s/\// /g;s/^#/\//;p'` - shift - - pathcomp= - for d - do - pathcomp="$pathcomp$d" - case "$pathcomp" in - -* ) pathcomp=./$pathcomp ;; - esac - - if test ! -d "$pathcomp"; then - echo "mkdir $pathcomp" - - mkdir "$pathcomp" || lasterr=$? - - if test ! -d "$pathcomp"; then - errstatus=$lasterr - fi - fi - - pathcomp="$pathcomp/" - done -done - -exit $errstatus - -# mkinstalldirs ends here diff --git a/contrib/amd/scripts/amd.conf.5 b/contrib/amd/scripts/amd.conf.5 index d64a8bc..7a5060d 100644 --- a/contrib/amd/scripts/amd.conf.5 +++ b/contrib/amd/scripts/amd.conf.5 @@ -1,5 +1,5 @@ .\" -.\" Copyright (c) 1997-2003 Erez Zadok +.\" Copyright (c) 1997-2004 Erez Zadok .\" Copyright (c) 1990 Jan-Simon Pendry .\" Copyright (c) 1990 Imperial College of Science, Technology & Medicine .\" Copyright (c) 1990 The Regents of the University of California. @@ -38,7 +38,7 @@ .\" .\" %W% (Berkeley) %G% .\" -.\" $Id: amd.conf.5,v 1.7.2.8 2003/03/16 01:47:00 ezk Exp $ +.\" $Id: amd.conf.5,v 1.7.2.10 2004/01/21 04:04:58 ib42 Exp $ .\" $FreeBSD$ .\" .Dd April 7, 1997 @@ -480,6 +480,18 @@ and the .Ic nfs_retry_interval parameters change the overall retry interval. Too long an interval gives poor interactive response; too short an interval causes excessive retries. +.It Ic nfs_allow_insecure_port Xo +(string, default=no). +.Xc +Normally amd will refuse requests coming from unprivileged ports (i.e. +ports >= 1024 on Unix systems), so that only privileged users and the kernel +can send NFS requests to it. However, some kernels (certain versions of +Darwin, MacOS X, and Linux) have bugs that cause them to use unprivileged +ports in certain situations, which causes amd to stop dead in its +tracks. This parameter allows amd to operate normally even on such systems, +at the expense of a slight decrease in the security of its operations. If +you see messages like "ignoring request from foo:1234, port not reserved" +in your amd log, try enabling this parameter and give it another go. .It Ic nfs_vers Xo (numeric, default to trying version 3 then 2) .Xc diff --git a/contrib/amd/scripts/lostaltmail.conf-sample b/contrib/amd/scripts/lostaltmail.conf-sample deleted file mode 100644 index a20158c..0000000 --- a/contrib/amd/scripts/lostaltmail.conf-sample +++ /dev/null @@ -1,84 +0,0 @@ -# -*- perl -*- -############################################################################## -# # -# CONFIGURABLE VALUES # -# # -############################################################################## - -$MAILGRUNT="postmaster"; # To whom to send log mail if mail is prefered. - -$TMPDIR="/tmp/"; # Place lostmail can do its dirty work. - -$LOCAL_LOCK_EXT=".lock"; # Name of file local mailer uses to lock - # spool file. This the correct setting for - # /bin/mail - -$SYSTEM_FROM_ADDRESS="Mailer-Daemon"; - -$MAILDIR="/var/alt_mail"; # What directory should I run out of. -$MAILER='/usr/lib/sendmail -t'; # Which mailer should I use. - -$LOCALMAILJUNK='.*~|\#.*|core'; # Files name patterns that might appear in - # alt_mail and should be ignored. This REGEXP - # gets or'ed with $MAILJUNK below. - -$SMTPHOST='localhost'; # The name of a local host which speaks SMTP - # and knows *all* your aliases. You probably - # don't want to change this. If the machine - # running lost_alt mail doesn't run an SMTP, - # daemon then something is either wrong or you - # should be setting `noverify' to prevent - # SMTP verification. - -$HOSTNAME='localhost'; # Hostname to use for SMTP HELO - -# Subject of lost log mail message. Must define $MAILGRUNT. -# I overwrite this variable in the subroutine Clean_up. Please make sure I -# haven't noodle-headdly forgotten to remove that hack in the distribution! -# No newline here please. The script will insert it for you. -$LOG_SUBJECT="Log of lostmail resends"; - -############################################################################## -# # -# DEFAULTED CONFIGURATIONS # -# # -############################################################################## - -$LOGFILE="$TMPDIR" . "lostlog"; - - -# MAILJUNK is a pattern of ignorable alt_mail files which are either common -# to most platforms or actually produced by this script. You should customize -# this REGEXP by hacking at $LOCALMAILJUNK above. -$MAILJUNK='[a-z]\.[0-9]*|\.\.?|lost\+found'; - -$LOCKEXT=".lostlock"; # our lock file extension. Should not need to - # modify - -$MESSAGE_DELIM="^From[^:]"; # /bin/mail message delimiter. Your milage - # may differ - -$HEADER_BODY_DELIM="\n"; # RFC 822 header-body delimiter. - -$RESENT_TO="Resent-To: "; # -$RESENT_FROM="Resent-From: "; # Resent headers (RFC 822). -$RESENT_DATE="Resent-Date: "; # You probably don't want to muck with these. -$RESENT_INFO="X-Resent-Info: "; # (special one to alert folks about mail). - - -############################################################################## -# # -# LOSTMAIL DEFINITIONS (DON'T TOUCH) # -# # -############################################################################## - -$FALSE=0; -$TRUE=(! $FALSE); - -$OK=$TRUE; -$ABORT_RESEND=2; -$LOCK_RETRIES=10; # The number of seconds/retries lost mail - # should wait before requeing or aborting a - # resend. - -TRUE; # Ansures true return from include file. diff --git a/contrib/amd/scripts/lostaltmail.in b/contrib/amd/scripts/lostaltmail.in deleted file mode 100755 index 467dedd..0000000 --- a/contrib/amd/scripts/lostaltmail.in +++ /dev/null @@ -1,658 +0,0 @@ -#!@PERL@ -sw -# -# Package: am-utils-6.0 -# Author: James Tanis -# - -############################################################################ -# -# lostaltmail -- remail files files found alt_mail (or -a argument to hlfsd) to -# whomever should receive it. This version is for SMTP varient which -# support VRFY as a non-expanding verifier!!! (sendmail V8 is a an -# example). -# -# Usage: lostaltmail [-debug] [-nomail] [-noverify] -# -# GLOBAL VARIABLES (as if you care :-) ) -# Probably a very incomplete list. -# -# Everything in the config file for this program *and* ... -# -# $debug: set it from the command line with -debug. Does the obvious -# $nomail: set it from the command line with -nomail. *Not* implied by -# $debug -# $currentTO: The addresss we are currently checking on. Actually this is -# left over from an earlier version of lostaltmail and will hopefully -# go away. -# $noverify: set it from the address line. Avoid verification of $currentTO. -# This should be relatively safe as long as you are willing to -# endure bounces from mail that cannot be redelivered as opposed to -# just getting a warning. UNTESTED (but should work). -# -# $logopen: state variable indicating weather the log file (should there be -# one) is in fact open. -# -# @allentries: Array of all the directory entries in $MAILDIR -# @allnames: Array of all *likely* recipients. It is created from @allentries -# sans junk files (see $MAILJUNK and $LOCALMAILJUNK) -# @wanderers: Array of all the files associated with a *single* address -# which might need remailing. Should lostaltmail die unexpectedly, -# it might leave a temporary file containing messages it was -# currently trying to deliver. These will get picked and resent -# later. -# -# VRFY: Handle onto SMTP verification channel. Not to be confused with mail -# delivery; only verification occurs accross this handle. -# -############################################################################ - -############################################################################## -# # -# SMTP_SEND # -# # -############################################################################## -# -# Send a message to the smtp channel. Inserts the necessary NEWLINE if it -# does not exist; -# I stole this from myself. It shouldn nott be printing errors to STDERR, but -# this is a quick hack. -# -sub smtp_send { - local ($msg) = @_; - local ($length); - - $length=length($msg); - - if ( $msg !~ /^.*\n$/ ) { - $msg = $msg . "\n"; - $length++; - } - - - if ( ! syswrite (VRFY, $msg, $length)) { - print STDERR "Failing SMTP write: $msg"; - return 0; - } - - return 1; -} - -############################################################################## -# # -# SMTP_RECV # -# # -############################################################################## -# -# Read in lines from SMTP connection and return the final -# Really hideous -- please excuse. -# -sub smtp_recv { - local ($line,$rin, $win, $ein, $readbuf, $ret); - $readbuf = ""; - - $rin = $win = $ein = ''; # Null fd sets, - vec ($rin, fileno(VRFY), 1) = 1; # Stolen straight from the example; - $ein = $rin | $win; # This is probably useless - - -LINE_OF_INPUT: - while (1) { # Read in all the input - - if ((select ( $rin, $win, $ein, 600.0))[0] == 0 ) { - print "select returned -1" if ($debug); - return -1; # timeout - } - sysread (VRFY, $readbuf, 1024); - chop ($readbuf); - - foreach $line ( split('\n', $readbuf)) { - - # This loop is actually needed since V8 has a multi-line greet. - - ( $line =~ /^(\d\d\d).*/ && ($SMTP_retval=$1)) || - warn "Badly formed reply from SMTP peer: $line\n"; - - # Space after return code indicates EOT - - if ($line =~ /^\d\d\d /) { - $ret = $line; # Oddly $line is in a different context here; - # and thus we need to export it out of the - # while loop via $ret. - last LINE_OF_INPUT; - } - } # End of read. - } # End of input. - - return $ret; -} - - - - -############################################################################## -# # -# LOG_INFO # -# # -############################################################################## -# -# -# Opens appropriate logging file -- STDOUT (cron) or temp file (mail). -# -sub Log_info { - local($message) = @_; - - if ( !$logopened ) { - if ( $MAILGRUNT eq "" || $debug) { - open (LOGFILE, ">-") || die "Unable to open stdout"; - } - else { - # Snarf the log into a tmp file for final mailing to MAILGRUNT - $logfile = $LOGFILE . ".$$"; - open (LOGFILE, (">". "$logfile")) || die "Unable to create log file"; - } - } - - $logopened=1; # Note that the log is now open - - # Heart of the function. - print LOGFILE "$message"; - - print LOGFILE "\n" if ( index($message,"\n") == -1 ); -} - -############################################################################## -# # -# LOCK_FILE # -# # -############################################################################## - -# -# Tries to grab a lock on the supplied file name. -# Spins for a bit if it can't on the assumption that the lock will be released -# quickly. If it times out and it's allowed to requeue, it will defer -# until later, other wise write a message to loginfo. - -# If a recurring error or really unexpected situation arrises, return -# ABORT_RESEND -# -# PARAMETERS -# mailfile: path to the file to resend. -# should_requeue: BOOLEAN - TRUE if the mailfile should be put on the -# queue for a later retry if we can not finish -# now. - -sub Lock_file { - - local($mailfile,$should_requeue,$i,$new_lost_file) = @_; - -# We need to rename the current mailbox so that mail can loop back into it if -# the resent mail just gets looped right back to us. - $new_lost_file = $mailfile . ".$$"; - -# make a tmpfile name based on mailfile; - $lostlockfile = "$mailfile" . "$LOCKEXT"; - - if ( ! open(LOCKFILE, (">" . $lostlockfile)) ) { - printf(STDERR "Could not create lostlockfile for %s: %s\n", $mailfile,$!); - return $ABORT_RESEND; - } - close(LOCKFILE); - - $maillockfile = "$mailfile" . "$LOCAL_LOCK_EXT"; - - for ($i=0; $i < $LOCK_RETRIES && ! link ($lostlockfile, $maillockfile); - $i++) { - sleep(1); - } - - unlink($lostlockfile); # No matter what eliminate our cruft - - if ( $i == $LOCK_RETRIES ) { - &Log_info("Could not grab lock on: " . "$mailfile" . " :timed out"); - if ( $should_requeue ) { - &Log_info("Requeing " . "$mailfile" . " for later retry"); - $retry_list .= " $mailfile"; - } - else { - &Log_info("Giving up on: " . "$mailfile"); - } - - return $ABORT_RESEND; - } - - # We created the link and therefore have the lock - - if (rename ($mailfile, $new_lost_file) == 0 ){ - # Failed to rename file -- this is serious. - unlink($maillockfile); - return $ABORT_RESEND; - } - - unlink($maillockfile); - return $new_lost_file; - -} - -############################################################################## -# # -# PARSE NEXT MAIL MESSAGE # -# # -############################################################################## -# -# Parameters: -# mailfile: handle of mailfile to use. -# -# Parses the next message in the mail file and inserts it in $current_msg -# -sub Get_next_msg { - local($mailfile,$found_body_delimiter) = @_; - - # If this is the first message in the spool file, read the first line - # otherwise use the MESSAGE_DELIM line from the previous message (which we - # were forced to overread). - - $done=$FALSE; - $found_body_delimiter=$FALSE; - - # This if eats the very first "From " line and should never fire again. - if ( ! defined $current_msg ) {<$mailfile>}; - undef ($current_msg); # Erase the old message. - - - # Read the mailfile and pass through all the lines up until the next - # message delimiter. Kill any previous resend headers. - while ( <$mailfile> ) { - last if (/$MESSAGE_DELIM/); - next if ( !$found_body_delimiter && /[Rr][Ee][Ss][Ee][Nn][Tt]-.+:/); - if ( !$found_body_delimiter && /^$HEADER_BODY_DELIM/) { - &Splice_in_resent_headers(); - $found_body_delimiter=$TRUE; - } - if (defined($current_msg)) { - $current_msg .= $_; - } else { - $current_msg = $_; - } - } - - # Return TRUE when we have hit the end of the file. - if (!defined($_) || $_ eq "" ) { - return $TRUE; - } else { - return $FALSE; - } -} - -############################################################################## -# # -# SPLICE IN RESENT_HEADERS # -# # -############################################################################## -# -# Insert the Resent- headers at the *current location* of the message stream -# (In Engish, print out a few Resent-X: lines and return :-) ) -# In addition splice in the X-resent-info: header. - -# -# Paremters: None. -# Return: None -# -sub Splice_in_resent_headers { - local($date,$utctime,$weekday,$time,$month,$hostname); - - $current_msg .= "$RESENT_TO" . "$currentTO" . "\n"; - $current_msg .= "$RESENT_FROM" . "$SYSTEM_FROM_ADDRESS" . "\n"; - - # Calculate date and time. It is a bit of a shame to do this each time - # the time needs to be acurate. - - @utctime=gmtime(time); - - $weekday=(Sun,Mon,Tue,Wed,Thu,Fri,Sat)[$utctime[6]]; - - - # If the minutes or second do not take two columns each, patch em up. - if ( $utctime[1] < 10 ) { - if ( $utctime[0] < 10 ) { - $time=sprintf("%d:0%d:0%d",$utctime[2],$utctime[1],$utctime[0]); - } - else { - $time=sprintf("%d:0%d:%d",$utctime[2],$utctime[1],$utctime[0]); - } - } - else { - if ( $utctime[0] < 10 ) { - $time=sprintf("%d:%d:0%d",$utctime[2],$utctime[1],$utctime[0]); - } - else { - $time=sprintf("%d:%2d:%2d",$utctime[2],$utctime[1],$utctime[0]); - } - } - - $month=(Jan,Feb,Mar,Apr,May,Jun,Jul,Aug,Sep,Oct,Nov,Dec)[$utctime[4]]; - - # Ensure Y2K format - $date=sprintf("%s, %d %s %d %s UTC", $weekday, $utctime[3], $month, $utctime[5]+1900, $time); - - $current_msg .= "$RESENT_DATE" . $date . "\n"; - - if ( defined $RESENT_INFO && $RESENT_INFO ne "") { - $hostname=`uname -n`; - $current_msg .= "$RESENT_INFO" . "Lost mail resent from ". $hostname; - } - - return; -} - -############################################################################## -# # -# DO_REMAIL # -# # -############################################################################## -# -# Actually resends the mail. Talks to the process configured as $MAILER -# We need better handling. -# -sub Do_remail { - open (MAILER, "| $MAILER $currentTO") || return $ABORT_RESEND; - print MAILER $current_msg; - close (MAILER); -} - -############################################################################## -# # -# CLEAN_UP # -# # -############################################################################## -# -# Clean up my messes. -# -sub Clean_up { - local ($hostname); - - # Ugly local hack that you should never have seen, but I forgot to - # remove. Hopefully it did not kill you (I tried as you see), but you - # should eiter remove or update it for yourself. I find the message - # subject needs to have the hostname to be useful. - # - chop ($hostname=`uname -n`); - $LOG_SUBJECT="$LOG_SUBJECT from $hostname" if ( $hostname =~ /.*\.cs\.columbia\.edu/ ); - # - # End of ugly local hack - - # Mail any log info to MAILGRUNT. - if (defined($logfile) && $logfile ne "" ) { - close (LOGFILE); # Flush logfile output. - if ( -s $logfile ) { - open (MAILER, "| $MAILER $MAILGRUNT"); - - print MAILER "To: $MAILGRUNT\n"; - print MAILER "Subject: $LOG_SUBJECT\n"; - print MAILER "$HEADER_BODY_DELIM"; - - open (LOGFILE, "< $logfile"); - - while () { - print MAILER $_; - } - close (MAILER); - close (LOGFILE); - } - - unlink($logfile); - } - exit(0); -} - - -############################################################################## -# # -# COLLECT_WANDERERS # -# # -############################################################################## - -# -# Collects other files that appear to be mail file for the $currentTO -# but were not remailed successfully. -# -# Parameters: none (but uses $currentTO) -# Return: True if a old mail directory is found. False otherwise. -# Side effects: $wanderers set. -# -sub Collect_wanderers { - - undef (@wanderers); - - # Slurp in the directory and close. - - return ($found); -} - -############################################################################# -# # -# REMAIL ALL # -# # -############################################################################# - -# -# Takes an array of files that all seem to share a common repcipient and -# remails them if possible. -# -# Parameters: None (uses @wanderers). -# -sub Remail_all { - local($file,$i); - - $i=0; - foreach $file (@wanderers) { - if ( !open (LOSTFILE, "< $file")) { - &Log_info("Could not open " . "$file" . " for remailing"); - next; - } - - do { # Power loop! - $done = &Get_next_msg(LOSTFILE); # Retrieve the next message... - &Do_remail; # and remail it. - } until $done; - undef ($current_msg); # Erase the final remailed message. - - close(LOSTFILE); # Tidy up. - - unlink ($file); # Remove the remailed file - $i++; - } - -} - -############################################################################# -# # -# CHECK_USER # -# # -############################################################################# - -# -# Checks the password tables for the uid of $currentTO. If the user is -# uid 0 (ie *supposed* to get mail in altmail) or unknown the resend is -# aborted. -# -# -sub Check_user { - local (@passwdinfo); - undef (@passwdinfo); - - if (!$noverify && !&vrfy_user($currentTO) ) { - &Log_info("Possible non user mail file: $currentTO"); - return $ABORT_RESEND; - } - - @passwdinfo = getpwnam($currentTO); - - print "Non user mailable mail: Name: $currentTO\n" - if ( $debug && ! defined @passwdinfo ); - - return !$ABORT_RESEND if ( ! defined @passwdinfo ); # A non user but evidently mailable - - print "Check User(): Name: $currentTO -- UID: $passwdinfo[2]\n" if ($debug); - - return $ABORT_RESEND if ( $passwdinfo[2] == 0 ); - - - return !$ABORT_RESEND; -} - -############################################################################# -# # -# VRFY USER # -# # -############################################################################# -# -# Use SMTP VRFY to insure that argument is in fact a legal mail id. -# Boolean: TRUE if mailable account, FALSE if not. - -sub vrfy_user { - - local ($mailname,$repl) = @_; - - if ( !&smtp_send("vrfy $mailname") ) { - &Log_info("Failed sending to vrfy smtp command for: $mailname"); - return 0; - } - - $repl = &smtp_recv; - - print "VRFY REPLY: $repl\n" if ($debug); - - return ( $repl =~ /^2\d\d/ ); - - -} - - -############################################################################# -# # -# MAIN PROC # -# # -############################################################################# - -# dummy code to shut up perl -w -$debug = 0 if !defined($debug); -print $nomail if $debug > 1; -print $RESENT_FROM if $debug > 1; -print $logopen if $debug > 1; -print $LOCAL_LOCK_EXT if $debug > 1; -print $RESENT_TO if $debug > 1; -print $LOCKEXT if $debug > 1; -print $RESENT_DATE if $debug > 1; -print $MESSAGE_DELIM if $debug > 1; -print $SMTP_retval if $debug > 1; -print $found if $debug > 1; -print $retry_list if $debug > 1; -print $MAILJUNK if $debug > 1; -print $noverify if $debug > 1; -print $SYSTEM_FROM_ADDRESS if $debug > 1; - -# BEGIN: stuff -$prefix="@prefix@"; -$CONFIGDIR="@sysconfdir@"; # Directory where global config lives -require "$CONFIGDIR/lostaltmail.conf" if (-f "$CONFIGDIR/lostaltmail.conf"); -require "/etc/global/lostaltmail.conf" if (-f "/etc/global/lostaltmail.conf"); -require "/etc/os/lostaltmail.conf" if (-f "/etc/os/lostaltmail.conf"); -require "/etc/local/lostaltmail.conf" if (-f "/etc/local/lostaltmail.conf"); - - -require "ctime.pl"; -use Socket; -#require "sys/socket.ph"; - -# SET some initial state variales -$logopen = 0; - -# -# Change to alt_dir -# -# Important!! This directory should be local. Folks will be responsible -# for finding this out for themselves. -# -if (!defined($MAILDIR) || $MAILDIR eq "") { - die "MAILDIR must be defined\n"; -} -chdir ( $MAILDIR ) || die "Cannot change to $MAILDIR (`x' bit not set?)"; - -# -# slurp in directory -# -opendir (MAIL, ".") || die "Cannot open $MAILDIR (`r' bit not set?)"; -@allentries= readdir (MAIL); -closedir (MAIL); -@allnames = grep (!/$LOCALMAILJUNK|$MAILJUNK/, @allentries); - -# Open chanel to SMTP for verification -- unless this option is -# configured off. - -if ( ! $noverify ) { - local($addr, $port,$sockaddr); - - socket (VRFY, &AF_INET, &SOCK_STREAM, 0) || - die "Could not create TCP socket (SMTP channel)"; - - $addr = (gethostbyname($SMTPHOST))[4]; # Just use the first addr - - die "Could not obtain STMP host ($SMTPHOST) address" - if ( $addr eq "" ); - - $port = (getservbyname('smtp','tcp'))[2]; # Get smtp port. - die "Could not obtain SMTP port number" if (!defined($port)); - - printf("SMTP: address: %s port: $port\n", - join ('.',unpack('C4',$addr))) if ($debug); - - $sockaddr = sockaddr_in($port, $addr); - - printf("Sockaddr: %s\n", join (' ',unpack('C14',$sockaddr))) if ($debug); - - connect (VRFY, $sockaddr) || - die "Could not connect to SMTP daemon on $SMTPHOST"; - - print "Establshed SMTP channel\n" if ($debug); - - &smtp_recv; # Greet wait - &smtp_send("helo $SMTPHOST"); # Helo message for picky SMTPs - &smtp_recv; # Helo reply - - # Connection is up and ready to VRFY -} - -# main stuff starts here -foreach $currentTO (@allnames) { - next if ( &Check_user == $ABORT_RESEND); - - # just delete the file if too small to be real mail - if ((stat($currentTO))[7] < 5) { - print "Too small to be real mail, unlinking $currentTO" if $debug; - unlink $currentTO; - } - - undef (@wanderers); # Just reset this at each pass. - @wanderers=grep (/$currentTO\.\d+/, @allentries); - - $remail_file = &Lock_file($currentTO,$FALSE); # Need to lock the spool. - - next if ( $remail_file eq $ABORT_RESEND); # Could not get that lock - - push (@wanderers, $remail_file); # Try to resend "old" files. - print "List to remail: @wanderers\n" if ($debug); - # check if there is something to remail - &Remail_all if ( defined @wanderers && !$nomail); -} - -# this stuff should run at the end -foreach $file (grep (/$LOCALMAILJUNK/,@allentries)) { - - if ($debug) { - print "Would unlink $file\n" if ($debug); - } else { - unlink $file if (-f $file); - } - -} -&Clean_up; # Do a clean exit. diff --git a/contrib/amd/wire-test/wire-test.8 b/contrib/amd/wire-test/wire-test.8 index a849e7d..d3247f7 100644 --- a/contrib/amd/wire-test/wire-test.8 +++ b/contrib/amd/wire-test/wire-test.8 @@ -1,5 +1,5 @@ .\" -.\" Copyright (c) 1997-2003 Erez Zadok +.\" Copyright (c) 1997-2004 Erez Zadok .\" Copyright (c) 1990 Jan-Simon Pendry .\" Copyright (c) 1990 Imperial College of Science, Technology & Medicine .\" Copyright (c) 1990 The Regents of the University of California. @@ -38,7 +38,7 @@ .\" .\" %W% (Berkeley) %G% .\" -.\" $Id: wire-test.8,v 1.3.2.4 2002/12/27 22:45:16 ezk Exp $ +.\" $Id: wire-test.8,v 1.3.2.5 2004/01/06 03:15:25 ezk Exp $ .\" $FreeBSD$ .\" .Dd February 26, 1993 diff --git a/contrib/amd/wire-test/wire-test.c b/contrib/amd/wire-test/wire-test.c index 38b7e01..593cf4538 100644 --- a/contrib/amd/wire-test/wire-test.c +++ b/contrib/amd/wire-test/wire-test.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997-2003 Erez Zadok + * Copyright (c) 1997-2004 Erez Zadok * Copyright (c) 1990 Jan-Simon Pendry * Copyright (c) 1990 Imperial College of Science, Technology & Medicine * Copyright (c) 1990 The Regents of the University of California. @@ -38,7 +38,7 @@ * * %W% (Berkeley) %G% * - * $Id: wire-test.c,v 1.5.2.3 2002/12/27 22:45:16 ezk Exp $ + * $Id: wire-test.c,v 1.5.2.4 2004/01/06 03:15:25 ezk Exp $ * $FreeBSD$ * */ -- cgit v1.1