git://git.openafs.org / openafs.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw
darwin-build-updates-20010910
[openafs.git] / configure.in
diff --git a/configure.in b/configure.in
index 3313675..9335a9b 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -35,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
 
@@ -113,12 +116,20 @@ case $system in
                 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_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_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
@@ -187,20 +198,23 @@ else
                i?86-*-freebsd4.2*)
                        AFS_SYSNAME="i386_fbsd_42"
                        ;;
-               hppa2.0w-hp-hpux11*)
-                       AFS_SYSNAME="hp_ux110"
-                       ;;
-               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"
@@ -371,8 +385,9 @@ fi
 
 SRCDIR_PARENT=`pwd`
 TOP_SRCDIR="${SRCDIR_PARENT}/src"
-DESTDIR="${SRCDIR_PARENT}/${AFS_SYSNAME}/dest/"
-SRCDIR="${SRCDIR_PARENT}/${AFS_SYSNAME}/dest/"
+TOP_INCDIR="${SRCDIR_PARENT}/include"
+TOP_LIBDIR="${SRCDIR_PARENT}/lib"
+DEST="${SRCDIR_PARENT}/${AFS_SYSNAME}/dest"
 
 dnl checks for header files.
 AC_HEADER_STDC
@@ -387,6 +402,45 @@ 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
+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)
+
 if test "x$enable_kernel_module" = "xyes"; then
 ENABLE_KERNEL_MODULE=libafs
 fi
@@ -398,21 +452,17 @@ AC_SUBST(LINUX_KERNEL_PATH)
 AC_SUBST(LINUX_VERSION)
 AC_SUBST(MKAFS_OSTYPE)
 AC_SUBST(TOP_SRCDIR)
-AC_SUBST(DESTDIR)
-AC_SUBST(SRCDIR)
+AC_SUBST(TOP_INCDIR)
+AC_SUBST(TOP_LIBDIR)
+AC_SUBST(DEST)
 AC_SUBST(WITH_OBSOLETE)
 AC_SUBST(WITH_INSECURE)
 
 AC_OUTPUT(             \
 Makefile               \
-src/config/Makefile.version-NOCML \
-src/config/Makefile.${AFS_SYSNAME} \
-src/libafs/MakefileProto.${MKAFS_OSTYPE} \
-src/libuafs/MakefileProto.${MKAFS_OSTYPE} \
-src/pam/Makefile \
-src/afsd/afs.ppc_darwin.plist \
 src/afs/Makefile \
 src/afsd/Makefile \
+${DARWIN_PLIST} \
 src/afsmonitor/Makefile \
 src/afsweb/Makefile \
 src/audit/Makefile \
@@ -431,6 +481,8 @@ src/cmd/Makefile \
 src/comerr/test/Makefile \
 src/comerr/Makefile \
 src/config/Makefile \
+src/config/Makefile.version-NOCML \
+src/config/Makefile.${AFS_SYSNAME} \
 src/dauth/Makefile \
 src/des/test/Makefile \
 src/des/Makefile \
@@ -459,8 +511,10 @@ 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 \
@@ -485,6 +539,7 @@ 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 \
OpenAFS Master Repository