fix-destdir-support-for-fsconv-and-xfs-binaries-20011001

[openafs.git] / configure-libafs.in

diff --git a/configure-libafs.in b/configure-libafs.in
index 210b611..0529412 100644 (file)
--- a/configure-libafs.in
+++ b/configure-libafs.in
@@ -1,7 +1,7 @@
 AC_INIT(Makefile.common)
 AM_INIT_AUTOMAKE(openafs-libafs,devel)
 AC_CANONICAL_HOST
-AC_CONFIG_HEADER(src/config/afsconfig.h)
+AC_CONFIG_HEADER(config/afsconfig.h)
 
 #BOZO_SAVE_CORES BOS_RESTRICTED_MODE BOS_NEW_CONFIG pam sia
 AC_ARG_WITH(afs-sysname,
@@ -118,6 +118,7 @@ case $system in
                 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
@@ -127,6 +128,9 @@ case $system in
                 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
@@ -185,6 +189,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)
                 ;;
@@ -206,15 +214,18 @@ else
                        ;;
                powerpc-apple-darwin1.2*)
                        AFS_SYSNAME="ppc_darwin_12"
-                       DARWIN_PLIST=src/afsd/afs.${AFS_SYSNAME}.plist
+                       DARWIN_PLIST=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=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=afs.${AFS_SYSNAME}.plist
+                       DARWIN_INFOFILE=afs.${AFS_SYSNAME}.plist
                        ;;
                sparc-sun-solaris2.5*)
                        AFS_SYSNAME="sun4x_55"
@@ -384,10 +395,10 @@ if test "$enable_afsdb" = "yes"; then
 fi
 
 SRCDIR_PARENT=`pwd`
-TOP_SRCDIR="${SRCDIR_PARENT}/src"
+TOP_SRCDIR="${SRCDIR_PARENT}"
+DESTDIR="${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
@@ -457,6 +468,7 @@ AC_SUBST(TOP_LIBDIR)
 AC_SUBST(DEST)
 AC_SUBST(WITH_OBSOLETE)
 AC_SUBST(WITH_INSECURE)
+AC_SUBST(DARWIN_INFOFILE)
 
 AC_OUTPUT(             \
 Makefile               \