From 82e25ba10e0cfcc72090ff1b5681266a7f1d6e72 Mon Sep 17 00:00:00 2001 From: Sam Hartman Date: Fri, 28 Sep 2001 15:45:09 +0000 Subject: [PATCH] This commit was generated by cvs2svn to compensate for changes in r367, which included commits to RCS files with non-trunk default branches. --- configure.in | 208 +++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 203 insertions(+), 5 deletions(-) diff --git a/configure.in b/configure.in index c6ed2e468..66f9f5a43 100644 --- a/configure.in +++ b/configure.in @@ -1,5 +1,5 @@ AC_INIT(src/config/stds.h) -AM_INIT_AUTOMAKE(openafs,1.1.1) +AM_INIT_AUTOMAKE(openafs,1.2.0) AC_CANONICAL_HOST AC_CONFIG_HEADER(src/config/afsconfig.h) @@ -21,6 +21,8 @@ AC_ARG_ENABLE( fast-restart, [ --enable-fast-restart enable fast startup of file server without salvaging],, enable_fast_restart="no") AC_ARG_ENABLE( bitmap-later, [ --enable-bitmap-later enable fast startup of file server by not reading bitmap till needed],, enable_bitmap_later="no") +AC_ARG_ENABLE( full-vos-listvol-switch, +[ --enable-full-vos-listvol-switch enable vos full listvol switch for formatted output],, enable_full_vos_listvol_switch="no") AC_ARG_WITH(dux-kernel-headers, [ --with-dux-kernel-headers=path use the kernel headers found at path(optional, defaults to first match in /usr/sys)] ) @@ -33,6 +35,9 @@ AC_ARG_ENABLE(kernel-module, AC_ARG_ENABLE(redhat-buildsys, [ --enable-redhat-buildsys enable compilation of the redhat build system kernel (defaults to disabled)],, enable_redhat_buildsys="no" ) +AC_ARG_ENABLE(transarc-paths, +[ --enable-transarc-paths Use Transarc style paths like /usr/afs and /usr/vice],, enable_transarc_paths="no" +) AC_PROG_CC @@ -54,7 +59,13 @@ AC_PROG_LN_S AC_PROG_RANLIB AC_PROG_YACC AM_PROG_LEX - +AC_PATH_PROG(PERL, perl, no) +if [ "x$PERL" = "xno" ] ; then + PERL_INSTALL=noperl + else + PERL_INSTALL=perl +fi +AC_SUBST(PERL_INSTALL) OPENAFS_CHECK_BIGENDIAN AC_MSG_CHECKING(your OS) @@ -109,12 +120,32 @@ case $system in if test "x$enable_kernel_module" = "xyes"; then LINUX_FS_STRUCT_INODE_HAS_I_BYTES LINUX_FS_STRUCT_ADDRESS_SPACE_HAS_PAGE_LOCK + LINUX_FS_STRUCT_INODE_HAS_I_CDEV + LINUX_FS_STRUCT_INODE_HAS_I_TRUNCATE_SEM + LINUX_FS_STRUCT_INODE_HAS_I_DIRTY_DATA_BUFFERS + LINUX_FS_STRUCT_INODE_HAS_I_MAPPING_OVERLOAD + LINUX_FS_STRUCT_INODE_HAS_I_MMAP_SHARED LINUX_INODE_SETATTR_RETURN_TYPE LINUX_NEED_RHCONFIG LINUX_WHICH_MODULES if test "x$ac_cv_linux_func_inode_setattr_returns_int" = "xyes" ; then AC_DEFINE(INODE_SETATTR_NOT_VOID) fi + if test "x$ac_cv_linux_fs_struct_inode_has_i_dirty_data_buffers" = "xyes"; then + AC_DEFINE(STRUCT_INODE_HAS_I_DIRTY_DATA_BUFFERS) + fi + if test "x$ac_cv_linux_fs_struct_inode_has_i_mmap_shared" = "xyes"; then + AC_DEFINE(STRUCT_INODE_HAS_I_MMAP_SHARED) + fi + if test "x$ac_cv_linux_fs_struct_inode_has_i_mapping_overload" = "xyes"; then + AC_DEFINE(STRUCT_INODE_HAS_I_MAPPING_OVERLOAD) + fi + if test "x$ac_cv_linux_fs_struct_inode_has_i_cdev" = "xyes"; then + AC_DEFINE(STRUCT_INODE_HAS_I_CDEV) + fi + if test "x$ac_cv_linux_fs_struct_inode_has_i_truncate_sem" = "xyes"; then + AC_DEFINE(STRUCT_INODE_HAS_I_TRUNCATE_SEM) + fi if test "x$ac_cv_linux_fs_struct_inode_has_i_bytes" = "xyes"; then AC_DEFINE(STRUCT_INODE_HAS_I_BYTES) fi @@ -177,17 +208,23 @@ else i?86-*-freebsd4.2*) AFS_SYSNAME="i386_fbsd_42" ;; - hppa-hp-hpux11*) + hppa*-hp-hpux11*) AFS_SYSNAME="hp_ux110" ;; - hppa-hp-hpux10*) + hppa*-hp-hpux10*) AFS_SYSNAME="hp_ux102" ;; powerpc-apple-darwin1.2*) AFS_SYSNAME="ppc_darwin_12" + DARWIN_PLIST=src/afsd/afs.${AFS_SYSNAME}.plist ;; powerpc-apple-darwin1.3*) AFS_SYSNAME="ppc_darwin_13" + DARWIN_PLIST=src/afsd/afs.${AFS_SYSNAME}.plist + ;; + powerpc-apple-darwin1.4*) + AFS_SYSNAME="ppc_darwin_14" + DARWIN_PLIST=src/afsd/afs.${AFS_SYSNAME}.plist ;; sparc-sun-solaris2.5*) AFS_SYSNAME="sun4x_55" @@ -210,12 +247,18 @@ else mips-sgi-irix6.5) AFS_SYSNAME="sgi_65" ;; + ia64-*-linux*) + AFS_SYSNAME="ia64_linuxXX" + ;; powerpc-*-linux*) AFS_SYSNAME="ppc_linuxXX" ;; alpha*-linux*) AFS_SYSNAME="alpha_linux_XX" ;; + s390-*-linux*) + AFS_SYSNAME="s390_linuxXX" + ;; sparc-*-linux*) AFS_SYSNAME="sparc_linuxXX" ;; @@ -333,6 +376,10 @@ if test "$enable_bitmap_later" = "yes"; then AC_DEFINE(BITMAP_LATER) fi +if test "$enable_full_vos_listvol_switch" = "yes"; then + AC_DEFINE(FULL_LISTVOL_SWITCH) +fi + if test "$enable_bos_restricted_mode" = "yes"; then AC_DEFINE(BOS_RESTRICTED_MODE) fi @@ -348,6 +395,9 @@ fi SRCDIR_PARENT=`pwd` TOP_SRCDIR="${SRCDIR_PARENT}/src" +TOP_INCDIR="${SRCDIR_PARENT}/include" +TOP_LIBDIR="${SRCDIR_PARENT}/lib" +DEST="${SRCDIR_PARENT}/${AFS_SYSNAME}/dest" dnl checks for header files. AC_HEADER_STDC @@ -362,6 +412,47 @@ AC_CHECK_HEADERS(security/pam_modules.h siad.h usersec.h) AC_CHECK_FUNCS(utimes random srandom getdtablesize snprintf re_comp re_exec) +dnl Directory PATH handling +if test "x$enable_transarc_paths" = "xyes" ; then + afsconfdir=${afsconfdir=/usr/afs/etc} + viceetcdir=${viceetcdir=/usr/vice/etc} + afskerneldir=${afskerneldir=${viceetcdir}} + afssrvbindir=${afssrvbindir=/usr/afs/bin} + afssrvsbindir=${afssrvsbindir=/usr/afs/bin} + afssrvlibexecdir=${afssrvlibexecdir=/usr/afs/bin} + afsdbdir=${afsdbdir=/usr/afs/db} + afslogsdir=${afslogsdir=/usr/afs/logs} + afslocaldir=${afslocaldir=/usr/afs/local} + afsbackupdir=${afsbackupdir=/usr/afs/backup} + afsbosconfigdir=${afsbosconfigdir=/usr/afs/local} + else + afsconfdir=${afsconfdir=$sysconfdir/openafs/server} + viceetcdir=${viceetcdir=$sysconfdir/openafs} + afskerneldir=${afskerneldir=$libdir/openafs} + afssrvbindir=${afssrvbindir=$bindir} + afssrvsbindir=${afssrvsbindir=$sbindir} + afssrvlibexecdir=${afssrvlibexecdir=$libexecdir/openafs} + afsdbdir=${afsdbdir=$localstatedir/openafs/db} + afslogsdir=${afslogsdir=$localstatedir/openafs/logs} + afslocaldir=${afslocaldir=$localstatedir/openafs} + afsbackupdir=${afsbackupdir=$localstatedir/openafs/backup} + afsbosconfigdir=${afsbosconfigdir=$sysconfdir/openafs} + +fi +afsperldir=${afsperldir=$libdir/perl5/site_perl} + +AC_SUBST(afsconfdir) +AC_SUBST(viceetcdir) +AC_SUBST(afskerneldir) +AC_SUBST(afssrvbindir) +AC_SUBST(afssrvsbindir) +AC_SUBST(afssrvlibexecdir) +AC_SUBST(afsdbdir) +AC_SUBST(afslogsdir) +AC_SUBST(afslocaldir) +AC_SUBST(afsbackupdir) +AC_SUBST(afsbosconfigdir) +AC_SUBST(afsperldir) if test "x$enable_kernel_module" = "xyes"; then ENABLE_KERNEL_MODULE=libafs fi @@ -373,14 +464,121 @@ AC_SUBST(LINUX_KERNEL_PATH) AC_SUBST(LINUX_VERSION) AC_SUBST(MKAFS_OSTYPE) AC_SUBST(TOP_SRCDIR) +AC_SUBST(TOP_INCDIR) +AC_SUBST(TOP_LIBDIR) +AC_SUBST(DEST) AC_SUBST(WITH_OBSOLETE) AC_SUBST(WITH_INSECURE) AC_OUTPUT( \ Makefile \ +src/afs/Makefile \ +src/afsd/Makefile \ +${DARWIN_PLIST} \ +src/afsmonitor/Makefile \ +src/afsweb/Makefile \ +src/audit/Makefile \ +src/auth/test/Makefile \ +src/auth/Makefile \ +src/bozo/test/Makefile \ +src/bozo/Makefile \ +src/bu_utils/Makefile \ +src/bubasics/Makefile \ +src/bucoord/Makefile \ +src/budb/Makefile \ +src/butc/Makefile \ +src/butm/Makefile \ +src/cmd/test/Makefile \ +src/cmd/Makefile \ +src/comerr/test/Makefile \ +src/comerr/Makefile \ +src/config/Makefile \ src/config/Makefile.version-NOCML \ src/config/Makefile.${AFS_SYSNAME} \ + src/cell-setup/Makefile +src/dauth/Makefile \ +src/des/test/Makefile \ +src/des/Makefile \ +src/des_stub/Makefile \ +src/dir/test/Makefile \ +src/dir/Makefile \ +src/export/Makefile \ +src/finale/Makefile \ +src/fsint/Makefile \ +src/fsprobe/Makefile \ +src/ftpd43+/Makefile \ +src/gtx/Makefile \ +src/inetd/Makefile \ +src/kauth/test/Makefile \ +src/kauth/Makefile \ +src/libacl/test/Makefile \ +src/libacl/Makefile \ +src/libadmin/adminutil/Makefile \ +src/libadmin/Makefile \ +src/libadmin/bos/Makefile \ +src/libadmin/cfg/test/Makefile \ +src/libadmin/cfg/Makefile \ +src/libadmin/client/Makefile \ +src/libadmin/kas/Makefile \ +src/libadmin/pts/Makefile \ +src/libadmin/samples/Makefile \ +src/libadmin/test/Makefile \ +src/libadmin/vos/Makefile \ src/libafs/MakefileProto.${MKAFS_OSTYPE} \ +src/libafsauthent/Makefile \ +src/libafsrpc/Makefile \ +src/libuafs/MakefileProto.${MKAFS_OSTYPE} \ +src/log/test/Makefile \ +src/log/Makefile \ +src/login/Makefile \ +src/lwp/test/Makefile \ +src/lwp/Makefile \ +src/mpp/Makefile \ +src/ntp/Makefile \ +src/null/Makefile \ +src/package/Makefile \ src/pam/Makefile \ -src/afsd/afs.ppc_darwin.plist \ +src/pinstall/test/Makefile \ +src/pinstall/Makefile \ +src/procmgmt/Makefile \ +src/procmgmt/test/Makefile \ +src/ptserver/Makefile \ +src/rcp/Makefile \ +src/rlogind/Makefile \ +src/rsh/Makefile \ +src/rx/Makefile \ +src/rx/bulk.example/Makefile \ +src/rx/bulktest/Makefile \ +src/rx/multi.example/Makefile \ +src/rx/simple.example/Makefile \ +src/rx/test/Makefile \ +src/rxdebug/Makefile \ +src/rxgen/Makefile \ +src/rxkad/Makefile \ +src/rxkad/test/Makefile \ +src/rxstat/Makefile \ +src/scout/Makefile \ +src/sgistuff/Makefile \ +src/sia/Makefile \ +src/sys/Makefile \ +src/tbutc/Makefile \ +src/tsm41/Makefile \ +src/tviced/Makefile \ +src/ubik/Makefile \ +src/update/Makefile \ +src/usd/test/Makefile \ +src/usd/Makefile \ +src/uss/Makefile \ +src/util/Makefile \ +src/util/test/Makefile \ +src/venus/test/Makefile \ +src/venus/Makefile \ +src/vfsck/Makefile \ +src/viced/Makefile \ +src/vlserver/Makefile \ +src/vol/Makefile \ +src/vol/test/Makefile \ +src/volser/Makefile \ +src/wsadmin.src/Makefile \ +src/xstat/Makefile \ ) -- 2.39.5