allow-configure-time-override-of-DEST-20011001

[openafs.git] / configure.in

diff --git a/configure.in b/configure.in
index 3f64330..aaeb6e4 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -115,6 +115,7 @@ case $system in
                 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_DEVICES
                 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
@@ -134,6 +135,9 @@ case $system in
                 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_devices" = "xyes"; then 
+                 AC_DEFINE(STRUCT_INODE_HAS_I_DEVICES)
+                fi
                 if test "x$ac_cv_linux_fs_struct_inode_has_i_cdev" = "xyes"; then 
                  AC_DEFINE(STRUCT_INODE_HAS_I_CDEV)
                 fi
@@ -189,6 +193,10 @@ case $system in
                MKAFS_OSTYPE=FBSD
                AC_MSG_RESULT(i386_fbsd)
                ;;
+       *-openbsd*)
+               MKAFS_OSTYPE=OBSD
+               AC_MSG_RESULT(i386_obsd)
+               ;;
         *)
                 AC_MSG_RESULT($system)
                 ;;
@@ -210,15 +218,18 @@ else
                        ;;
                powerpc-apple-darwin1.2*)
                        AFS_SYSNAME="ppc_darwin_12"
-                       DARWIN_PLIST=src/afsd/afs.${AFS_SYSNAME}.plist
+                       DARWIN_PLIST=src/libafs/afs.${AFS_SYSNAME}.plist
+                       DARWIN_INFOFILE=afs.${AFS_SYSNAME}.plist
                        ;;
                powerpc-apple-darwin1.3*)
                        AFS_SYSNAME="ppc_darwin_13"
-                       DARWIN_PLIST=src/afsd/afs.${AFS_SYSNAME}.plist
+                       DARWIN_PLIST=src/libafs/afs.${AFS_SYSNAME}.plist
+                       DARWIN_INFOFILE=afs.${AFS_SYSNAME}.plist
                        ;;
                powerpc-apple-darwin1.4*)
                        AFS_SYSNAME="ppc_darwin_14"
-                       DARWIN_PLIST=src/afsd/afs.${AFS_SYSNAME}.plist
+                       DARWIN_PLIST=src/libafs/afs.${AFS_SYSNAME}.plist
+                       DARWIN_INFOFILE=afs.${AFS_SYSNAME}.plist
                        ;;
                sparc-sun-solaris2.5*)
                        AFS_SYSNAME="sun4x_55"
@@ -391,7 +402,9 @@ SRCDIR_PARENT=`pwd`
 TOP_SRCDIR="${SRCDIR_PARENT}/src"
 TOP_INCDIR="${SRCDIR_PARENT}/include"
 TOP_LIBDIR="${SRCDIR_PARENT}/lib"
-DEST="${SRCDIR_PARENT}/${AFS_SYSNAME}/dest"
+if test "${DEST}x" = "x"; then
+       DEST="${SRCDIR_PARENT}/${AFS_SYSNAME}/dest"
+fi
 
 dnl checks for header files.
 AC_HEADER_STDC
@@ -461,12 +474,12 @@ AC_SUBST(TOP_LIBDIR)
 AC_SUBST(DEST)
 AC_SUBST(WITH_OBSOLETE)
 AC_SUBST(WITH_INSECURE)
+AC_SUBST(DARWIN_INFOFILE)
 
 AC_OUTPUT(             \
 Makefile               \
 src/afs/Makefile \
 src/afsd/Makefile \
-${DARWIN_PLIST} \
 src/afsmonitor/Makefile \
 src/afsweb/Makefile \
 src/audit/Makefile \
@@ -516,6 +529,7 @@ src/libadmin/samples/Makefile \
 src/libadmin/test/Makefile \
 src/libadmin/vos/Makefile \
 src/libafs/MakefileProto.${MKAFS_OSTYPE} \
+${DARWIN_PLIST} \
 src/libafsauthent/Makefile \
 src/libafsrpc/Makefile \
 src/libuafs/MakefileProto.${MKAFS_OSTYPE} \