git://git.openafs.org / openafs.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw
DEVEL15-linux-configure-vfs-update-20070612
[openafs.git] / src / cf / osconf.m4
diff --git a/src/cf/osconf.m4 b/src/cf/osconf.m4
index 198e776..a91a962 100644 (file)
--- a/src/cf/osconf.m4
+++ b/src/cf/osconf.m4
@@ -2,6 +2,7 @@
 AC_DEFUN([OPENAFS_OSCONF], [
 
 dnl defaults, override in case below as needed
+CFLAGS=
 XCFLAGS='${DBG} ${OPTMZ}'
 SHLIB_SUFFIX="so"
 CC="cc"
@@ -11,13 +12,15 @@ 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 not override
+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
@@ -72,11 +75,12 @@ case $AFS_SYSNAME in
                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="-lncurses"
-               XCFLAGS="-O2 -D_LARGEFILE64_SOURCE"
+               XCFLAGS="-D_LARGEFILE64_SOURCE"
                YACC="bison -y"
                SHLIB_LINKER="${MT_CC} -shared"
                ;;
@@ -87,11 +91,12 @@ case $AFS_SYSNAME in
                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="-lncurses"
-               XCFLAGS="-O2 -D_LARGEFILE64_SOURCE"
+               XCFLAGS="-D_LARGEFILE64_SOURCE"
                YACC="bison -y"
                SHLIB_LINKER="${MT_CC} -shared"
                ;;
@@ -102,11 +107,12 @@ case $AFS_SYSNAME in
                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="-lncurses"
-               XCFLAGS="-O2 -D_LARGEFILE64_SOURCE"
+               XCFLAGS="-D_LARGEFILE64_SOURCE"
                YACC="bison -y"
                SHLIB_LINKER="${MT_CC} -shared"
                ;;
@@ -206,21 +212,25 @@ case $AFS_SYSNAME in
                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"
+               SHLIB_LINKER="${MT_CC} -shared"
                TXLIBS="-lncurses"
-               XCFLAGS="-O2 -pipe"
+               XCFLAGS="-pipe"
                YACC="byacc"
                ;;
 
-       *nbsd2*|*nbsd3*)
+       *nbsd2*|*nbsd3*|*nbsd4*)
                LEX="flex -l"
                MT_CFLAGS='${XCFLAGS} -DAFS_PTHREAD_ENV -D_REENTRANT '
                MT_LIBS="-lpthread" # XXX -pthread soon
-               PAM_CFLAGS="-O2 -pipe -fPIC"
+               PAM_OPTMZ=-O2
+               PAM_CFLAGS="-pipe -fPIC"
                SHLIB_LDFLAGS="-shared -Xlinker -x"
+               SHLIB_LINKER="${MT_CC} -shared"
                TXLIBS="/usr/lib/libcurses.so"
-               XCFLAGS="-O2 -pipe"
+               XCFLAGS="-pipe"
                YACC="yacc"
                ;;
 
@@ -228,10 +238,12 @@ case $AFS_SYSNAME in
                LEX="flex -l"
                MT_CFLAGS='${XCFLAGS}'
                MT_LIBS=""
-               PAM_CFLAGS="-O2 -pipe -fPIC"
+               PAM_OPTMZ=-O2
+               PAM_CFLAGS="-pipe -fPIC"
                SHLIB_LDFLAGS="-shared -Xlinker -x"
+               SHLIB_LINKER="${MT_CC} -shared"
                TXLIBS="/usr/lib/libcurses.so"
-               XCFLAGS="-O2 -pipe"
+               XCFLAGS="-pipe"
                YACC="bison -y"
                ;;
 
@@ -240,10 +252,12 @@ case $AFS_SYSNAME in
                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="-lncurses"
-               XCFLAGS="-g -O2 -D_LARGEFILE64_SOURCE -G0"
+               XCFLAGS="-D_LARGEFILE64_SOURCE -G0"
                SHLIB_LINKER="${MT_CC} -shared"
                ;;
 
@@ -253,11 +267,12 @@ case $AFS_SYSNAME in
                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="-lncurses"
-               XCFLAGS="-g -O2 -D_LARGEFILE64_SOURCE"
+               XCFLAGS="-D_LARGEFILE64_SOURCE"
                SHLIB_LINKER="${MT_CC} -shared"
                ;;
 
@@ -266,10 +281,12 @@ case $AFS_SYSNAME in
                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_LDFLAGS="-shared -Xlinker -x"
+               SHLIB_CFLAGS="-fPIC"
                TXLIBS="/usr/lib64/libncurses.so"
-               XCFLAGS="-g -O2 -D_LARGEFILE64_SOURCE"
+               XCFLAGS="-D_LARGEFILE64_SOURCE"
                SHLIB_LINKER="${MT_CC} -shared"
                ;;
 
@@ -278,11 +295,12 @@ case $AFS_SYSNAME in
                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_LDFLAGS="-shared -Xlinker -x"
                SHLIB_CFLAGS="-fPIC"
                TXLIBS="-lncurses"
-               XCFLAGS="-g -O2 -D_LARGEFILE64_SOURCE -fPIC"
+               XCFLAGS="-D_LARGEFILE64_SOURCE -fPIC"
                YACC="bison -y"
                SHLIB_LINKER="${MT_CC} -shared"
                ;;
@@ -295,10 +313,12 @@ case $AFS_SYSNAME in
                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="-lncurses"
-               XCFLAGS="-O2 -D_LARGEFILE64_SOURCE"
+               XCFLAGS="-D_LARGEFILE64_SOURCE"
                YACC="bison -y"
                SHLIB_LINKER="${MT_CC} -shared"
                ;;
@@ -316,10 +336,11 @@ case $AFS_SYSNAME in
                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"
+               XCFLAGS="-D_LARGEFILE64_SOURCE"
                SHLIB_LINKER="${MT_CC} -shared"
                ;;
 
@@ -336,10 +357,12 @@ case $AFS_SYSNAME in
                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"
+               XCFLAGS="-D_LARGEFILE64_SOURCE"
                SHLIB_LINKER="${MT_CC} -shared"
                ;;
 
@@ -356,22 +379,28 @@ case $AFS_SYSNAME in
                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"
+               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"
+               XCFLAGS=
                YACC="yacc"
                ;;
 
@@ -380,10 +409,12 @@ case $AFS_SYSNAME in
                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="-lncurses"
-               XCFLAGS="-O2 -D_LARGEFILE64_SOURCE"
+               XCFLAGS="-D_LARGEFILE64_SOURCE"
                YACC="bison -y"
                SHLIB_LINKER="${MT_CC} -shared"
                ;;
@@ -393,6 +424,8 @@ case $AFS_SYSNAME in
                LEX="lex -l"
                REGEX_OBJ="regex.o"
                XCFLAGS="-traditional-cpp"
+               SHLIB_LINKER="${MT_CC} -dynamiclib"
+               SHLIB_SUFFIX="dylib"
                ;;
 
        ppc_darwin_13)
@@ -401,6 +434,8 @@ case $AFS_SYSNAME in
                LWP_OPTMZ="-O2"
                REGEX_OBJ="regex.o"
                XCFLAGS="-no-cpp-precomp"
+               SHLIB_LINKER="${MT_CC} -dynamiclib"
+               SHLIB_SUFFIX="dylib"
                ;;
 
        ppc_darwin_14)
@@ -409,6 +444,8 @@ case $AFS_SYSNAME in
                LWP_OPTMZ="-O2"
                REGEX_OBJ="regex.o"
                XCFLAGS="-no-cpp-precomp"
+               SHLIB_LINKER="${MT_CC} -dynamiclib"
+               SHLIB_SUFFIX="dylib"
                ;;
 
        ppc_darwin_60)
@@ -418,6 +455,8 @@ case $AFS_SYSNAME in
                REGEX_OBJ="regex.o"
                XCFLAGS="-no-cpp-precomp"
                TXLIBS="-lncurses"
+               SHLIB_LINKER="${MT_CC} -dynamiclib"
+               SHLIB_SUFFIX="dylib"
                ;;
 
        ppc_darwin_70)
@@ -431,19 +470,41 @@ case $AFS_SYSNAME in
                XCFLAGS="-no-cpp-precomp"
                TXLIBS="-lncurses"
                EXTRA_VLIBOBJS="fstab.o"
+               SHLIB_LINKER="${MT_CC} -dynamiclib"
+               SHLIB_SUFFIX="dylib"
                ;;
 
-       ppc_darwin_80)
+       *_darwin_80)
                AFSD_LDFLAGS="-F/System/Library/PrivateFrameworks -framework DiskArbitration"
                LEX="lex -l"
-               MT_CFLAGS='-DAFS_PTHREAD_ENV -D_REENTRANT ${XCFLAGS}'
+               MT_CFLAGS='-DAFS_PTHREAD_ENV -D_REENTRANT ${XCFLAGS} ${ARCHFLAGS}'
                KROOT=
                KINCLUDES='-I$(KROOT)/System/Library/Frameworks/Kernel.framework/Headers'
-               LWP_OPTMZ="-O2"
+               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"
-               XCFLAGS="-no-cpp-precomp"
                TXLIBS="-lncurses"
                EXTRA_VLIBOBJS="fstab.o"
+               SHLIB_LINKER="${MT_CC} -dynamiclib"
+               SHLIB_SUFFIX="dylib"
                ;;
 
        ppc_linux*)
@@ -451,10 +512,12 @@ case $AFS_SYSNAME in
                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="-lncurses"
-               XCFLAGS="-O2 -D_LARGEFILE64_SOURCE"
+               XCFLAGS="-D_LARGEFILE64_SOURCE"
                YACC="bison -y"
                SHLIB_LINKER="${MT_CC} -shared"
                ;;
@@ -468,7 +531,7 @@ case $AFS_SYSNAME in
                MT_LIBS="-lpthreads"
                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="#"
@@ -484,7 +547,7 @@ case $AFS_SYSNAME in
                MT_LIBS="-lpthreads"
                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=""
@@ -499,7 +562,7 @@ case $AFS_SYSNAME in
                MT_LIBS="-lpthreads"
                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=""
@@ -514,7 +577,7 @@ case $AFS_SYSNAME in
                MT_LIBS="-lpthreads"
                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=""
@@ -529,10 +592,13 @@ case $AFS_SYSNAME in
                MT_CC="$CC"
                MT_CFLAGS='-DAFS_PTHREAD_ENV -pthread -D_REENTRANT ${XCFLAGS}'
                MT_LIBS="-lpthread"
-               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="-lncurses"
-               XCFLAGS="-O -g -D_LARGEFILE64_SOURCE"
+               OPTMZ=-O
+               XCFLAGS="-D_LARGEFILE64_SOURCE"
                YACC="bison -y"
                SHLIB_LINKER="${MT_CC} -shared"
                ;;
@@ -546,27 +612,32 @@ case $AFS_SYSNAME in
                MT_CC="$CC"
                MT_CFLAGS='-DAFS_PTHREAD_ENV -pthread -D_REENTRANT ${XCFLAGS}'
                MT_LIBS="-lpthread"
-               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="-lncurses"
-               XCFLAGS="-O -g -D_LARGEFILE64_SOURCE"
+               XCFLAGS="-D_LARGEFILE64_SOURCE"
                YACC="bison -y"
                SHLIB_LINKER="${MT_CC} -shared"
                ;;
 
        s390x_linux24|s390x_linux26)
                CC="gcc"
-               CCOBJ="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_CFLAGS="-O -Dlinux -DLINUX_PAM -fPIC"
-               SHLIB_LDFLAGS="-shared -Xlinker -x"
+               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__"
+               OPTMZ=-O
+               XCFLAGS="-D_LARGEFILE64_SOURCE -D__s390x__"
                YACC="bison -y"
                SHLIB_LINKER="${MT_CC} -shared"
                ;;
@@ -633,41 +704,19 @@ case $AFS_SYSNAME in
                SHLIB_LINKER="${CC} -shared"
                ;;
 
-       sparc64_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"
-               SHLIB_LINKER="${MT_CC} -shared"
-               ;;
-
-       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"
-               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"
+               PAM_OPTMZ=-O2
+               PAM_CFLAGS="-Dlinux -DLINUX_PAM -fPIC"
+               SHLIB_CFLAGS="-fPIC"
                SHLIB_LDFLAGS="-shared -Xlinker -x"
                TXLIBS="-lncurses"
-               XCFLAGS="-O2 -D_LARGEFILE64_SOURCE"
+               XCFLAGS="-D_LARGEFILE64_SOURCE"
+               XCFLAGS64="-D_LARGEFILE64_SOURCE -m64"
+               XLDFLAGS64="-m64"
                YACC="bison -y"
                SHLIB_LINKER="${MT_CC} -shared"
                ;;
@@ -701,6 +750,7 @@ case $AFS_SYSNAME in
                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)
@@ -721,6 +771,7 @@ case $AFS_SYSNAME in
                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)
@@ -742,6 +793,7 @@ case $AFS_SYSNAME in
                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)
@@ -763,6 +815,7 @@ case $AFS_SYSNAME in
                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)
@@ -784,6 +837,7 @@ case $AFS_SYSNAME in
                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_510)
@@ -805,6 +859,29 @@ case $AFS_SYSNAME in
                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"
+               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 -Bsymbolic -z text"
+               LWP_OPTMZ="-g"
                ;;
 
        sunx86_57)
@@ -890,6 +967,27 @@ case $AFS_SYSNAME in
                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
 
 #
@@ -928,6 +1026,18 @@ 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=
@@ -976,6 +1086,8 @@ 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)
OpenAFS Master Repository