Add nbsd60 param files and autoconf logic
[openafs.git] / src / cf / osconf.m4
index cf605e9..70d20b0 100644 (file)
@@ -2,22 +2,25 @@
 AC_DEFUN([OPENAFS_OSCONF], [
 
 dnl defaults, override in case below as needed
-XCFLAGS='${DBG} ${OPTMZ}'
+RXDEBUG="-DRXDEBUG"
 SHLIB_SUFFIX="so"
-CC="cc"
-CCOBJ="cc"
-MT_CC="cc"
-XLIBS="${LIB_AFSDB}"
+CCOBJ="$CC"
+MT_CC="$CC"
+XLIBS="${LIB_AFSDB} ${XBSA_XLIBS} ${LIB_libintl}"
+MT_LIBS='-lpthread ${XLIBS}'
 
 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 not override
+dnl the arch cases below do override as needed
 KERN_DBG=-g
 KERN_OPTMZ=-O
 DBG=-g
 OPTMZ=-O
 LWP_DBG=-g
+NO_STRIP_BIN=
 LWP_OPTMZ=-O
+PAM_DBG=-g
+PAM_OPTMZ=
 
 dnl standard programs
 AC_PROG_RANLIB
@@ -34,93 +37,61 @@ dnl TODO - need to disable STRIP if we are doing debugging in any user space cod
 
 case $AFS_SYSNAME in
        alpha_dux40)
-               LEX="lex"
+               CC="cc"
+               CCOBJ="cc"
+               MT_CC="cc"
                CSTATIC="-non_shared"
                DBG="-g3"
-               MT_CFLAGS='-D_REENTRANT=1 -pthread -DAFS_PTHREAD_ENV ${XCFLAGS}'
+               MT_CFLAGS='-D_REENTRANT=1 -pthread'
                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"
+       alpha_dux50 | alpha_dux51)
+               CC="cc"
+               CCOBJ="cc"
+               MT_CC="cc"
                DBG="-g3"
                CSTATIC="-non_shared"
                LWP_OPTMZ="-O2"
-               MT_CFLAGS='-D_REENTRANT=1 -pthread -DAFS_PTHREAD_ENV ${XCFLAGS}'
+               MT_CFLAGS='-D_REENTRANT=1 -pthread'
                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"
-               SHLIB_CFLAGS="-fPIC"
-               SHLIB_LDFLAGS="-shared -Xlinker -x"
-               TXLIBS="-lncurses"
-               XCFLAGS="-O2 -D_LARGEFILE64_SOURCE"
-               YACC="bison -y"
-               SHLIB_LINKER="${MT_CC} -shared"
-               ;;
-
-       alpha_linux_24)
+       alpha_linux_22 | alpha_linux_24 | 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"
+               MT_CFLAGS='-pthread -D_REENTRANT'
+               PAM_OPTMZ=-O2
+               PAM_CFLAGS="-Dlinux -DLINUX_PAM -fPIC"
                SHLIB_CFLAGS="-fPIC"
                SHLIB_LDFLAGS="-shared -Xlinker -x"
-               TXLIBS="-lncurses"
-               XCFLAGS="-O2 -D_LARGEFILE64_SOURCE"
-               YACC="bison -y"
                SHLIB_LINKER="${MT_CC} -shared"
                ;;
 
-       alpha_linux_26)
+       arm_linux_24 | arm_linux26)
                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"
+               MT_CFLAGS='-pthread -D_REENTRANT'
+               PAM_OPTMZ=-O2
+               PAM_CFLAGS="-Dlinux -DLINUX_PAM -fPIC"
                SHLIB_CFLAGS="-fPIC"
                SHLIB_LDFLAGS="-shared -Xlinker -x"
-               TXLIBS="-lncurses"
-               XCFLAGS="-O2 -D_LARGEFILE64_SOURCE"
-               YACC="bison -y"
                SHLIB_LINKER="${MT_CC} -shared"
                ;;
 
        hp_ux102)
                AS="/usr/ccs/bin/as"
                CC="/opt/ansic/bin/cc -Ae"
+               CCOBJ="/opt/ansic/bin/cc -Ae"
                DBM="/lib/libndbm.a"
                LD="/bin/ld"
                LEX="/opt/langtools/bin/lex"
                LWP_OPTMZ="-O"
                MT_CC="/opt/ansic/bin/cc -Ae"
-               MT_CFLAGS='-D_POSIX_C_SOURCE=199506L -DAFS_PTHREAD_ENV ${XCFLAGS}'
-               MT_LIBS="-L/opt/dce/lib -ldce"
+               MT_CFLAGS='-D_POSIX_C_SOURCE=199506L'
+               MT_LIBS='-L/opt/dce/lib -ldce ${XLIBS}'
                MV="/bin/mv"
                OPTMZ="-O"
                PAM_CFLAGS="+DA1.0 +z -Wl,+k"
@@ -129,7 +100,6 @@ case $AFS_SYSNAME in
                RM="/bin/rm"
                SHLIB_LDFLAGS="-b -Bsymbolic"
                SHLIB_SUFFIX="sl"
-               TXLIBS="/usr/lib/libHcurses.a"
                VFSCK_CFLAGS="-D_FILE64"
                XCFLAGS0="-ldld -lc -Wp,-H200000 -Wl,-a,archive -DAUTH_DBM_LOG +z -Wl,+k -D_LARGEFILE64_SOURCE"
                XCFLAGS64="${XCFLAGS0} +DA2.0W"
@@ -148,8 +118,7 @@ case $AFS_SYSNAME in
                LEX="/opt/langtools/bin/lex"
                LWP_OPTMZ="-O"
                MT_CC="$CC"
-               MT_CFLAGS='-D_POSIX_C_SOURCE=199506L -DAFS_PTHREAD_ENV ${XCFLAGS}'
-               MT_LIBS="-lpthread"
+               MT_CFLAGS='-D_POSIX_C_SOURCE=199506L'
                MV="/bin/mv"
                OPTMZ="-O"
                PAM_CFLAGS="+DA1.0 +z -Wl,+k"
@@ -158,14 +127,11 @@ case $AFS_SYSNAME in
                RM="/bin/rm"
                SHLIB_LDFLAGS="-b -Bsymbolic"
                SHLIB_SUFFIX="sl"
-               TXLIBS="/usr/lib/libHcurses.a"
                VFSCK_CFLAGS="-I/usr/old/usr/include -D_FILE64"
                XCFLAGS0="-ldld -lc -Wp,-H200000 -Wl,-a,archive -DAUTH_DBM_LOG +z -Wl,+k -D_LARGEFILE64_SOURCE"
                XCFLAGS64="${XCFLAGS0} +DA2.0W"
                XCFLAGS="${XCFLAGS0} +DA1.0"
                XLIBELFA="-lelf"
-               #XLIBS="${LIB_AFSDB} -lnsl"
-               XLIBS="${LIB_AFSDB}"
                YACC="/opt/langtools/bin/yacc"
                SHLIB_LINKER="ld -b"
                ;;
@@ -180,8 +146,7 @@ case $AFS_SYSNAME in
                LEX="/opt/langtools/bin/lex"
                LWP_OPTMZ=""
                MT_CC="$CC"
-               MT_CFLAGS='-D_POSIX_C_SOURCE=199506L -DAFS_PTHREAD_ENV ${XCFLAGS}'
-               MT_LIBS="-lpthread"
+               MT_CFLAGS='-D_POSIX_C_SOURCE=199506L'
                MV="/bin/mv"
                OPTMZ="-O"
                PAM_CFLAGS="-b +z -Wl,+k"
@@ -190,406 +155,323 @@ case $AFS_SYSNAME in
                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"
                ;;
 
-       *fbsd_*)
-               LEX="flex -l"
-               MT_CFLAGS='-DAFS_PTHREAD_ENV -pthread -D_REENTRANT ${XCFLAGS}'
-               MT_LIBS="-pthread"
-               PAM_CFLAGS="-O2 -pipe -fPIC"
+       i386_fbsd_*)
+               MT_CFLAGS='-pthread -D_REENTRANT'
+               PAM_OPTMZ=-O2
+               PAM_CFLAGS="-pipe -fPIC"
                SHLIB_LDFLAGS="-shared -Xlinker -x"
-               TXLIBS="-lncurses"
-               XCFLAGS="-O2 -pipe"
-               YACC="byacc"
+               SHLIB_LINKER="${MT_CC} -shared"
+               XCFLAGS="-pipe"
                ;;
 
-       *nbsd2*|*nbsd3*)
-               LEX="flex -l"
-               MT_CFLAGS='${XCFLAGS} -DAFS_PTHREAD_ENV -D_REENTRANT '
-               MT_LIBS="-lpthread" # XXX -pthread soon
-               PAM_CFLAGS="-O2 -pipe -fPIC"
+       i386_dfbsd_*)
+               MT_CFLAGS='-pthread -D_REENTRANT'
+               PAM_OPTMZ=-O2
+               PAM_CFLAGS="-pipe -fPIC"
                SHLIB_LDFLAGS="-shared -Xlinker -x"
-               TXLIBS="/usr/lib/libcurses.so"
-               XCFLAGS="-O2 -pipe"
-               YACC="yacc"
+               SHLIB_LINKER="${MT_CC} -shared"
+               XCFLAGS="-pipe"
                ;;
 
-       *nbsd15|*nbsd16)
-               LEX="flex -l"
-               MT_CFLAGS='${XCFLAGS}'
-               MT_LIBS=""
+       amd64_fbsd_*)
+               MT_CFLAGS='-pthread -D_REENTRANT'
                PAM_CFLAGS="-O2 -pipe -fPIC"
                SHLIB_LDFLAGS="-shared -Xlinker -x"
-               TXLIBS="/usr/lib/libcurses.so"
-               XCFLAGS="-O2 -pipe"
-               YACC="bison -y"
+               SHLIB_LINKER="${MT_CC} -shared"
+               XCFLAGS="-O2 -pipe -fPIC"
                ;;
 
-       ia64_linux24|ia64_linux26)
-               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"
+       *nbsd2*|*nbsd3*|*nbsd4*|*nbsd5*|*nbsd6*)
+               MT_CFLAGS='-pthread -D_REENTRANT'
+               PAM_OPTMZ=-O2
+               PAM_CFLAGS="-pipe -fPIC"
                SHLIB_CFLAGS="-fPIC"
                SHLIB_LDFLAGS="-shared -Xlinker -x"
-               TXLIBS="-lncurses"
-               XCFLAGS="-g -O2 -D_LARGEFILE64_SOURCE -G0"
                SHLIB_LINKER="${MT_CC} -shared"
+               XCFLAGS="-pipe"
                ;;
 
-       amd64_linux*)
-               CCOBJ="${CC} -fPIC"
-               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"
-               SHLIB_CFLAGS="-fPIC"
+       *nbsd15|*nbsd16)
+               MT_LIBS='${XLIBS}'
+               PAM_OPTMZ=-O2
+               PAM_CFLAGS="-pipe -fPIC"
                SHLIB_LDFLAGS="-shared -Xlinker -x"
-               TXLIBS="-lncurses"
-               XCFLAGS="-g -O2 -D_LARGEFILE64_SOURCE"
                SHLIB_LINKER="${MT_CC} -shared"
+               XCFLAGS="-pipe"
                ;;
 
-       ppc64_linux24)
+       ia64_linux24|ia64_linux26)
                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"
-               SHLIB_LDFLAGS="-shared -Xlinker -x"
+               MT_CFLAGS='-pthread -D_REENTRANT'
+               PAM_OPTMZ=-O2
+               PAM_CFLAGS="-Dlinux -DLINUX_PAM -fPIC"
                SHLIB_CFLAGS="-fPIC"
-               TXLIBS="/usr/lib64/libncurses.so"
-               XCFLAGS="-g -O2 -D_LARGEFILE64_SOURCE"
+               SHLIB_LDFLAGS="-shared -Xlinker -x"
+               XCFLAGS="-G0"
                SHLIB_LINKER="${MT_CC} -shared"
                ;;
 
-       ppc64_linux26)
+       amd64_linux*)
+               CCOBJ="${CC} -fPIC"
                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"
-               SHLIB_LDFLAGS="-shared -Xlinker -x"
+               MT_CFLAGS='-pthread -D_REENTRANT'
+               PAM_OPTMZ=-O2
+               PAM_CFLAGS="-Dlinux -DLINUX_PAM -fPIC"
                SHLIB_CFLAGS="-fPIC"
-               TXLIBS="-lncurses"
-               XCFLAGS="-g -O2 -D_LARGEFILE64_SOURCE -fPIC"
-               YACC="bison -y"
+               SHLIB_LDFLAGS="-shared -Xlinker -x"
                SHLIB_LINKER="${MT_CC} -shared"
                ;;
 
-       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="-O2 -Dlinux -DLINUX_PAM -fPIC"
-               SHLIB_CFLAGS="-fPIC"
+       ppc64_linux24 | ppc64_linux26)
+               MT_CFLAGS='-pthread -D_REENTRANT'
+               PAM_OPTMZ=-O2
+               PAM_CFLAGS="-Dlinux -DLINUX_PAM -fPIC"
                SHLIB_LDFLAGS="-shared -Xlinker -x"
-               TXLIBS="-lncurses"
-               XCFLAGS="-O2 -D_LARGEFILE64_SOURCE"
-               YACC="bison -y"
+               SHLIB_CFLAGS="-fPIC"
                SHLIB_LINKER="${MT_CC} -shared"
                ;;
 
        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"
+               MT_CFLAGS='-pthread -D_REENTRANT'
                DBG=-g
                KERN_DBG=-g
                LWP_DBG=-g
                LWP_OPTMZ=-O2
                OPTMZ=-O2
-               PAM_CFLAGS="-g -O2 -Dlinux -DLINUX_PAM -fPIC"
+               PAM_CFLAGS="-Dlinux -DLINUX_PAM -fPIC"
                SHLIB_CFLAGS="-fPIC"
                SHLIB_LDFLAGS="-shared -Xlinker -x"
-               TXLIBS="-lncurses"
-               XCFLAGS="-g -O2 -D_LARGEFILE64_SOURCE"
                SHLIB_LINKER="${MT_CC} -shared"
                ;;
 
-       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"
+       i386_umlinux22 | i386_umlinux24 | i386_umlinux26)
+               MT_CFLAGS='-pthread -D_REENTRANT'
                DBG=-g
-               KERN_DBG=-g
                LWP_DBG=-g
                LWP_OPTMZ=-O2
                OPTMZ=-O2
-               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="-lncurses"
-               XCFLAGS="-g -O2 -D_LARGEFILE64_SOURCE"
                SHLIB_LINKER="${MT_CC} -shared"
                ;;
 
-       i386_umlinux26)
-               CC="gcc -pipe"
-               CCOBJ="gcc -pipe"
-               MT_CC="gcc -pipe"
+       *_obsd*)
                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
+               MT_CFLAGS='-pthread -D_REENTRANT'
                LWP_OPTMZ=-O2
                OPTMZ=-O2
-               PAM_CFLAGS="-g -O2 -Dlinux -DLINUX_PAM -fPIC"
-               SHLIB_CFLAGS="-fPIC"
-               SHLIB_LDFLAGS="-shared -Xlinker -x"
-               TXLIBS="-lncurses"
-               XCFLAGS="-g -O2 -D_LARGEFILE64_SOURCE"
-               SHLIB_LINKER="${MT_CC} -shared"
-               ;;
-
-       *_obsd*)
-               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"
-               TXLIBS="/usr/lib/libcurses.a"
-               XCFLAGS="-O2"
-               YACC="yacc"
+               SHLIB_LINKER="${MT_CC} -shared"
+               XCFLAGS=
                ;;
 
        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"
+               MT_CFLAGS='-pthread -D_REENTRANT'
+               PAM_OPTMZ=-O2
+               PAM_CFLAGS="-Dlinux -DLINUX_PAM -fPIC"
                SHLIB_CFLAGS="-fPIC"
                SHLIB_LDFLAGS="-shared -Xlinker -x"
-               TXLIBS="-lncurses"
-               XCFLAGS="-O2 -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"
-               REGEX_OBJ="regex.o"
-               XCFLAGS="-traditional-cpp"
-               ;;
-
-       ppc_darwin_13)
-               AFSD_LDFLAGS="-F/System/Library/PrivateFrameworks -framework DiskArbitration"
-               LEX="lex -l"
+       ppc_darwin_70)
+               CC="cc"
+               CCOBJ="cc"
+               MT_CC="cc"
+               AFSD_LDFLAGS="-F/System/Library/PrivateFrameworks -framework DiskArbitration -framework SystemConfiguration -framework IOKit -framework CoreFoundation"
+               MT_CFLAGS='-D_REENTRANT'
+               KROOT=
+               KINCLUDES='-I$(KROOT)/System/Library/Frameworks/Kernel.framework/Headers'
                LWP_OPTMZ="-O2"
                REGEX_OBJ="regex.o"
+               REGEX_OBJ_PIC="regex_pic.o"
                XCFLAGS="-no-cpp-precomp"
+               EXTRA_VLIBOBJS="fstab.o"
+               SHLIB_LINKER="${MT_CC} \${ARCHFLAGS} -dynamiclib"
+               SHLIB_SUFFIX="dylib"
+               XLIBS="${LIB_AFSDB} ${XBSA_XLIBS} -framework CoreFoundation"
                ;;
 
-       ppc_darwin_14)
-               AFSD_LDFLAGS="-F/System/Library/PrivateFrameworks -framework DiskArbitration"
-               LEX="lex -l"
-               LWP_OPTMZ="-O2"
+       *_darwin_80)
+               CC="cc"
+               CCOBJ="cc"
+               MT_CC="cc"
+               AFSD_LDFLAGS="-F/System/Library/PrivateFrameworks -framework DiskArbitration -framework SystemConfiguration -framework IOKit -framework CoreFoundation"
+               MT_CFLAGS="-D_REENTRANT"
+               KROOT=
+               KINCLUDES='-I$(KROOT)/System/Library/Frameworks/Kernel.framework/Headers'
+               KERN_OPTMZ="-Os"
+               LWP_OPTMZ="-Os"
+               OPTMZ="-Os"
                REGEX_OBJ="regex.o"
-               XCFLAGS="-no-cpp-precomp"
+               REGEX_OBJ_PIC="regex_pic.o"
+               EXTRA_VLIBOBJS="fstab.o"
+               SHLIB_LINKER="${MT_CC} \${ARCHFLAGS} -dynamiclib"
+               SHLIB_SUFFIX="dylib"
+               RANLIB="ranlib -c"
+               XLIBS="${LIB_AFSDB} ${XBSA_XLIBS} -framework CoreFoundation"
                ;;
 
-       ppc_darwin_60)
-               AFSD_LDFLAGS="-F/System/Library/PrivateFrameworks -framework DiskArbitration"
-               LEX="lex -l"
-               LWP_OPTMZ="-O2"
+       *_darwin_90)
+               AFSD_LDFLAGS="-F/System/Library/PrivateFrameworks -framework DiskArbitration -framework SystemConfiguration -framework IOKit -framework CoreFoundation"
+               MT_CFLAGS="-D_REENTRANT"
+               KROOT=
+               KINCLUDES='-I$(KROOT)/System/Library/Frameworks/Kernel.framework/Headers'
+               LD="cc"
+               KERN_OPTMZ="-Os"
+               LWP_OPTMZ="-Os"
+               OPTMZ="-Os"
                REGEX_OBJ="regex.o"
-               XCFLAGS="-no-cpp-precomp"
-               TXLIBS="-lncurses"
+               REGEX_OBJ_PIC="regex_pic.o"
+               EXTRA_VLIBOBJS="fstab.o"
+               SHLIB_LINKER="${MT_CC} \${ARCHFLAGS} -dynamiclib"
+               SHLIB_SUFFIX="dylib"
+               RANLIB="ranlib -c"
+               XLIBS="${LIB_AFSDB} ${XBSA_XLIBS} -framework CoreFoundation"
                ;;
 
-       ppc_darwin_70)
-               AFSD_LDFLAGS="-F/System/Library/PrivateFrameworks -framework DiskArbitration"
-               LEX="lex -l"
-               MT_CFLAGS='-DAFS_PTHREAD_ENV -D_REENTRANT ${XCFLAGS}'
+       arm_darwin_100)
+               AFSD_LDFLAGS="-F/System/Library/PrivateFrameworks -framework SystemConfiguration -framework IOKit -framework CoreFoundation"
+               MT_CFLAGS="-D_REENTRANT"
+               MT_LIBS="${LIB_AFSDB} -framework CoreFoundation"
                KROOT=
                KINCLUDES='-I$(KROOT)/System/Library/Frameworks/Kernel.framework/Headers'
-               LWP_OPTMZ="-O2"
+               LD="cc"
+               KERN_OPTMZ="-Os"
+               LWP_OPTMZ="-Os"
+               OPTMZ="-Os"
+               PAM_LIBS="-lpam"
                REGEX_OBJ="regex.o"
-               XCFLAGS="-no-cpp-precomp"
                TXLIBS="-lncurses"
                EXTRA_VLIBOBJS="fstab.o"
+               SHLIB_LINKER="${MT_CC} -dynamiclib"
+               SHLIB_SUFFIX="dylib"
+               RANLIB="ranlib"
+               XLIBS="${LIB_AFSDB} ${XBSA_XLIBS} -framework CoreFoundation"
                ;;
 
-       ppc_darwin_80)
-               AFSD_LDFLAGS="-F/System/Library/PrivateFrameworks -framework DiskArbitration"
-               LEX="lex -l"
-               MT_CFLAGS='-DAFS_PTHREAD_ENV -D_REENTRANT ${XCFLAGS}'
+       *_darwin_100 | *_darwin_110 )
+               AFSD_LDFLAGS="-F/System/Library/PrivateFrameworks -framework DiskArbitration -framework SystemConfiguration -framework IOKit -framework CoreFoundation"
+               MT_CFLAGS="-D_REENTRANT"
+               MT_LIBS='${XLIBS}'
                KROOT=
                KINCLUDES='-I$(KROOT)/System/Library/Frameworks/Kernel.framework/Headers'
-               LWP_OPTMZ="-O2"
+               LD="cc"
+               KERN_OPTMZ="-Os"
+               LWP_OPTMZ="-Os"
+               OPTMZ="-Os"
+               PAM_LIBS="-lpam"
                REGEX_OBJ="regex.o"
-               XCFLAGS="-no-cpp-precomp"
-               TXLIBS="-lncurses"
+               REGEX_OBJ_PIC="regex_pic.o"
                EXTRA_VLIBOBJS="fstab.o"
+               SHLIB_LINKER="${MT_CC} \${ARCHFLAGS} -dynamiclib"
+               SHLIB_SUFFIX="dylib"
+               RANLIB="ranlib"
+               XLIBS="${LIB_AFSDB} ${XBSA_XLIBS} -framework CoreFoundation"
                ;;
 
        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"
+               MT_CFLAGS='-pthread -D_REENTRANT'
+               PAM_OPTMZ=-O2
+               PAM_CFLAGS="-Dlinux -DLINUX_PAM -fPIC"
                SHLIB_CFLAGS="-fPIC"
                SHLIB_LDFLAGS="-shared -Xlinker -x"
-               TXLIBS="-lncurses"
-               XCFLAGS="-O2 -D_LARGEFILE64_SOURCE"
-               YACC="bison -y"
                SHLIB_LINKER="${MT_CC} -shared"
                ;;
 
        rs_aix42)
+               CC="cc"
+               CCOBJ="cc"
                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_NO_PROTO -D_NONSTD_TYPES -D_MBI=void"
-               XLIBS="${LIB_AFSDB} -ldl"
+               XCFLAGS="-K -D_NONSTD_TYPES -D_MBI=void"
+               XLIBS="${LIB_AFSDB} ${LIB_libintl} -ldl"
                SHLIB_LINKER="${MT_CC} -bM:SRE -berok"
-               AIX64="#"
+               AIX32="yes"
+               AIX64="no"
                ;;
 
-
-       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_NO_PROTO -D_NONSTD_TYPES -D_MBI=void"
-               XLIBS="${LIB_AFSDB} -ldl"
-               SHLIB_LINKER="${MT_CC} -bM:SRE -berok"
-               AIX64=""
-               ;;
-
-       rs_aix52)       
-               DBG=""
-               LEX="lex"
+       rs_aix51 | rs_aix52 | rs_aix53) 
+               CC="cc"
+               CCOBJ="cc"
+               DBG="-g"
                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_NO_PROTO -D_NONSTD_TYPES -D_MBI=void"
-               XLIBS="${LIB_AFSDB} -ldl"
+               XCFLAGS="-K -D_NONSTD_TYPES -D_MBI=void"
+               XLIBS="${LIB_AFSDB} ${LIB_libintl} -ldl"
                SHLIB_LINKER="${MT_CC} -bM:SRE -berok"
-               AIX64=""
+               AIX32="yes"
+               AIX64="yes"
                ;;
 
-       rs_aix53)       
+       rs_aix61)       
+               CC="cc"
+               CCOBJ="cc"
                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_NO_PROTO -D_NONSTD_TYPES -D_MBI=void"
-               XLIBS="${LIB_AFSDB} -ldl"
+               XCFLAGS="-K -D_NONSTD_TYPES -D_MBI=void"
+               XLIBS="${LIB_AFSDB} ${LIB_libintl} -ldl"
                SHLIB_LINKER="${MT_CC} -bM:SRE -berok"
-               AIX64=""
+               AIX32="no"
+               AIX64="yes"
                ;;
 
-       s390_linux22)
-               CC="gcc"
-               CCOBJ="gcc"
+       s390_linux22|s390_linux24|s390_linux26)
                LD="ld"
                KERN_OPTMZ=-O2
-               LEX="flex -l"
                MT_CC="$CC"
-               MT_CFLAGS='-DAFS_PTHREAD_ENV -pthread -D_REENTRANT ${XCFLAGS}'
-               MT_LIBS="-lpthread"
-               PAM_CFLAGS="-O -Dlinux -DLINUX_PAM -fPIC"
+               MT_CFLAGS='-pthread -D_REENTRANT'
+               PAM_OPTMZ=-O2
+               PAM_CFLAGS="-Dlinux -DLINUX_PAM -fPIC"
                SHLIB_CFLAGS="-fPIC"
                SHLIB_LDFLAGS="-shared -Xlinker -x"
-               TXLIBS="-lncurses"
-               XCFLAGS="-O -g -D_LARGEFILE64_SOURCE"
-               YACC="bison -y"
-               SHLIB_LINKER="${MT_CC} -shared"
-               ;;
-
-       s390_linux24|s390_linux26)
-               CC="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"
-               PAM_CFLAGS="-O -Dlinux -DLINUX_PAM -fPIC"
-               SHLIB_CFLAGS="-fPIC"
-               SHLIB_LDFLAGS="-shared -Xlinker -x"
-               TXLIBS="-lncurses"
-               XCFLAGS="-O -g -D_LARGEFILE64_SOURCE"
-               YACC="bison -y"
                SHLIB_LINKER="${MT_CC} -shared"
                ;;
 
        s390x_linux24|s390x_linux26)
-               CC="gcc"
-               CCOBJ="gcc"
+               CCOBJ="${CC} -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_CFLAGS="-O -Dlinux -DLINUX_PAM -fPIC"
+               MT_CFLAGS='-pthread -D_REENTRANT'
+               PAM_OPTMZ=-O
+               PAM_CFLAGS="-Dlinux -DLINUX_PAM -fPIC"
                SHLIB_CFLAGS="-fPIC"
                SHLIB_LDFLAGS="-shared -Xlinker -x -Xlinker -Bsymbolic"
-               TXLIBS="-lncurses"
-               XCFLAGS="-O -g -D_LARGEFILE64_SOURCE -D__s390x__"
-               YACC="bison -y"
+               OPTMZ=-O
+               XCFLAGS="-D__s390x__"
                SHLIB_LINKER="${MT_CC} -shared"
                ;;
 
        sgi_62)
-               PINSTALL_LIBS=-lmld
+               CC="cc"
+               CCOBJ="cc"
+               MT_CC="cc"
                AFSD_LIBS="/usr/lib/libdwarf.a /usr/lib/libelf.a"
                FSINCLUDES="-I/usr/include/sys/fs"
-               LEX="lex"
-               MT_CFLAGS='-D_SGI_MP_SOURCE -DAFS_PTHREAD_ENV ${XCFLAGS}'
-               MT_LIBS="-lpthread"
-               TXLIBS="-lcurses"
+               MT_CFLAGS='-D_SGI_MP_SOURCE'
                XCFLAGS64="-64 -mips3"
                XCFLAGS="-o32"
                XLDFLAGS64="-64"
@@ -598,13 +480,12 @@ case $AFS_SYSNAME in
                ;;
 
        sgi_63)
-               PINSTALL_LIBS=-lmld
+               CC="cc"
+               CCOBJ="cc"
+               MT_CC="cc"
                AFSD_LIBS="/usr/lib/libdwarf.a /usr/lib/libelf.a"
                FSINCLUDES="-I/usr/include/sys/fs"
-               LEX="lex"
-               MT_CFLAGS='-D_SGI_MP_SOURCE -DAFS_PTHREAD_ENV ${XCFLAGS}'
-               MT_LIBS="-lpthread"
-               TXLIBS="-lcurses"
+               MT_CFLAGS='-D_SGI_MP_SOURCE'
                XCFLAGS64="-D_BSD_COMPAT -64 -mips3"
                XCFLAGS="-D_OLD_TERMIOS -D_BSD_COMPAT -o32"
                XLDFLAGS64="-64"
@@ -613,14 +494,14 @@ case $AFS_SYSNAME in
                ;;
 
        sgi_64)
+               CC="cc"
+               CCOBJ="cc"
+               MT_CC="cc"
                AFSD_LIBS="/usr/lib32/libdwarf.a /usr/lib32/libelf.a"
                FSINCLUDES="-I/usr/include/sys/fs"
-               LEX="lex"
-               MT_CFLAGS='-D_SGI_MP_SOURCE -DAFS_PTHREAD_ENV ${XCFLAGS}'
-               MT_LIBS="-lpthread"
-               TXLIBS="-lcurses"
+               MT_CFLAGS='-D_SGI_MP_SOURCE'
                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"
+               XCFLAGS="-D_OLD_TERMIOS -D_BSD_COMPAT -n32 -woff 1009,1014,1110,1116,1164,1169,1171,1174,1177,1183,1185,1204,1233,1515,1516,1548,1169,1174,1177,1196,1498,1506,1552,3201 -Wl,-woff,84,-woff,15"
                XLDFLAGS64="-64"
                XLDFLAGS="-n32"
                SHLIB_LINKER="${CC} -shared"
@@ -632,55 +513,24 @@ case $AFS_SYSNAME in
                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"
-               TXLIBS="-lcurses"
+               MT_CFLAGS='-D_SGI_MP_SOURCE'
                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"
+               XCFLAGS="-n32 -mips3 -woff 1009,1014,1110,1116,1164,1171,1177,1183,1185,1204,1233,1515,1516,1548,1169,1174,1177,1196,1498,1506,1552,3201 -Wl,-woff,84,-woff,15"
                XLDFLAGS64="-64 -mips3"
                XLDFLAGS="-n32 -mips3"
                SHLIB_LINKER="${CC} -shared"
                ;;
 
-       sparc64_linux22)
+       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"
+               MT_CFLAGS='-pthread -D_REENTRANT'
+               PAM_OPTMZ=-O2
+               PAM_CFLAGS="-Dlinux -DLINUX_PAM -fPIC"
                SHLIB_CFLAGS="-fPIC"
                SHLIB_LDFLAGS="-shared -Xlinker -x"
-               TXLIBS="-lncurses"
-               XCFLAGS="-O2 -D_LARGEFILE64_SOURCE"
-               YACC="bison -y"
-               SHLIB_LINKER="${MT_CC} -shared"
-               ;;
-
-       sparc64_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"
-               SHLIB_LDFLAGS="-shared -Xlinker -x"
-               TXLIBS="-lncurses"
-               XCFLAGS="-O2 -D_LARGEFILE64_SOURCE"
-               YACC="bison -y"
-               SHLIB_LINKER="${MT_CC} -shared"
-               ;;
-
-       sparc_linux22)
-               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"
-               SHLIB_LDFLAGS="-shared -Xlinker -x"
-               TXLIBS="-lncurses"
-               XCFLAGS="-O2 -D_LARGEFILE64_SOURCE"
-               YACC="bison -y"
+               XCFLAGS64="-m64"
+               XLDFLAGS64="-m64"
                SHLIB_LINKER="${MT_CC} -shared"
                ;;
 
@@ -688,9 +538,7 @@ case $AFS_SYSNAME in
                CCXPG2="/usr/xpg2bin/cc"
                CC="gcc"
                CCOBJ="gcc"
-               LEX="lex"
                SHLIB_CFLAGS="-PIC"
-               TXLIBS="-lcurses -ltermcap"
                XCFLAGS=""
                XLIBELFA="-lelf"
                XLIBKVM="-lkvm"
@@ -699,211 +547,134 @@ case $AFS_SYSNAME in
                ;;
 
        sun4x_55)
-               CC="/opt/SUNWspro/bin/cc"
-               CCOBJ="/opt/SUNWspro/bin/cc"
-               LEX="lex"
-               MT_CC="/opt/SUNWspro/bin/cc"
-               MT_CFLAGS='-mt -DAFS_PTHREAD_ENV ${XCFLAGS}'
-               MT_LIBS="-lpthread -lsocket"
-               SHLIB_CFLAGS="-KPIC"
-               TXLIBS="-lcurses"
-               XCFLAGS="-dy -Bdynamic"
-               XLIBELFA="-lelf"
-               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"
-               ;;
-
-       sun4x_56)
-               CC="/opt/SUNWspro/bin/cc"
-               CCOBJ="/opt/SUNWspro/bin/cc"
-               LEX="lex"
-               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"
+               CC=$SOLARISCC
+               CCOBJ=$SOLARISCC
+               MT_CC=$SOLARISCC
+               MT_CFLAGS='-mt'
                SHLIB_CFLAGS="-KPIC"
-               SHLIB_LDFLAGS="-G -Bsymbolic"
-               TXLIBS="-L/usr/ccs/lib -lcurses"
                XCFLAGS="-dy -Bdynamic"
                XLIBELFA="-lelf"
-               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"
-               ;;
-
-       sun4x_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=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"
-               ;;
-
-       sun4x_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=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"
+               SHLIB_LINKER="${CC} -G -dy -Bsymbolic -z text"
+               LWP_OPTMZ="-g"
                ;;
 
-       sun4x_59)
-               CC="/opt/SUNWspro/bin/cc"
-               CCOBJ="/opt/SUNWspro/bin/cc"
-               LEX="lex"
+       sun4x_56|sun4x_57|sun4x_58|sun4x_59)
+               CC=$SOLARISCC
+               CCOBJ=$SOLARISCC
                LD="/usr/ccs/bin/ld"
-               MT_CC="/opt/SUNWspro/bin/cc"
-               MT_CFLAGS='-mt -DAFS_PTHREAD_ENV ${XCFLAGS}'
-               MT_LIBS="-lpthread -lsocket"
+               MT_CC=$SOLARISCC
+               MT_CFLAGS='-mt'
                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"
+               SHLIB_LINKER="${CC} -G -dy -Bsymbolic -z text"
+               LWP_OPTMZ="-g"
                ;;
 
        sun4x_510)
-               CC="/opt/SUNWspro/bin/cc"
-               CCOBJ="/opt/SUNWspro/bin/cc"
-               LEX="lex"
+               CC=$SOLARISCC
+               CCOBJ=$SOLARISCC
                LD="/usr/ccs/bin/ld"
-               MT_CC="/opt/SUNWspro/bin/cc"
-               MT_CFLAGS='-mt -DAFS_PTHREAD_ENV ${XCFLAGS}'
-               MT_LIBS="-lpthread -lsocket"
+               MT_CC=$SOLARISCC
+               MT_CFLAGS='-mt'
                PAM_CFLAGS="-KPIC"
                PAM_LIBS="-lc -lpam -lsocket -lnsl -lm"
                SHLIB_CFLAGS="-KPIC"
                SHLIB_LDFLAGS="-G -Bsymbolic"
-               TXLIBS="-lcurses"
-               XCFLAGS64='${XCFLAGS} -xarch=v9'
+               XCFLAGS64='${XCFLAGS} -m64'
                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"
+               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"
+       sun4x_511)
+               CC=$SOLARISCC
+               CCOBJ=$SOLARISCC
                LD="/usr/ccs/bin/ld"
-               MT_CC="/opt/SUNWspro/bin/cc"
-               MT_CFLAGS='-mt -DAFS_PTHREAD_ENV ${XCFLAGS}'
-               MT_LIBS="-lpthread -lsocket"
+               MT_CC=$SOLARISCC
+               MT_CFLAGS='-mt'
                PAM_CFLAGS="-KPIC"
                PAM_LIBS="-lc -lpam -lsocket -lnsl -lm"
                SHLIB_CFLAGS="-KPIC"
                SHLIB_LDFLAGS="-G -Bsymbolic"
-               TXLIBS="-lcurses"
-               XCFLAGS64='${XCFLAGS} -xarch=amd64'
+               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"
+               SHLIB_LINKER="${CC} -G -dy -Bsymbolic -z text"
+               LWP_OPTMZ="-g"
                ;;
 
-       sunx86_58)
-               CC="/opt/SUNWspro/bin/cc"
-               CCOBJ="/opt/SUNWspro/bin/cc"
-               LEX="lex"
+       sunx86_57|sunx86_58|sunx86_59)
+               CC=$SOLARISCC
+               CCOBJ=$SOLARISCC
                LD="/usr/ccs/bin/ld"
-               MT_CC="/opt/SUNWspro/bin/cc"
-               MT_CFLAGS='-mt -DAFS_PTHREAD_ENV ${XCFLAGS}'
-               MT_LIBS="-lpthread -lsocket"
+               MT_CC=$SOLARISCC
+               MT_CFLAGS='-mt'
                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"
+               SHLIB_LINKER="${CC} -G -dy -Bsymbolic -z text"
                ;;
 
-       sunx86_59)
-               CC="/opt/SUNWspro/bin/cc"
-               CCOBJ="/opt/SUNWspro/bin/cc"
-               LEX="lex"
+       sunx86_510)
+               CC=$SOLARISCC
+               CCOBJ=$SOLARISCC
                LD="/usr/ccs/bin/ld"
-               MT_CC="/opt/SUNWspro/bin/cc"
-               MT_CFLAGS='-mt -DAFS_PTHREAD_ENV ${XCFLAGS}'
-               MT_LIBS="-lpthread -lsocket"
+               MT_CC=$SOLARISCC
+               MT_CFLAGS='-mt'
                PAM_CFLAGS="-KPIC"
                PAM_LIBS="-lc -lpam -lsocket -lnsl -lm"
                SHLIB_CFLAGS="-KPIC"
                SHLIB_LDFLAGS="-G -Bsymbolic"
-               TXLIBS="-lcurses"
-               XCFLAGS64='${XCFLAGS} -xarch=amd64'
+               XCFLAGS64='${XCFLAGS} -m64'
                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"
+               SHLIB_LINKER="${CC} -G -dy -Bsymbolic -z text"
                ;;
 
-       sunx86_510)
-               CC="/opt/SUNWspro/bin/cc"
-               CCOBJ="/opt/SUNWspro/bin/cc"
-               LEX="lex"
+       sunx86_511)
+               CC=$SOLARISCC
+               CCOBJ=$SOLARISCC
                LD="/usr/ccs/bin/ld"
-               MT_CC="/opt/SUNWspro/bin/cc"
-               MT_CFLAGS='-mt -DAFS_PTHREAD_ENV ${XCFLAGS}'
-               MT_LIBS="-lpthread -lsocket"
+               MT_CC=$SOLARISCC
+               MT_CFLAGS='-mt'
                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"
+               SHLIB_LINKER="${CC} -G -dy -Bsymbolic -z text"
                ;;
 esac
 
+MT_CFLAGS="${MT_CFLAGS} -DAFS_PTHREAD_ENV"
+
 #
 # Special build targets
 #
@@ -918,26 +689,6 @@ case $AFS_SYSNAME in
                AC_SUBST(install_XFS_SIZE_CHECK)
                AC_SUBST(dest_XFS_SIZE_CHECK)
        ;;
-       
-       sun4x_*|sunx86_*)
-               FS_CONV_SOL26="fs_conv_sol26"
-               install_FS_CONV_SOL26='$(DESTDIR)${afssrvsbindir}/fs_conv_sol26'
-               dest_FS_CONV_SOL26='$(DEST)/root.server/usr/afs/bin/fs_conv_sol26'
-
-               AC_SUBST(FS_CONV_SOL26)
-               AC_SUBST(install_FS_CONV_SOL26)
-               AC_SUBST(dest_FS_CONV_SOL26)
-       ;;
-
-       alpha_dux*)
-               FS_CONV_OSF40D="fs_conv_dux40D"
-               install_FS_CONV_OSF40D='$(DESTDIR)${afssrvsbindir}/fs_conv_dux40D'
-               dest_FS_CONV_OSF40D='$(DEST)/root.server/usr/afs/bin/fs_conv_dux40D'
-
-               AC_SUBST(FS_CONV_OSF40D)
-               AC_SUBST(install_FS_CONV_OSF40D)
-               AC_SUBST(dest_FS_CONV_OSF40D)
-       ;;
 esac
 
 dnl Disable the default for debugging/optimization if not enabled
@@ -951,6 +702,7 @@ fi
 
 if test "x$enable_debug" = "xno"; then
   DBG=
+  NO_STRIP_BIN=-s
 fi
 
 if test "x$enable_optimize" = "xno"; then
@@ -965,10 +717,69 @@ if test "x$enable_optimize_lwp" = "xno"; then
   LWP_OPTMZ=
 fi
 
+if test "x$enable_strip_binaries" != "xno"; then
+  if test "x$enable_strip_binaries" = "xmaybe" -a "x$enable_debug" = "xyes"; then
+    NO_STRIP_BIN=
+  else
+    NO_STRIP_BIN=-s
+  fi
+else
+  NO_STRIP_BIN=
+fi
+
+CFLAGS_NOERROR=
+CFLAGS_NOSTRICT=
+CFLAGS_NOUNUSED=
+CFLAGS_NOOLDSTYLE=
+
+if test "x$GCC" = "xyes"; then
+  if test "x$enable_warnings" = "xyes"; then
+    XCFLAGS="${XCFLAGS} -Wall -Wstrict-prototypes -Wold-style-definition -Wpointer-arith"
+  fi
+  if test "x$enable_checking" != "xno"; then
+    XCFLAGS="${XCFLAGS} -Wall -Wstrict-prototypes -Wold-style-definition -Werror -fdiagnostics-show-option -Wpointer-arith"
+    if test "x$enable_checking" != "xall"; then
+      CFLAGS_NOERROR="-Wno-error"
+      CFLAGS_NOSTRICT="-fno-strict-aliasing"
+      CFLAGS_NOUNUSED="-Wno-unused"
+      CFLAGS_NOOLDSTYLE="-Wno-old-style-definition"
+      AC_DEFINE(IGNORE_SOME_GCC_WARNINGS, 1, [define to disable some gcc warnings in warnings-as-errors mode])
+    fi
+  fi
+else
+  case $AFS_SYSNAME in
+    sun*_51?)
+      # Solaris Studio
+      warn_common="-v -errfmt=error -errtags=yes -erroff=E_ATTRIBUTE_UNKNOWN,E_END_OF_LOOP_CODE_NOT_REACHED"
+      if test "x$enable_warnings" = "xyes" ; then
+        XCFLAGS="${XCFLAGS} $warn_common"
+      fi
+      if test "x$enable_checking" != "xno" ; then
+        XCFLAGS="${XCFLAGS} $warn_common -errwarn=%all"
+        if test "x$enable_checking" != "xall" ; then
+          CFLAGS_NOERROR="-errwarn=%none"
+        fi
+      fi
+      ;;
+  esac
+fi
+
+dnl horribly cheating, assuming double / is ok.
+case $INSTALL in
+  ./* ) 
+    INSTALL="/@abs_top_srcdir@/install-sh -c"
+  ;;
+  *) 
+  ;;
+esac
+
+INSTALL_PROGRAM="${INSTALL_PROGRAM} ${NO_STRIP_BIN}"
+
 AC_SUBST(CCXPG2)
 AC_SUBST(CCOBJ)
 AC_SUBST(AFSD_LIBS)
 AC_SUBST(AFSD_LDFLAGS)
+AC_SUBST(AIX32)
 AC_SUBST(AIX64)
 AC_SUBST(AR)
 AC_SUBST(AS)
@@ -985,20 +796,27 @@ AC_SUBST(MT_CC)
 AC_SUBST(MT_CFLAGS)
 AC_SUBST(MT_LIBS)
 AC_SUBST(MV)
+AC_SUBST(NO_STRIP_BIN)
 AC_SUBST(OPTMZ)
 AC_SUBST(PAM_CFLAGS)
 AC_SUBST(PAM_LIBS)
-AC_SUBST(PINSTALL_LIBS)
+AC_SUBST(PAM_DBG)
+AC_SUBST(PAM_OPTMZ)
 AC_SUBST(RANLIB)
 AC_SUBST(REGEX_OBJ)
+AC_SUBST(REGEX_OBJ_PIC)
 AC_SUBST(RM)
+AC_SUBST(RXDEBUG)
 AC_SUBST(SHLIB_CFLAGS)
 AC_SUBST(SHLIB_LDFLAGS)
 AC_SUBST(SHLIB_LINKER)
 AC_SUBST(SHLIB_SUFFIX)
-AC_SUBST(TXLIBS)
 AC_SUBST(VFSCK_CFLAGS)
 AC_SUBST(XCFLAGS)
+AC_SUBST(CFLAGS_NOERROR)
+AC_SUBST(CFLAGS_NOSTRICT)
+AC_SUBST(CFLAGS_NOUNUSED)
+AC_SUBST(CFLAGS_NOOLDSTYLE)
 AC_SUBST(XCFLAGS64)
 AC_SUBST(XLDFLAGS)
 AC_SUBST(XLDFLAGS64)