DEVEL15-linux-configure-vfs-update-20070612
[openafs.git] / src / cf / osconf.m4
index 8c689b9..a91a962 100644 (file)
@@ -1,15 +1,27 @@
 
-AC_DEFUN(OPENAFS_OSCONF, [
+AC_DEFUN([OPENAFS_OSCONF], [
 
 dnl defaults, override in case below as needed
-DBG="-g"
-OPTMZ="-O2"
-XCFLAGS="-O2"
+CFLAGS=
+XCFLAGS='${DBG} ${OPTMZ}'
 SHLIB_SUFFIX="so"
 CC="cc"
+CCOBJ="cc"
 MT_CC="cc"
 XLIBS="${LIB_AFSDB}"
 
+dnl debugging and optimization flag defaults
+dnl Note, these are all the defaults for if debug/optimize turned on, and
+dnl the arch cases below do override as needed
+KERN_DBG=-g
+KERN_OPTMZ=-O
+DBG=-g
+OPTMZ=-O
+LWP_DBG=-g
+LWP_OPTMZ=-O
+PAM_DBG=-g
+PAM_OPTMZ=
+
 dnl standard programs
 AC_PROG_RANLIB
 AC_CHECK_PROGS(AS, as, [${am_missing_run}as])
@@ -21,48 +33,88 @@ AC_CHECK_PROGS(CP, cp, [${am_missing_run}cp])
 AC_CHECK_PROGS(STRIP, strip, [${am_missing_run}strip])
 AC_CHECK_PROGS(LORDER, lorder, [${am_missing_run}lorder])
 
+dnl TODO - need to disable STRIP if we are doing debugging in any user space code
+
 case $AFS_SYSNAME in
        alpha_dux40)
+               LEX="lex"
                CSTATIC="-non_shared"
                DBG="-g3"
-               LWP_OPTMZ="-O2"
                MT_CFLAGS='-D_REENTRANT=1 -pthread -DAFS_PTHREAD_ENV ${XCFLAGS}'
                MT_LIBS="-pthread -lpthread -lmach -lexc -lc"
                TXLIBS="-lcurses"
                XCFLAGS="-D_NO_PROTO -DOSF"
+               SHLIB_LINKER="${CC} -all -shared -expect_unresolved \"*\""
                ;;
 
        alpha_dux50)
                LEX="flex -l"
                DBG="-g3"
                CSTATIC="-non_shared"
+               MT_CFLAGS='-D_REENTRANT=1 -pthread -DAFS_PTHREAD_ENV ${XCFLAGS}'
+               MT_LIBS="-pthread -lpthread -lmach -lexc -lc"
+               TXLIBS="-lcurses"
+               XCFLAGS="-D_NO_PROTO -DOSF"
+               SHLIB_LINKER="${CC} -all -shared -expect_unresolved \"*\""
+               ;;
+
+       alpha_dux51)
+               LEX="flex -l"
+               DBG="-g3"
+               CSTATIC="-non_shared"
                LWP_OPTMZ="-O2"
                MT_CFLAGS='-D_REENTRANT=1 -pthread -DAFS_PTHREAD_ENV ${XCFLAGS}'
                MT_LIBS="-pthread -lpthread -lmach -lexc -lc"
                TXLIBS="-lcurses"
                XCFLAGS="-D_NO_PROTO -DOSF"
+               SHLIB_LINKER="${CC} -all -shared -expect_unresolved \"*\""
                ;;
 
        alpha_linux_22)
+               KERN_OPTMZ=-O2
                LEX="flex -l"
                MT_CFLAGS='-DAFS_PTHREAD_ENV -pthread -D_REENTRANT ${XCFLAGS}'
                MT_LIBS="-lpthread"
-               PAM_CFLAGS="-O2 -Dlinux -DLINUX_PAM -fPIC"
+               PAM_OPTMZ=-O2
+               PAM_CFLAGS="-Dlinux -DLINUX_PAM -fPIC"
+               SHLIB_CFLAGS="-fPIC"
                SHLIB_LDFLAGS="-shared -Xlinker -x"
-               TXLIBS="/usr/lib/libncurses.so"
-               XCFLAGS="-O2 -D_LARGEFILE64_SOURCE"
+               TXLIBS="-lncurses"
+               XCFLAGS="-D_LARGEFILE64_SOURCE"
                YACC="bison -y"
+               SHLIB_LINKER="${MT_CC} -shared"
                ;;
 
        alpha_linux_24)
+               CCOBJ="${CC} -fPIC"
+               KERN_OPTMZ=-O2
+               LEX="flex -l"
+               MT_CFLAGS='-DAFS_PTHREAD_ENV -pthread -D_REENTRANT ${XCFLAGS}'
+               MT_LIBS="-lpthread"
+               PAM_OPTMZ=-O2
+               PAM_CFLAGS="-Dlinux -DLINUX_PAM -fPIC"
+               SHLIB_CFLAGS="-fPIC"
+               SHLIB_LDFLAGS="-shared -Xlinker -x"
+               TXLIBS="-lncurses"
+               XCFLAGS="-D_LARGEFILE64_SOURCE"
+               YACC="bison -y"
+               SHLIB_LINKER="${MT_CC} -shared"
+               ;;
+
+       alpha_linux_26)
+               CCOBJ="${CC} -fPIC"
+               KERN_OPTMZ=-O2
                LEX="flex -l"
                MT_CFLAGS='-DAFS_PTHREAD_ENV -pthread -D_REENTRANT ${XCFLAGS}'
                MT_LIBS="-lpthread"
-               PAM_CFLAGS="-O2 -Dlinux -DLINUX_PAM -fPIC"
+               PAM_OPTMZ=-O2
+               PAM_CFLAGS="-Dlinux -DLINUX_PAM -fPIC"
+               SHLIB_CFLAGS="-fPIC"
                SHLIB_LDFLAGS="-shared -Xlinker -x"
-               TXLIBS="/usr/lib/libncurses.so"
-               XCFLAGS="-O2 -D_LARGEFILE64_SOURCE"
+               TXLIBS="-lncurses"
+               XCFLAGS="-D_LARGEFILE64_SOURCE"
                YACC="bison -y"
+               SHLIB_LINKER="${MT_CC} -shared"
                ;;
 
        hp_ux102)
@@ -89,12 +141,14 @@ case $AFS_SYSNAME in
                XCFLAGS64="${XCFLAGS0} +DA2.0W"
                XCFLAGS="${XCFLAGS0} +DA1.0"
                YACC="/opt/langtools/bin/yacc"
+               SHLIB_LINKER="ld -b"
                ;;
 
-       hp_ux110)
+       hp_ux11*)
                AR="/usr/bin/ar"
                AS="/usr/ccs/bin/as"
                CC="/opt/ansic/bin/cc"
+               CCOBJ="/opt/ansic/bin/cc"
                DBM="/lib/libndbm.a"
                LD="/bin/ld   "
                LEX="/opt/langtools/bin/lex"
@@ -116,318 +170,578 @@ case $AFS_SYSNAME in
                XCFLAGS64="${XCFLAGS0} +DA2.0W"
                XCFLAGS="${XCFLAGS0} +DA1.0"
                XLIBELFA="-lelf"
-               XLIBS="${LIB_AFSDB} -lnsl"
+               #XLIBS="${LIB_AFSDB} -lnsl"
+               XLIBS="${LIB_AFSDB}"
+               YACC="/opt/langtools/bin/yacc"
+               SHLIB_LINKER="ld -b"
+               ;;
+
+       ia64_hpux*)
+               AR="/usr/bin/ar"
+               AS="/usr/ccs/bin/as"
+               CC="/opt/ansic/bin/cc"
+               CCOBJ="/opt/ansic/bin/cc"
+               DBM="/lib/hpux32/libndbm.so"
+               LD="/bin/ld   "
+               LEX="/opt/langtools/bin/lex"
+               LWP_OPTMZ=""
+               MT_CC="$CC"
+               MT_CFLAGS='-D_POSIX_C_SOURCE=199506L -DAFS_PTHREAD_ENV ${XCFLAGS}'
+               MT_LIBS="-lpthread"
+               MV="/bin/mv"
+               OPTMZ="-O"
+               PAM_CFLAGS="-b +z -Wl,+k"
+               PAM_LIBS="/usr/lib/hpux32/libpam.so"
+               RANLIB="/usr/bin/ranlib"
+               RM="/bin/rm"
+               SHLIB_LDFLAGS="-b -Bsymbolic"
+               SHLIB_SUFFIX="sl"
+               TXLIBS="/usr/lib/hpux32/libcurses.so"
+               VFSCK_CFLAGS="-I/usr/old/usr/include -D_FILE64"
+               XCFLAGS0="-ldld -lc -Wp,-H200000 -Wl,-a,archive_shared -DAUTH_DBM_LOG +z -Wl,+k -D_LARGEFILE64_SOURCE"
+               XCFLAGS64="${XCFLAGS0} +DD64"
+               XCFLAGS="${XCFLAGS0}"
+               XLIBELFA="-lelf"
+               #XLIBS="${LIB_AFSDB} -lnsl"
+               XLIBS="${LIB_AFSDB}"
                YACC="/opt/langtools/bin/yacc"
+               SHLIB_LINKER="ld -b"
                ;;
 
-       i386_fbsd_42)
+       *fbsd_*)
                LEX="flex -l"
                MT_CFLAGS='-DAFS_PTHREAD_ENV -pthread -D_REENTRANT ${XCFLAGS}'
                MT_LIBS="-pthread"
-               PAM_CFLAGS="-O2 -pipe -fPIC"
+               PAM_OPTMZ=-O2
+               PAM_CFLAGS="-pipe -fPIC"
                SHLIB_LDFLAGS="-shared -Xlinker -x"
-               TXLIBS="/usr/lib/libncurses.so"
-               XCFLAGS="-O2 -pipe"
-               XLIBS="${LIB_AFSDB} -lcompat"
+               SHLIB_LINKER="${MT_CC} -shared"
+               TXLIBS="-lncurses"
+               XCFLAGS="-pipe"
                YACC="byacc"
                ;;
 
-       i386_fbsd_43)
+       *nbsd2*|*nbsd3*|*nbsd4*)
+               LEX="flex -l"
+               MT_CFLAGS='${XCFLAGS} -DAFS_PTHREAD_ENV -D_REENTRANT '
+               MT_LIBS="-lpthread" # XXX -pthread soon
+               PAM_OPTMZ=-O2
+               PAM_CFLAGS="-pipe -fPIC"
+               SHLIB_LDFLAGS="-shared -Xlinker -x"
+               SHLIB_LINKER="${MT_CC} -shared"
+               TXLIBS="/usr/lib/libcurses.so"
+               XCFLAGS="-pipe"
+               YACC="yacc"
+               ;;
+
+       *nbsd15|*nbsd16)
+               LEX="flex -l"
+               MT_CFLAGS='${XCFLAGS}'
+               MT_LIBS=""
+               PAM_OPTMZ=-O2
+               PAM_CFLAGS="-pipe -fPIC"
+               SHLIB_LDFLAGS="-shared -Xlinker -x"
+               SHLIB_LINKER="${MT_CC} -shared"
+               TXLIBS="/usr/lib/libcurses.so"
+               XCFLAGS="-pipe"
+               YACC="bison -y"
+               ;;
+
+       ia64_linux24|ia64_linux26)
+               KERN_OPTMZ=-O2
                LEX="flex -l"
                MT_CFLAGS='-DAFS_PTHREAD_ENV -pthread -D_REENTRANT ${XCFLAGS}'
-               MT_LIBS="-pthread"
-               PAM_CFLAGS="-O2 -pipe -fPIC"
+               MT_LIBS="-lpthread"
+               PAM_OPTMZ=-O2
+               PAM_CFLAGS="-Dlinux -DLINUX_PAM -fPIC"
+               SHLIB_CFLAGS="-fPIC"
                SHLIB_LDFLAGS="-shared -Xlinker -x"
-               TXLIBS="/usr/lib/libncurses.so"
-               XCFLAGS="-O2 -pipe"
-               XLIBS="${LIB_AFSDB} -lcompat"
-               YACC="byacc"
+               TXLIBS="-lncurses"
+               XCFLAGS="-D_LARGEFILE64_SOURCE -G0"
+               SHLIB_LINKER="${MT_CC} -shared"
                ;;
 
-       i386_fbsd_44)
+       amd64_linux*)
+               CCOBJ="${CC} -fPIC"
+               KERN_OPTMZ=-O2
                LEX="flex -l"
                MT_CFLAGS='-DAFS_PTHREAD_ENV -pthread -D_REENTRANT ${XCFLAGS}'
-               MT_LIBS="-pthread"
-               #MT_CFLAGS='-DAFS_PTHREAD_ENV -D_THREAD_SAFE -I/usr/local/include/pthread/linuxthreads ${XCFLAGS}'
-               #MT_LIBS="-L/usr/local/lib -llthread -llgcc_r"
-               PAM_CFLAGS="-O2 -pipe -fPIC"
+               MT_LIBS="-lpthread"
+               PAM_OPTMZ=-O2
+               PAM_CFLAGS="-Dlinux -DLINUX_PAM -fPIC"
+               SHLIB_CFLAGS="-fPIC"
                SHLIB_LDFLAGS="-shared -Xlinker -x"
-               TXLIBS="/usr/lib/libncurses.so"
-               XCFLAGS="-O2 -pipe"
-               XLIBS="${LIB_AFSDB} -lcompat"
-               YACC="byacc"
+               TXLIBS="-lncurses"
+               XCFLAGS="-D_LARGEFILE64_SOURCE"
+               SHLIB_LINKER="${MT_CC} -shared"
                ;;
 
-       i386_fbsd_45)
+       ppc64_linux24)
+               KERN_OPTMZ=-O2
                LEX="flex -l"
                MT_CFLAGS='-DAFS_PTHREAD_ENV -pthread -D_REENTRANT ${XCFLAGS}'
-               MT_LIBS="-pthread"
-               #MT_CFLAGS='-DAFS_PTHREAD_ENV -D_THREAD_SAFE -I/usr/local/include/pthread/linuxthreads ${XCFLAGS}'
-               #MT_LIBS="-L/usr/local/lib -llthread -llgcc_r"
-               PAM_CFLAGS="-O2 -pipe -fPIC"
+               MT_LIBS="-lpthread"
+               PAM_OPTMZ=-O2
+               PAM_CFLAGS="-Dlinux -DLINUX_PAM -fPIC"
                SHLIB_LDFLAGS="-shared -Xlinker -x"
-               TXLIBS="/usr/lib/libncurses.so"
-               XCFLAGS="-O2 -pipe"
-               XLIBS="${LIB_AFSDB} -lcompat"
-               YACC="byacc"
+               SHLIB_CFLAGS="-fPIC"
+               TXLIBS="/usr/lib64/libncurses.so"
+               XCFLAGS="-D_LARGEFILE64_SOURCE"
+               SHLIB_LINKER="${MT_CC} -shared"
                ;;
 
-       *nbsd15)
+       ppc64_linux26)
+               KERN_OPTMZ=-O2
                LEX="flex -l"
-               MT_CFLAGS='${XCFLAGS}'
-               MT_LIBS=""
-               PAM_CFLAGS="-O2 -pipe -fPIC"
+               MT_CFLAGS='-DAFS_PTHREAD_ENV -pthread -D_REENTRANT ${XCFLAGS}'
+               MT_LIBS="-lpthread"
+               PAM_OPTMZ=-O2
+               PAM_CFLAGS="-Dlinux -DLINUX_PAM -fPIC"
                SHLIB_LDFLAGS="-shared -Xlinker -x"
-               TXLIBS="/usr/lib/libcurses.so"
-               XCFLAGS="-O2 -pipe"
-               XLIBS="${LIB_AFSDB} -lcompat"
+               SHLIB_CFLAGS="-fPIC"
+               TXLIBS="-lncurses"
+               XCFLAGS="-D_LARGEFILE64_SOURCE -fPIC"
                YACC="bison -y"
+               SHLIB_LINKER="${MT_CC} -shared"
                ;;
 
-       ia64_linux24)
+       i386_umlinux22)
+               CC="gcc -pipe"
+               CCOBJ="gcc -pipe"
+               MT_CC="gcc -pipe"
+               KERN_OPTMZ=-O2
                LEX="flex -l"
                MT_CFLAGS='-DAFS_PTHREAD_ENV -pthread -D_REENTRANT ${XCFLAGS}'
                MT_LIBS="-lpthread"
-               PAM_CFLAGS="-g -O2 -Dlinux -DLINUX_PAM -fPIC"
+               PAM_OPTMZ=-O2
+               PAM_CFLAGS="-Dlinux -DLINUX_PAM -fPIC"
+               SHLIB_CFLAGS="-fPIC"
                SHLIB_LDFLAGS="-shared -Xlinker -x"
-               TXLIBS="/usr/lib/libncurses.so"
-               XCFLAGS="-g -O2 -D_LARGEFILE64_SOURCE"
+               TXLIBS="-lncurses"
+               XCFLAGS="-D_LARGEFILE64_SOURCE"
+               YACC="bison -y"
+               SHLIB_LINKER="${MT_CC} -shared"
                ;;
 
-       i386_linux22)
+       i386_linux*)
+               CC="gcc -pipe"
+               CCOBJ="gcc -pipe"
+               MT_CC="gcc -pipe"
+               KERN_OPTMZ=-O2
                LEX="flex -l"
                MT_CFLAGS='-DAFS_PTHREAD_ENV -pthread -D_REENTRANT ${XCFLAGS}'
                MT_LIBS="-lpthread"
-               PAM_CFLAGS="-O2 -Dlinux -DLINUX_PAM -fPIC"
+               DBG=-g
+               KERN_DBG=-g
+               LWP_DBG=-g
+               LWP_OPTMZ=-O2
+               OPTMZ=-O2
+               PAM_CFLAGS="-Dlinux -DLINUX_PAM -fPIC"
+               SHLIB_CFLAGS="-fPIC"
                SHLIB_LDFLAGS="-shared -Xlinker -x"
-               TXLIBS="/usr/lib/libncurses.so"
-               XCFLAGS="-O2 -D_LARGEFILE64_SOURCE"
-               YACC="bison -y"
+               TXLIBS="-lncurses"
+               XCFLAGS="-D_LARGEFILE64_SOURCE"
+               SHLIB_LINKER="${MT_CC} -shared"
                ;;
 
-       i386_linux24)
+       i386_umlinux24)
+               CC="gcc -pipe"
+               CCOBJ="gcc -pipe"
+               MT_CC="gcc -pipe"
+               KERN_OPTMZ=-O2
                LEX="flex -l"
                MT_CFLAGS='-DAFS_PTHREAD_ENV -pthread -D_REENTRANT ${XCFLAGS}'
                MT_LIBS="-lpthread"
-               PAM_CFLAGS="-O2 -Dlinux -DLINUX_PAM -fPIC"
+               DBG=-g
+               KERN_DBG=-g
+               LWP_DBG=-g
+               LWP_OPTMZ=-O2
+               OPTMZ=-O2
+               PAM_OPTMZ=-O2
+               PAM_CFLAGS="-Dlinux -DLINUX_PAM -fPIC"
+               SHLIB_CFLAGS="-fPIC"
                SHLIB_LDFLAGS="-shared -Xlinker -x"
-               TXLIBS="/usr/lib/libncurses.so"
-               XCFLAGS="-O2 -D_LARGEFILE64_SOURCE"
+               TXLIBS="-lncurses"
+               XCFLAGS="-D_LARGEFILE64_SOURCE"
+               SHLIB_LINKER="${MT_CC} -shared"
                ;;
-       
-       i386_obsd29)
+
+       i386_umlinux26)
+               CC="gcc -pipe"
+               CCOBJ="gcc -pipe"
+               MT_CC="gcc -pipe"
+               KERN_OPTMZ=-O2
+               LEX="flex -l"
+               MT_CFLAGS='-DAFS_PTHREAD_ENV -pthread -D_REENTRANT ${XCFLAGS}'
+               MT_LIBS="-lpthread"
+               DBG=-g
+               KERN_DBG=-g
+               LWP_DBG=-g
+               LWP_OPTMZ=-O2
+               OPTMZ=-O2
+               PAM_OPTMZ=-O2
+               PAM_CFLAGS="-Dlinux -DLINUX_PAM -fPIC"
+               SHLIB_CFLAGS="-fPIC"
+               SHLIB_LDFLAGS="-shared -Xlinker -x"
+               TXLIBS="-lncurses"
+               XCFLAGS="-D_LARGEFILE64_SOURCE"
+               SHLIB_LINKER="${MT_CC} -shared"
+               ;;
+
+       *_obsd*)
+               KRB5CFLAGS="-I/usr/include/kerberosV"
+               KRB5LIBS="-lkrb5 -lcrypto"
                LEX="flex -l"
                MT_CFLAGS='-DAFS_PTHREAD_ENV -pthread -D_REENTRANT ${XCFLAGS}'
                MT_LIBS="-pthread"
-               PAM_CFLAGS="-O2 -pipe -fpic"
+               PAM_OPTMZ=-O2
+               PAM_CFLAGS="-pipe -fpic"
                SHLIB_CFLAGS="-fpic"
                SHLIB_LDFLAGS="-shared -Xlinker -x"
+               SHLIB_LINKER="${MT_CC} -shared"
                TXLIBS="/usr/lib/libcurses.a"
-               XCFLAGS="-O2"
-               XLIBS="${LIB_AFSDB} -lcompat"
+               XCFLAGS=
                YACC="yacc"
                ;;
 
        parisc_linux24)
+               KERN_OPTMZ=-O2
                LEX="flex -l"
                MT_CFLAGS='-DAFS_PTHREAD_ENV -pthread -D_REENTRANT ${XCFLAGS}'
                MT_LIBS="-lpthread"
-               PAM_CFLAGS="-O2 -Dlinux -DLINUX_PAM -fPIC"
+               PAM_OPTMZ=-O2
+               PAM_CFLAGS="-Dlinux -DLINUX_PAM -fPIC"
+               SHLIB_CFLAGS="-fPIC"
                SHLIB_LDFLAGS="-shared -Xlinker -x"
-               TXLIBS="/usr/lib/libncurses.so"
-               XCFLAGS="-O2 -D_LARGEFILE64_SOURCE"
+               TXLIBS="-lncurses"
+               XCFLAGS="-D_LARGEFILE64_SOURCE"
                YACC="bison -y"
+               SHLIB_LINKER="${MT_CC} -shared"
                ;;
 
        ppc_darwin_12)
+               AFSD_LDFLAGS="-F/System/Library/PrivateFrameworks -framework DiskArbitration"
                LEX="lex -l"
-               LWP_OPTMZ="-g"
-               OPTMZ="-g"
                REGEX_OBJ="regex.o"
                XCFLAGS="-traditional-cpp"
+               SHLIB_LINKER="${MT_CC} -dynamiclib"
+               SHLIB_SUFFIX="dylib"
                ;;
 
        ppc_darwin_13)
+               AFSD_LDFLAGS="-F/System/Library/PrivateFrameworks -framework DiskArbitration"
                LEX="lex -l"
                LWP_OPTMZ="-O2"
                REGEX_OBJ="regex.o"
                XCFLAGS="-no-cpp-precomp"
+               SHLIB_LINKER="${MT_CC} -dynamiclib"
+               SHLIB_SUFFIX="dylib"
                ;;
 
        ppc_darwin_14)
+               AFSD_LDFLAGS="-F/System/Library/PrivateFrameworks -framework DiskArbitration"
                LEX="lex -l"
                LWP_OPTMZ="-O2"
                REGEX_OBJ="regex.o"
                XCFLAGS="-no-cpp-precomp"
+               SHLIB_LINKER="${MT_CC} -dynamiclib"
+               SHLIB_SUFFIX="dylib"
                ;;
 
-       ppc_linux22)
-               INSTALL="install"
-               LEX="flex -l"
-               MT_CFLAGS='-DAFS_PTHREAD_ENV -pthread -D_REENTRANT ${XCFLAGS}'
-               MT_LIBS="-lpthread"
-               PAM_CFLAGS="-O2 -Dlinux -DLINUX_PAM -fPIC"
-               SHLIB_LDFLAGS="-shared -Xlinker -x"
-               TXLIBS="/usr/lib/libncurses.so"
-               XCFLAGS="-O2 -D_LARGEFILE64_SOURCE"
-               YACC="bison -y"
+       ppc_darwin_60)
+               AFSD_LDFLAGS="-F/System/Library/PrivateFrameworks -framework DiskArbitration"
+               LEX="lex -l"
+               LWP_OPTMZ="-O2"
+               REGEX_OBJ="regex.o"
+               XCFLAGS="-no-cpp-precomp"
+               TXLIBS="-lncurses"
+               SHLIB_LINKER="${MT_CC} -dynamiclib"
+               SHLIB_SUFFIX="dylib"
+               ;;
+
+       ppc_darwin_70)
+               AFSD_LDFLAGS="-F/System/Library/PrivateFrameworks -framework DiskArbitration"
+               LEX="lex -l"
+               MT_CFLAGS='-DAFS_PTHREAD_ENV -D_REENTRANT ${XCFLAGS}'
+               KROOT=
+               KINCLUDES='-I$(KROOT)/System/Library/Frameworks/Kernel.framework/Headers'
+               LWP_OPTMZ="-O2"
+               REGEX_OBJ="regex.o"
+               XCFLAGS="-no-cpp-precomp"
+               TXLIBS="-lncurses"
+               EXTRA_VLIBOBJS="fstab.o"
+               SHLIB_LINKER="${MT_CC} -dynamiclib"
+               SHLIB_SUFFIX="dylib"
+               ;;
+
+       *_darwin_80)
+               AFSD_LDFLAGS="-F/System/Library/PrivateFrameworks -framework DiskArbitration"
+               LEX="lex -l"
+               MT_CFLAGS='-DAFS_PTHREAD_ENV -D_REENTRANT ${XCFLAGS} ${ARCHFLAGS}'
+               KROOT=
+               KINCLUDES='-I$(KROOT)/System/Library/Frameworks/Kernel.framework/Headers'
+               KERN_OPTMZ="-Os"
+               LWP_OPTMZ="-Os"
+               OPTMZ="-Os"
+               REGEX_OBJ="regex.o"
+               TXLIBS="-lncurses"
+               EXTRA_VLIBOBJS="fstab.o"
+               SHLIB_LINKER="${MT_CC} -dynamiclib"
+               SHLIB_SUFFIX="dylib"
+               ;;
+
+       *_darwin_90)
+               AFSD_LDFLAGS="-F/System/Library/PrivateFrameworks -framework DiskArbitration"
+               LEX="lex -l"
+               MT_CFLAGS='-DAFS_PTHREAD_ENV -D_REENTRANT ${XCFLAGS} ${ARCHFLAGS}'
+               KROOT=
+               KINCLUDES='-I$(KROOT)/System/Library/Frameworks/Kernel.framework/Headers'
+               LD="cc"
+               KERN_OPTMZ="-Os"
+               LWP_OPTMZ="-Os"
+               OPTMZ="-Os"
+               REGEX_OBJ="regex.o"
+               TXLIBS="-lncurses"
+               EXTRA_VLIBOBJS="fstab.o"
+               SHLIB_LINKER="${MT_CC} -dynamiclib"
+               SHLIB_SUFFIX="dylib"
                ;;
 
-       ppc_linux24)
+       ppc_linux*)
+               KERN_OPTMZ=-O2
                LEX="flex -l"
                MT_CFLAGS='-DAFS_PTHREAD_ENV -pthread -D_REENTRANT ${XCFLAGS}'
                MT_LIBS="-lpthread"
-               PAM_CFLAGS="-O2 -Dlinux -DLINUX_PAM -fPIC"
+               PAM_OPTMZ=-O2
+               PAM_CFLAGS="-Dlinux -DLINUX_PAM -fPIC"
+               SHLIB_CFLAGS="-fPIC"
                SHLIB_LDFLAGS="-shared -Xlinker -x"
-               TXLIBS="/usr/lib/libncurses.so"
-               XCFLAGS="-O2 -D_LARGEFILE64_SOURCE"
+               TXLIBS="-lncurses"
+               XCFLAGS="-D_LARGEFILE64_SOURCE"
                YACC="bison -y"
+               SHLIB_LINKER="${MT_CC} -shared"
                ;;
 
        rs_aix42)
                DBG=""
                LEX="lex"
                LIBSYS_AIX_EXP="afsl.exp"
-               LWP_OPTMZ="-O"
                MT_CC="xlc_r"
                MT_CFLAGS='-DAFS_PTHREAD_ENV ${XCFLAGS}'
                MT_LIBS="-lpthreads"
-               OPTMZ="-O"
                SHLIB_SUFFIX="o"
                TXLIBS="-lcurses"
-               XCFLAGS="-K -D_NO_PROTO -D_NONSTD_TYPES -D_MBI=void"
+               XCFLAGS="-K -D_NONSTD_TYPES -D_MBI=void"
                XLIBS="${LIB_AFSDB} -ldl"
+               SHLIB_LINKER="${MT_CC} -bM:SRE -berok"
+               AIX64="#"
+               ;;
+
+
+       rs_aix51)
+               DBG=""
+               LEX="lex"
+               LIBSYS_AIX_EXP="afsl.exp"
+               MT_CC="xlc_r"
+               MT_CFLAGS='-DAFS_PTHREAD_ENV ${XCFLAGS}'
+               MT_LIBS="-lpthreads"
+               SHLIB_SUFFIX="o"
+               TXLIBS="-lcurses"
+               XCFLAGS="-K -D_NONSTD_TYPES -D_MBI=void"
+               XLIBS="${LIB_AFSDB} -ldl"
+               SHLIB_LINKER="${MT_CC} -bM:SRE -berok"
+               AIX64=""
+               ;;
+
+       rs_aix52)       
+               DBG=""
+               LEX="lex"
+               LIBSYS_AIX_EXP="afsl.exp"
+               MT_CC="xlc_r"
+               MT_CFLAGS='-DAFS_PTHREAD_ENV ${XCFLAGS}'
+               MT_LIBS="-lpthreads"
+               SHLIB_SUFFIX="o"
+               TXLIBS="-lcurses"
+               XCFLAGS="-K -D_NONSTD_TYPES -D_MBI=void"
+               XLIBS="${LIB_AFSDB} -ldl"
+               SHLIB_LINKER="${MT_CC} -bM:SRE -berok"
+               AIX64=""
+               ;;
+
+       rs_aix53)       
+               DBG="-g"
+               LEX="lex"
+               LIBSYS_AIX_EXP="afsl.exp"
+               MT_CC="xlc_r"
+               MT_CFLAGS='-DAFS_PTHREAD_ENV ${XCFLAGS}'
+               MT_LIBS="-lpthreads"
+               SHLIB_SUFFIX="o"
+               TXLIBS="-lcurses"
+               XCFLAGS="-K -D_NONSTD_TYPES -D_MBI=void"
+               XLIBS="${LIB_AFSDB} -ldl"
+               SHLIB_LINKER="${MT_CC} -bM:SRE -berok"
+               AIX64=""
                ;;
 
        s390_linux22)
                CC="gcc"
-               LD="gcc"
+               CCOBJ="gcc"
+               LD="ld"
+               KERN_OPTMZ=-O2
                LEX="flex -l"
                MT_CC="$CC"
                MT_CFLAGS='-DAFS_PTHREAD_ENV -pthread -D_REENTRANT ${XCFLAGS}'
                MT_LIBS="-lpthread"
-               OPTMZ="-O"
-               PAM_CFLAGS="-O -Dlinux -DLINUX_PAM -fPIC"
+               PAM_OPTMZ=-O
+               PAM_CFLAGS="-Dlinux -DLINUX_PAM -fPIC"
+               SHLIB_CFLAGS="-fPIC"
                SHLIB_LDFLAGS="-shared -Xlinker -x"
-               TXLIBS="/usr/lib/libncurses.so"
-               XCFLAGS="-O -g -D_LARGEFILE64_SOURCE"
+               TXLIBS="-lncurses"
+               OPTMZ=-O
+               XCFLAGS="-D_LARGEFILE64_SOURCE"
                YACC="bison -y"
+               SHLIB_LINKER="${MT_CC} -shared"
                ;;
 
-       s390_linux24)
+       s390_linux24|s390_linux26)
                CC="gcc"
-               LD="gcc"
+               CCOBJ="gcc"
+               LD="ld"
+               KERN_OPTMZ=-O2
                LEX="flex -l"
                MT_CC="$CC"
                MT_CFLAGS='-DAFS_PTHREAD_ENV -pthread -D_REENTRANT ${XCFLAGS}'
                MT_LIBS="-lpthread"
-               OPTMZ="-O"
-               PAM_CFLAGS="-O -Dlinux -DLINUX_PAM -fPIC"
+               PAM_OPTMZ=-O2
+               PAM_CFLAGS="-Dlinux -DLINUX_PAM -fPIC"
+               SHLIB_CFLAGS="-fPIC"
                SHLIB_LDFLAGS="-shared -Xlinker -x"
-               TXLIBS="/usr/lib/libncurses.so"
-               XCFLAGS="-O -g -D_LARGEFILE64_SOURCE"
+               TXLIBS="-lncurses"
+               XCFLAGS="-D_LARGEFILE64_SOURCE"
+               YACC="bison -y"
+               SHLIB_LINKER="${MT_CC} -shared"
+               ;;
+
+       s390x_linux24|s390x_linux26)
+               CC="gcc"
+               CCOBJ="gcc -fPIC"
+               LD="ld"
+               KERN_OPTMZ=-O2
+               LEX="flex -l"
+               MT_CC="$CC"
+               MT_CFLAGS='-DAFS_PTHREAD_ENV -pthread -D_REENTRANT ${XCFLAGS}'
+               MT_LIBS="-lpthread"
+               PAM_OPTMZ=-O
+               PAM_CFLAGS="-Dlinux -DLINUX_PAM -fPIC"
+               SHLIB_CFLAGS="-fPIC"
+               SHLIB_LDFLAGS="-shared -Xlinker -x -Xlinker -Bsymbolic"
+               TXLIBS="-lncurses"
+               OPTMZ=-O
+               XCFLAGS="-D_LARGEFILE64_SOURCE -D__s390x__"
                YACC="bison -y"
+               SHLIB_LINKER="${MT_CC} -shared"
                ;;
 
        sgi_62)
+               PINSTALL_LIBS=-lmld
+               AFSD_LIBS="/usr/lib/libdwarf.a /usr/lib/libelf.a"
                FSINCLUDES="-I/usr/include/sys/fs"
                LEX="lex"
-               LWP_OPTMZ="-O"
                MT_CFLAGS='-D_SGI_MP_SOURCE -DAFS_PTHREAD_ENV ${XCFLAGS}'
                MT_LIBS="-lpthread"
-               OPTMZ="-O"
                TXLIBS="-lcurses"
                XCFLAGS64="-64 -mips3"
                XCFLAGS="-o32"
                XLDFLAGS64="-64"
                XLDFLAGS="-o32"
+               SHLIB_LINKER="${CC} -shared"
                ;;
 
        sgi_63)
+               PINSTALL_LIBS=-lmld
+               AFSD_LIBS="/usr/lib/libdwarf.a /usr/lib/libelf.a"
                FSINCLUDES="-I/usr/include/sys/fs"
                LEX="lex"
-               LWP_OPTMZ="-O"
                MT_CFLAGS='-D_SGI_MP_SOURCE -DAFS_PTHREAD_ENV ${XCFLAGS}'
                MT_LIBS="-lpthread"
-               OPTMZ="-O"
                TXLIBS="-lcurses"
                XCFLAGS64="-D_BSD_COMPAT -64 -mips3"
                XCFLAGS="-D_OLD_TERMIOS -D_BSD_COMPAT -o32"
                XLDFLAGS64="-64"
                XLDFLAGS="-o32"
+               SHLIB_LINKER="${CC} -shared"
                ;;
 
        sgi_64)
+               AFSD_LIBS="/usr/lib32/libdwarf.a /usr/lib32/libelf.a"
                FSINCLUDES="-I/usr/include/sys/fs"
                LEX="lex"
-               LWP_OPTMZ="-O"
                MT_CFLAGS='-D_SGI_MP_SOURCE -DAFS_PTHREAD_ENV ${XCFLAGS}'
                MT_LIBS="-lpthread"
-               OPTMZ="-O"
                TXLIBS="-lcurses"
                XCFLAGS64="-D_BSD_COMPAT -64 -mips3"
                XCFLAGS="-D_OLD_TERMIOS -D_BSD_COMPAT -n32 -woff 1009,1110,1116,1164,1171,1177,1183,1185,1204,1233,1515,1516,1548,1169,1174,1177,1196,1498,1506,1552"
                XLDFLAGS64="-64"
                XLDFLAGS="-n32"
+               SHLIB_LINKER="${CC} -shared"
                ;;
 
        sgi_65)
+               AFSD_LIBS="/usr/lib32/libdwarf.a /usr/lib32/libelf.a"
                CC="/usr/bin/cc"
+               CCOBJ="/usr/bin/cc"
                FSINCLUDES="-I/usr/include/sys/fs"
                LD="/usr/bin/ld"
                LEX="lex"
                MT_CC="/usr/bin/cc"
                MT_CFLAGS='-D_SGI_MP_SOURCE -DAFS_PTHREAD_ENV ${XCFLAGS}'
                MT_LIBS="-lpthread"
-               OPTMZ="-O"
                TXLIBS="-lcurses"
                XCFLAGS64="-64 -mips3"
                XCFLAGS="-n32 -mips3 -woff 1009,1110,1116,1164,1171,1177,1183,1185,1204,1233,1515,1516,1548,1169,1174,1177,1196,1498,1506,1552"
                XLDFLAGS64="-64 -mips3"
                XLDFLAGS="-n32 -mips3"
+               SHLIB_LINKER="${CC} -shared"
                ;;
 
-       sparc64_linux22)
-               LEX="flex -l"
-               MT_CFLAGS='-DAFS_PTHREAD_ENV -pthread -D_REENTRANT ${XCFLAGS}'
-               MT_LIBS="-lpthread"
-               PAM_CFLAGS="-O2 -Dlinux -DLINUX_PAM -fPIC"
-               SHLIB_LDFLAGS="-shared -Xlinker -x"
-               TXLIBS="/usr/lib/libncurses.so"
-               XCFLAGS="-O2 -D_LARGEFILE64_SOURCE"
-               YACC="bison -y"
-               ;;
-
-       sparc64_linux24)
+       sparc*_linux*)
+               KERN_OPTMZ=-O2
                LEX="flex -l"
                MT_CFLAGS='-DAFS_PTHREAD_ENV -pthread -D_REENTRANT ${XCFLAGS}'
                MT_LIBS="-lpthread"
-               PAM_CFLAGS="-O2 -Dlinux -DLINUX_PAM -fPIC"
+               PAM_OPTMZ=-O2
+               PAM_CFLAGS="-Dlinux -DLINUX_PAM -fPIC"
+               SHLIB_CFLAGS="-fPIC"
                SHLIB_LDFLAGS="-shared -Xlinker -x"
-               TXLIBS="/usr/lib/libncurses.so"
-               XCFLAGS="-O2 -D_LARGEFILE64_SOURCE"
+               TXLIBS="-lncurses"
+               XCFLAGS="-D_LARGEFILE64_SOURCE"
+               XCFLAGS64="-D_LARGEFILE64_SOURCE -m64"
+               XLDFLAGS64="-m64"
                YACC="bison -y"
+               SHLIB_LINKER="${MT_CC} -shared"
                ;;
 
-       sparc_linux22)
-               LEX="flex -l"
-               MT_CFLAGS='-DAFS_PTHREAD_ENV -pthread -D_REENTRANT ${XCFLAGS}'
-               MT_LIBS="-lpthread"
-               PAM_CFLAGS="-O2 -Dlinux -DLINUX_PAM -fPIC"
-               SHLIB_LDFLAGS="-shared -Xlinker -x"
-               TXLIBS="/usr/lib/libncurses.so"
-               XCFLAGS="-O2 -D_LARGEFILE64_SOURCE"
-               YACC="bison -y"
+       sun4_413)
+               CCXPG2="/usr/xpg2bin/cc"
+               CC="gcc"
+               CCOBJ="gcc"
+               LEX="lex"
+               SHLIB_CFLAGS="-PIC"
+               TXLIBS="-lcurses -ltermcap"
+               XCFLAGS=""
+               XLIBELFA="-lelf"
+               XLIBKVM="-lkvm"
+               XLIBS="${LIB_AFSDB}"
+               LD="ld"
                ;;
 
        sun4x_55)
                CC="/opt/SUNWspro/bin/cc"
+               CCOBJ="/opt/SUNWspro/bin/cc"
                LEX="lex"
-               LWP_OPTMZ="-g"
                MT_CC="/opt/SUNWspro/bin/cc"
                MT_CFLAGS='-mt -DAFS_PTHREAD_ENV ${XCFLAGS}'
                MT_LIBS="-lpthread -lsocket"
-               OPTMZ="-O"
                SHLIB_CFLAGS="-KPIC"
                TXLIBS="-lcurses"
                XCFLAGS="-dy -Bdynamic"
@@ -435,16 +749,17 @@ case $AFS_SYSNAME in
                XLIBKVM="-lkvm"
                XLIBS="${LIB_AFSDB} -lsocket -lnsl -lintl -ldl"
                LD="/usr/ccs/bin/ld"
+               SHLIB_LINKER="${CC} -G -dy -Wl,-M\$(srcdir)/mapfile -Bsymbolic -z text"
+               LWP_OPTMZ="-g"
                ;;
 
        sun4x_56)
                CC="/opt/SUNWspro/bin/cc"
+               CCOBJ="/opt/SUNWspro/bin/cc"
                LEX="lex"
-               LWP_OPTMZ="-g"
                MT_CC="/opt/SUNWspro/bin/cc"
                MT_CFLAGS='-mt -DAFS_PTHREAD_ENV ${XCFLAGS}'
                MT_LIBS="-lpthread -lsocket"
-               OPTMZ="-O"
                PAM_CFLAGS="-KPIC"
                PAM_LIBS="-lc -lpam -lsocket -lnsl -lm"
                SHLIB_CFLAGS="-KPIC"
@@ -455,17 +770,18 @@ case $AFS_SYSNAME in
                LD="/usr/ccs/bin/ld"
                XLIBKVM="-lkvm"
                XLIBS="${LIB_AFSDB} -lsocket -lnsl -lintl -ldl"
+               SHLIB_LINKER="${CC} -G -dy -Wl,-M\$(srcdir)/mapfile -Bsymbolic -z text"
+               LWP_OPTMZ="-g"
                ;;
 
        sun4x_57)
                CC="/opt/SUNWspro/bin/cc"
+               CCOBJ="/opt/SUNWspro/bin/cc"
                LEX="lex"
                LD="/usr/ccs/bin/ld"
-               LWP_OPTMZ="-g"
                MT_CC="/opt/SUNWspro/bin/cc"
                MT_CFLAGS='-mt -DAFS_PTHREAD_ENV ${XCFLAGS}'
                MT_LIBS="-lpthread -lsocket"
-               OPTMZ="-O"
                PAM_CFLAGS="-KPIC"
                PAM_LIBS="-lc -lpam -lsocket -lnsl -lm"
                SHLIB_CFLAGS="-KPIC"
@@ -476,17 +792,18 @@ case $AFS_SYSNAME in
                XLIBELFA="-lelf"
                XLIBKVM="-lkvm"
                XLIBS="${LIB_AFSDB} -lsocket -lnsl -lintl -ldl"
+               SHLIB_LINKER="${CC} -G -dy -Wl,-M\$(srcdir)/mapfile -Bsymbolic -z text"
+               LWP_OPTMZ="-g"
                ;;
 
        sun4x_58)
                CC="/opt/SUNWspro/bin/cc"
+               CCOBJ="/opt/SUNWspro/bin/cc"
                LEX="lex"
                LD="/usr/ccs/bin/ld"
-               LWP_OPTMZ="-g"
                MT_CC="/opt/SUNWspro/bin/cc"
                MT_CFLAGS='-mt -DAFS_PTHREAD_ENV ${XCFLAGS}'
                MT_LIBS="-lpthread -lsocket"
-               OPTMZ="-O"
                PAM_CFLAGS="-KPIC"
                PAM_LIBS="-lc -lpam -lsocket -lnsl -lm"
                SHLIB_CFLAGS="-KPIC"
@@ -497,17 +814,18 @@ case $AFS_SYSNAME in
                XLIBELFA="-lelf"
                XLIBKVM="-lkvm"
                XLIBS="${LIB_AFSDB} -lsocket -lnsl -lintl -ldl"
+               SHLIB_LINKER="${CC} -G -dy -Wl,-M\$(srcdir)/mapfile -Bsymbolic -z text"
+               LWP_OPTMZ="-g"
                ;;
 
        sun4x_59)
                CC="/opt/SUNWspro/bin/cc"
+               CCOBJ="/opt/SUNWspro/bin/cc"
                LEX="lex"
-               LWP_OPTMZ="-g"
                LD="/usr/ccs/bin/ld"
                MT_CC="/opt/SUNWspro/bin/cc"
                MT_CFLAGS='-mt -DAFS_PTHREAD_ENV ${XCFLAGS}'
                MT_LIBS="-lpthread -lsocket"
-               OPTMZ="-O"
                PAM_CFLAGS="-KPIC"
                PAM_LIBS="-lc -lpam -lsocket -lnsl -lm"
                SHLIB_CFLAGS="-KPIC"
@@ -518,17 +836,40 @@ case $AFS_SYSNAME in
                XLIBELFA="-lelf"
                XLIBKVM="-lkvm"
                XLIBS="${LIB_AFSDB} -lsocket -lnsl -lintl -ldl"
+               SHLIB_LINKER="${CC} -G -dy -Wl,-M\$(srcdir)/mapfile -Bsymbolic -z text"
+               LWP_OPTMZ="-g"
                ;;
 
-       sunx86_58)
+       sun4x_510)
                CC="/opt/SUNWspro/bin/cc"
+               CCOBJ="/opt/SUNWspro/bin/cc"
                LEX="lex"
+               LD="/usr/ccs/bin/ld"
+               MT_CC="/opt/SUNWspro/bin/cc"
+               MT_CFLAGS='-mt -DAFS_PTHREAD_ENV ${XCFLAGS}'
+               MT_LIBS="-lpthread -lsocket"
+               PAM_CFLAGS="-KPIC"
+               PAM_LIBS="-lc -lpam -lsocket -lnsl -lm"
+               SHLIB_CFLAGS="-KPIC"
+               SHLIB_LDFLAGS="-G -Bsymbolic"
+               TXLIBS="-lcurses"
+               XCFLAGS64='${XCFLAGS} -xarch=v9'
+               XCFLAGS="-dy -Bdynamic"
+               XLIBELFA="-lelf"
+               XLIBKVM="-lkvm"
+               XLIBS="${LIB_AFSDB} -lsocket -lnsl -lintl -ldl"
+               SHLIB_LINKER="${CC} -G -dy -Wl,-M\$(srcdir)/mapfile -Bsymbolic -z text"
                LWP_OPTMZ="-g"
+               ;;
+
+       sun4x_511)
+               CC="/opt/SUNWspro/bin/cc"
+               CCOBJ="/opt/SUNWspro/bin/cc"
+               LEX="lex"
                LD="/usr/ccs/bin/ld"
                MT_CC="/opt/SUNWspro/bin/cc"
                MT_CFLAGS='-mt -DAFS_PTHREAD_ENV ${XCFLAGS}'
                MT_LIBS="-lpthread -lsocket"
-               OPTMZ="-O"
                PAM_CFLAGS="-KPIC"
                PAM_LIBS="-lc -lpam -lsocket -lnsl -lm"
                SHLIB_CFLAGS="-KPIC"
@@ -539,9 +880,114 @@ case $AFS_SYSNAME in
                XLIBELFA="-lelf"
                XLIBKVM="-lkvm"
                XLIBS="${LIB_AFSDB} -lsocket -lnsl -lintl -ldl"
+               SHLIB_LINKER="${CC} -G -dy -Bsymbolic -z text"
+               LWP_OPTMZ="-g"
+               ;;
+
+       sunx86_57)
+               CC="/opt/SUNWspro/bin/cc"
+               CCOBJ="/opt/SUNWspro/bin/cc"
+               LEX="lex"
+               LD="/usr/ccs/bin/ld"
+               MT_CC="/opt/SUNWspro/bin/cc"
+               MT_CFLAGS='-mt -DAFS_PTHREAD_ENV ${XCFLAGS}'
+               MT_LIBS="-lpthread -lsocket"
+               PAM_CFLAGS="-KPIC"
+               PAM_LIBS="-lc -lpam -lsocket -lnsl -lm"
+               SHLIB_CFLAGS="-KPIC"
+               SHLIB_LDFLAGS="-G -Bsymbolic"
+               TXLIBS="-lcurses"
+               XCFLAGS64='${XCFLAGS} -xarch=amd64'
+               XCFLAGS="-dy -Bdynamic"
+               XLIBELFA="-lelf"
+               XLIBKVM="-lkvm"
+               XLIBS="${LIB_AFSDB} -lsocket -lnsl -lintl -ldl"
+               SHLIB_LINKER="${CC} -G -dy -Wl,-M\$(srcdir)/mapfile -Bsymbolic -z text"
+               ;;
+
+       sunx86_58)
+               CC="/opt/SUNWspro/bin/cc"
+               CCOBJ="/opt/SUNWspro/bin/cc"
+               LEX="lex"
+               LD="/usr/ccs/bin/ld"
+               MT_CC="/opt/SUNWspro/bin/cc"
+               MT_CFLAGS='-mt -DAFS_PTHREAD_ENV ${XCFLAGS}'
+               MT_LIBS="-lpthread -lsocket"
+               PAM_CFLAGS="-KPIC"
+               PAM_LIBS="-lc -lpam -lsocket -lnsl -lm"
+               SHLIB_CFLAGS="-KPIC"
+               SHLIB_LDFLAGS="-G -Bsymbolic"
+               TXLIBS="-lcurses"
+               XCFLAGS64='${XCFLAGS} -xarch=amd64'
+               XCFLAGS="-dy -Bdynamic"
+               XLIBELFA="-lelf"
+               XLIBKVM="-lkvm"
+               XLIBS="${LIB_AFSDB} -lsocket -lnsl -lintl -ldl"
+               SHLIB_LINKER="${CC} -G -dy -Wl,-M\$(srcdir)/mapfile -Bsymbolic -z text"
                ;;
 
+       sunx86_59)
+               CC="/opt/SUNWspro/bin/cc"
+               CCOBJ="/opt/SUNWspro/bin/cc"
+               LEX="lex"
+               LD="/usr/ccs/bin/ld"
+               MT_CC="/opt/SUNWspro/bin/cc"
+               MT_CFLAGS='-mt -DAFS_PTHREAD_ENV ${XCFLAGS}'
+               MT_LIBS="-lpthread -lsocket"
+               PAM_CFLAGS="-KPIC"
+               PAM_LIBS="-lc -lpam -lsocket -lnsl -lm"
+               SHLIB_CFLAGS="-KPIC"
+               SHLIB_LDFLAGS="-G -Bsymbolic"
+               TXLIBS="-lcurses"
+               XCFLAGS64='${XCFLAGS} -xarch=amd64'
+               XCFLAGS="-dy -Bdynamic"
+               XLIBELFA="-lelf"
+               XLIBKVM="-lkvm"
+               XLIBS="${LIB_AFSDB} -lsocket -lnsl -lintl -ldl"
+               SHLIB_LINKER="${CC} -G -dy -Wl,-M\$(srcdir)/mapfile -Bsymbolic -z text"
+               ;;
 
+       sunx86_510)
+               CC="/opt/SUNWspro/bin/cc"
+               CCOBJ="/opt/SUNWspro/bin/cc"
+               LEX="lex"
+               LD="/usr/ccs/bin/ld"
+               MT_CC="/opt/SUNWspro/bin/cc"
+               MT_CFLAGS='-mt -DAFS_PTHREAD_ENV ${XCFLAGS}'
+               MT_LIBS="-lpthread -lsocket"
+               PAM_CFLAGS="-KPIC"
+               PAM_LIBS="-lc -lpam -lsocket -lnsl -lm"
+               SHLIB_CFLAGS="-KPIC"
+               SHLIB_LDFLAGS="-G -Bsymbolic"
+               TXLIBS="-lcurses"
+               XCFLAGS64='${XCFLAGS} -xarch=amd64'
+               XCFLAGS="-dy -Bdynamic"
+               XLIBELFA="-lelf"
+               XLIBKVM="-lkvm"
+               XLIBS="${LIB_AFSDB} -lsocket -lnsl -lintl -ldl"
+               SHLIB_LINKER="${CC} -G -dy -Wl,-M\$(srcdir)/mapfile -Bsymbolic -z text"
+               ;;
+
+       sunx86_511)
+               CC="/opt/SUNWspro/bin/cc"
+               CCOBJ="/opt/SUNWspro/bin/cc"
+               LEX="lex"
+               LD="/usr/ccs/bin/ld"
+               MT_CC="/opt/SUNWspro/bin/cc"
+               MT_CFLAGS='-mt -DAFS_PTHREAD_ENV ${XCFLAGS}'
+               MT_LIBS="-lpthread -lsocket"
+               PAM_CFLAGS="-KPIC"
+               PAM_LIBS="-lc -lpam -lsocket -lnsl -lm"
+               SHLIB_CFLAGS="-KPIC"
+               SHLIB_LDFLAGS="-G -Bsymbolic"
+               TXLIBS="-lcurses"
+               XCFLAGS64='${XCFLAGS} -xarch=amd64'
+               XCFLAGS="-dy -Bdynamic"
+               XLIBELFA="-lelf"
+               XLIBKVM="-lkvm"
+               XLIBS="${LIB_AFSDB} -lsocket -lnsl -lintl -ldl"
+               SHLIB_LINKER="${CC} -G -dy -Bsymbolic -z text"
+               ;;
 esac
 
 #
@@ -549,6 +995,7 @@ esac
 #
 case $AFS_SYSNAME in
        sgi_6*)
+               IRIX_SYS_SYSTM_H_HAS_MEM_FUNCS
                XFS_SIZE_CHECK="xfs_size_check"
                install_XFS_SIZE_CHECK='$(DESTDIR)${afssrvsbindir}/xfs_size_check'
                dest_XFS_SIZE_CHECK='$(DEST)/root.server/usr/afs/bin/xfs_size_check'
@@ -580,13 +1027,57 @@ case $AFS_SYSNAME in
 esac
 
 
+
+dnl pthreads fixes
+case $AFS_SYSNAME in
+dnl we'll go ahead and turn on XOPEN2K and ISO_C99
+dnl if this causes problems, we should scale back to _XOPEN_SOURCE=500
+       *linux*)
+               MT_CFLAGS="${MT_CFLAGS} -D_XOPEN_SOURCE=600 -D_BSD_SOURCE"
+       ;;
+esac
+
+
+dnl Disable the default for debugging/optimization if not enabled
+if test "x$enable_debug_kernel" = "xno"; then
+  KERN_DBG=
+fi
+
+if test "x$enable_optimize_kernel" = "xno"; then
+  KERN_OPTMZ=
+fi
+
+if test "x$enable_debug" = "xno"; then
+  DBG=
+fi
+
+if test "x$enable_optimize" = "xno"; then
+  OPTMZ=
+fi
+
+if test "x$enable_debug_lwp" = "xno"; then
+  LWP_DBG=
+fi
+
+if test "x$enable_optimize_lwp" = "xno"; then
+  LWP_OPTMZ=
+fi
+
+AC_SUBST(CCXPG2)
+AC_SUBST(CCOBJ)
+AC_SUBST(AFSD_LIBS)
+AC_SUBST(AFSD_LDFLAGS)
+AC_SUBST(AIX64)
 AC_SUBST(AR)
 AC_SUBST(AS)
 AC_SUBST(CP)
 AC_SUBST(DBG)
 AC_SUBST(FSINCLUDES)
+AC_SUBST(KERN_DBG)
+AC_SUBST(KERN_OPTMZ)
 AC_SUBST(LD)
 AC_SUBST(LEX)
+AC_SUBST(LWP_DBG)
 AC_SUBST(LWP_OPTMZ)
 AC_SUBST(MT_CC)
 AC_SUBST(MT_CFLAGS)
@@ -595,11 +1086,15 @@ AC_SUBST(MV)
 AC_SUBST(OPTMZ)
 AC_SUBST(PAM_CFLAGS)
 AC_SUBST(PAM_LIBS)
+AC_SUBST(PAM_DBG)
+AC_SUBST(PAM_OPTMZ)
+AC_SUBST(PINSTALL_LIBS)
 AC_SUBST(RANLIB)
 AC_SUBST(REGEX_OBJ)
 AC_SUBST(RM)
 AC_SUBST(SHLIB_CFLAGS)
 AC_SUBST(SHLIB_LDFLAGS)
+AC_SUBST(SHLIB_LINKER)
 AC_SUBST(SHLIB_SUFFIX)
 AC_SUBST(TXLIBS)
 AC_SUBST(VFSCK_CFLAGS)