Utilize --enable-warnings for SUNWspro

[openafs.git] / src / cf / osconf.m4

diff --git a/src/cf/osconf.m4 b/src/cf/osconf.m4
index 61e9403..7a6ea2e 100644 (file)
--- a/src/cf/osconf.m4
+++ b/src/cf/osconf.m4
@@ -2,7 +2,6 @@
 AC_DEFUN([OPENAFS_OSCONF], [
 
 dnl defaults, override in case below as needed
-CFLAGS=
 XCFLAGS='${DBG} ${OPTMZ}'
 RXDEBUG="-DRXDEBUG"
 SHLIB_SUFFIX="so"
@@ -41,7 +40,6 @@ case $AFS_SYSNAME in
                CC="cc"
                CCOBJ="cc"
                MT_CC="cc"
-               LEX="lex"
                CSTATIC="-non_shared"
                DBG="-g3"
                MT_CFLAGS='-D_REENTRANT=1 -pthread -DAFS_PTHREAD_ENV ${XCFLAGS}'
@@ -69,7 +67,6 @@ case $AFS_SYSNAME in
                CC="cc"
                CCOBJ="cc"
                MT_CC="cc"
-               LEX="flex -l"
                DBG="-g3"
                CSTATIC="-non_shared"
                LWP_OPTMZ="-O2"
@@ -82,7 +79,6 @@ case $AFS_SYSNAME in
 
        alpha_linux_22)
                KERN_OPTMZ=-O2
-               LEX="flex -l"
                MT_CFLAGS='-DAFS_PTHREAD_ENV -pthread -D_REENTRANT ${XCFLAGS}'
                MT_LIBS="-lpthread"
                PAM_OPTMZ=-O2
@@ -91,14 +87,12 @@ case $AFS_SYSNAME in
                SHLIB_LDFLAGS="-shared -Xlinker -x"
                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
@@ -107,14 +101,12 @@ case $AFS_SYSNAME in
                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_OPTMZ=-O2
@@ -123,14 +115,12 @@ case $AFS_SYSNAME in
                SHLIB_LDFLAGS="-shared -Xlinker -x"
                TXLIBS="-lncurses"
                XCFLAGS="-D_LARGEFILE64_SOURCE"
-               YACC="bison -y"
                SHLIB_LINKER="${MT_CC} -shared"
                ;;
 
        arm_linux24)
                CCOBJ="${CC} -fPIC"
                KERN_OPTMZ=-O2
-               LEX="flex -l"
                MT_CFLAGS='-DAFS_PTHREAD_ENV -pthread -D_REENTRANT ${XCFLAGS}'
                MT_LIBS="-lpthread"
                PAM_OPTMZ=-O2
@@ -139,14 +129,12 @@ case $AFS_SYSNAME in
                SHLIB_LDFLAGS="-shared -Xlinker -x"
                TXLIBS="-lncurses"
                XCFLAGS="-D_LARGEFILE64_SOURCE"
-               YACC="bison -y"
                SHLIB_LINKER="${MT_CC} -shared"
                ;;
 
        arm_linux26)
                CCOBJ="${CC} -fPIC"
                KERN_OPTMZ=-O2
-               LEX="flex -l"
                MT_CFLAGS='-DAFS_PTHREAD_ENV -pthread -D_REENTRANT ${XCFLAGS}'
                MT_LIBS="-lpthread"
                PAM_OPTMZ=-O2
@@ -155,7 +143,6 @@ case $AFS_SYSNAME in
                SHLIB_LDFLAGS="-shared -Xlinker -x"
                TXLIBS="-lncurses"
                XCFLAGS="-D_LARGEFILE64_SOURCE"
-               YACC="bison -y"
                SHLIB_LINKER="${MT_CC} -shared"
                ;;
 
@@ -250,7 +237,6 @@ case $AFS_SYSNAME in
                ;;
 
        i386_fbsd_*)
-               LEX="flex -l"
                MT_CFLAGS='-DAFS_PTHREAD_ENV -pthread -D_REENTRANT ${XCFLAGS}'
                MT_LIBS="-pthread"
                PAM_OPTMZ=-O2
@@ -259,11 +245,9 @@ case $AFS_SYSNAME in
                SHLIB_LINKER="${MT_CC} -shared"
                TXLIBS="-lncurses"
                XCFLAGS="-pipe"
-               YACC="byacc"
                ;;
 
        i386_dfbsd_*)
-               LEX="flex -l"
                MT_CFLAGS='-DAFS_PTHREAD_ENV -pthread -D_REENTRANT ${XCFLAGS}'
                MT_LIBS="-pthread"
                PAM_OPTMZ=-O2
@@ -272,11 +256,9 @@ case $AFS_SYSNAME in
                SHLIB_LINKER="${MT_CC} -shared"
                TXLIBS="-lncurses"
                XCFLAGS="-pipe"
-               YACC="byacc"
                ;;
 
        amd64_fbsd_*)
-               LEX="flex -l"
                MT_CFLAGS='-DAFS_PTHREAD_ENV -pthread -D_REENTRANT ${XCFLAGS}'
                MT_LIBS="-pthread"
                PAM_CFLAGS="-O2 -pipe -fPIC"
@@ -284,24 +266,21 @@ case $AFS_SYSNAME in
                SHLIB_LINKER="${MT_CC} -shared"
                TXLIBS="-lncurses"
                XCFLAGS="-O2 -pipe -fPIC"
-               YACC="byacc"
                ;;
 
-       *nbsd2*|*nbsd3*|*nbsd4*)
-               LEX="flex -l"
-               MT_CFLAGS='${XCFLAGS} -DAFS_PTHREAD_ENV -D_REENTRANT '
-               MT_LIBS="-lpthread" # XXX -pthread soon
+       *nbsd2*|*nbsd3*|*nbsd4*|*nbsd5*)
+               MT_CFLAGS='-DAFS_PTHREAD_ENV -pthread -D_REENTRANT ${XCFLAGS}'
+               MT_LIBS="-pthread"
                PAM_OPTMZ=-O2
                PAM_CFLAGS="-pipe -fPIC"
+               SHLIB_CFLAGS="-fPIC"
                SHLIB_LDFLAGS="-shared -Xlinker -x"
                SHLIB_LINKER="${MT_CC} -shared"
-               TXLIBS="/usr/lib/libcurses.so"
+               TXLIBS="-lcurses"
                XCFLAGS="-pipe"
-               YACC="yacc"
                ;;
 
        *nbsd15|*nbsd16)
-               LEX="flex -l"
                MT_CFLAGS='${XCFLAGS}'
                MT_LIBS=""
                PAM_OPTMZ=-O2
@@ -310,12 +289,10 @@ case $AFS_SYSNAME in
                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="-lpthread"
                PAM_OPTMZ=-O2
@@ -330,7 +307,6 @@ case $AFS_SYSNAME in
        amd64_linux*)
                CCOBJ="${CC} -fPIC"
                KERN_OPTMZ=-O2
-               LEX="flex -l"
                MT_CFLAGS='-DAFS_PTHREAD_ENV -pthread -D_REENTRANT ${XCFLAGS}'
                MT_LIBS="-lpthread"
                PAM_OPTMZ=-O2
@@ -344,7 +320,6 @@ case $AFS_SYSNAME in
 
        ppc64_linux24)
                KERN_OPTMZ=-O2
-               LEX="flex -l"
                MT_CFLAGS='-DAFS_PTHREAD_ENV -pthread -D_REENTRANT ${XCFLAGS}'
                MT_LIBS="-lpthread"
                PAM_OPTMZ=-O2
@@ -358,7 +333,6 @@ case $AFS_SYSNAME in
 
        ppc64_linux26)
                KERN_OPTMZ=-O2
-               LEX="flex -l"
                MT_CFLAGS='-DAFS_PTHREAD_ENV -pthread -D_REENTRANT ${XCFLAGS}'
                MT_LIBS="-lpthread"
                PAM_OPTMZ=-O2
@@ -367,13 +341,11 @@ case $AFS_SYSNAME in
                SHLIB_CFLAGS="-fPIC"
                TXLIBS="-lncurses"
                XCFLAGS="-D_LARGEFILE64_SOURCE -fPIC"
-               YACC="bison -y"
                SHLIB_LINKER="${MT_CC} -shared"
                ;;
 
        i386_umlinux22)
                KERN_OPTMZ=-O2
-               LEX="flex -l"
                MT_CFLAGS='-DAFS_PTHREAD_ENV -pthread -D_REENTRANT ${XCFLAGS}'
                MT_LIBS="-lpthread"
                PAM_OPTMZ=-O2
@@ -382,13 +354,11 @@ case $AFS_SYSNAME in
                SHLIB_LDFLAGS="-shared -Xlinker -x"
                TXLIBS="-lncurses"
                XCFLAGS="-D_LARGEFILE64_SOURCE"
-               YACC="bison -y"
                SHLIB_LINKER="${MT_CC} -shared"
                ;;
 
        i386_linux*)
                KERN_OPTMZ=-O2
-               LEX="flex -l"
                MT_CFLAGS='-DAFS_PTHREAD_ENV -pthread -D_REENTRANT ${XCFLAGS}'
                MT_LIBS="-lpthread"
                DBG=-g
@@ -406,7 +376,6 @@ case $AFS_SYSNAME in
 
        i386_umlinux24)
                KERN_OPTMZ=-O2
-               LEX="flex -l"
                MT_CFLAGS='-DAFS_PTHREAD_ENV -pthread -D_REENTRANT ${XCFLAGS}'
                MT_LIBS="-lpthread"
                DBG=-g
@@ -425,7 +394,6 @@ case $AFS_SYSNAME in
 
        i386_umlinux26)
                KERN_OPTMZ=-O2
-               LEX="flex -l"
                MT_CFLAGS='-DAFS_PTHREAD_ENV -pthread -D_REENTRANT ${XCFLAGS}'
                MT_LIBS="-lpthread"
                DBG=-g
@@ -443,9 +411,6 @@ case $AFS_SYSNAME in
                ;;
 
        *_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_OPTMZ=-O2
@@ -455,12 +420,10 @@ case $AFS_SYSNAME in
                SHLIB_LINKER="${MT_CC} -shared"
                TXLIBS="/usr/lib/libcurses.a"
                XCFLAGS=
-               YACC="yacc"
                ;;
 
        parisc_linux24)
                KERN_OPTMZ=-O2
-               LEX="flex -l"
                MT_CFLAGS='-DAFS_PTHREAD_ENV -pthread -D_REENTRANT ${XCFLAGS}'
                MT_LIBS="-lpthread"
                PAM_OPTMZ=-O2
@@ -469,68 +432,14 @@ case $AFS_SYSNAME in
                SHLIB_LDFLAGS="-shared -Xlinker -x"
                TXLIBS="-lncurses"
                XCFLAGS="-D_LARGEFILE64_SOURCE"
-               YACC="bison -y"
                SHLIB_LINKER="${MT_CC} -shared"
                ;;
 
-       ppc_darwin_12)
-               CC="cc"
-               CCOBJ="cc"
-               MT_CC="cc"
-               AFSD_LDFLAGS="-F/System/Library/PrivateFrameworks -framework DiskArbitration"
-               LEX="lex -l"
-               REGEX_OBJ="regex.o"
-               XCFLAGS="-traditional-cpp"
-               SHLIB_LINKER="${MT_CC} -dynamiclib"
-               SHLIB_SUFFIX="dylib"
-               ;;
-
-       ppc_darwin_13)
-               CC="cc"
-               CCOBJ="cc"
-               MT_CC="cc"
-               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)
-               CC="cc"
-               CCOBJ="cc"
-               MT_CC="cc"
-               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_60)
-               CC="cc"
-               CCOBJ="cc"
-               MT_CC="cc"
-               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)
                CC="cc"
                CCOBJ="cc"
                MT_CC="cc"
                AFSD_LDFLAGS="-F/System/Library/PrivateFrameworks -framework DiskArbitration -framework SystemConfiguration -framework IOKit -framework CoreFoundation"
-               LEX="lex -l"
                MT_CFLAGS='-DAFS_PTHREAD_ENV -D_REENTRANT ${XCFLAGS}'
                KROOT=
                KINCLUDES='-I$(KROOT)/System/Library/Frameworks/Kernel.framework/Headers'
@@ -549,7 +458,6 @@ case $AFS_SYSNAME in
                CCOBJ="cc"
                MT_CC="cc"
                AFSD_LDFLAGS="-F/System/Library/PrivateFrameworks -framework DiskArbitration -framework SystemConfiguration -framework IOKit -framework CoreFoundation"
-               LEX="lex -l"
                MT_CFLAGS='-DAFS_PTHREAD_ENV -D_REENTRANT ${XCFLAGS} ${ARCHFLAGS}'
                KROOT=
                KINCLUDES='-I$(KROOT)/System/Library/Frameworks/Kernel.framework/Headers'
@@ -567,7 +475,6 @@ case $AFS_SYSNAME in
 
        *_darwin_90)
                AFSD_LDFLAGS="-F/System/Library/PrivateFrameworks -framework DiskArbitration -framework SystemConfiguration -framework IOKit -framework CoreFoundation"
-               LEX="lex -l"
                MT_CFLAGS='-DAFS_PTHREAD_ENV -D_REENTRANT ${XCFLAGS} ${ARCHFLAGS}'
                KROOT=
                KINCLUDES='-I$(KROOT)/System/Library/Frameworks/Kernel.framework/Headers'
@@ -586,7 +493,6 @@ case $AFS_SYSNAME in
 
        *_darwin_100)
                AFSD_LDFLAGS="-F/System/Library/PrivateFrameworks -framework DiskArbitration -framework SystemConfiguration -framework IOKit -framework CoreFoundation"
-               LEX="lex -l"
                MT_CFLAGS='-DAFS_PTHREAD_ENV -D_REENTRANT ${XCFLAGS} ${ARCHFLAGS}'
                MT_LIBS="${LIB_AFSDB} -framework CoreFoundation"
                KROOT=
@@ -607,7 +513,6 @@ case $AFS_SYSNAME in
 
        ppc_linux*)
                KERN_OPTMZ=-O2
-               LEX="flex -l"
                MT_CFLAGS='-DAFS_PTHREAD_ENV -pthread -D_REENTRANT ${XCFLAGS}'
                MT_LIBS="-lpthread"
                PAM_OPTMZ=-O2
@@ -616,7 +521,6 @@ case $AFS_SYSNAME in
                SHLIB_LDFLAGS="-shared -Xlinker -x"
                TXLIBS="-lncurses"
                XCFLAGS="-D_LARGEFILE64_SOURCE"
-               YACC="bison -y"
                SHLIB_LINKER="${MT_CC} -shared"
                ;;
 
@@ -624,7 +528,6 @@ case $AFS_SYSNAME in
                CC="cc"
                CCOBJ="cc"
                DBG=""
-               LEX="lex"
                LIBSYS_AIX_EXP="afsl.exp"
                MT_CC="xlc_r"
                MT_CFLAGS='-DAFS_PTHREAD_ENV ${XCFLAGS}'
@@ -643,7 +546,6 @@ case $AFS_SYSNAME in
                CC="cc"
                CCOBJ="cc"
                DBG=""
-               LEX="lex"
                LIBSYS_AIX_EXP="afsl.exp"
                MT_CC="xlc_r"
                MT_CFLAGS='-DAFS_PTHREAD_ENV ${XCFLAGS}'
@@ -661,7 +563,6 @@ case $AFS_SYSNAME in
                CC="cc"
                CCOBJ="cc"
                DBG=""
-               LEX="lex"
                LIBSYS_AIX_EXP="afsl.exp"
                MT_CC="xlc_r"
                MT_CFLAGS='-DAFS_PTHREAD_ENV ${XCFLAGS}'
@@ -679,7 +580,6 @@ case $AFS_SYSNAME in
                CC="cc"
                CCOBJ="cc"
                DBG="-g"
-               LEX="lex"
                LIBSYS_AIX_EXP="afsl.exp"
                MT_CC="xlc_r"
                MT_CFLAGS='-DAFS_PTHREAD_ENV ${XCFLAGS}'
@@ -697,7 +597,6 @@ case $AFS_SYSNAME in
                CC="cc"
                CCOBJ="cc"
                DBG="-g"
-               LEX="lex"
                LIBSYS_AIX_EXP="afsl.exp"
                MT_CC="xlc_r"
                MT_CFLAGS='-DAFS_PTHREAD_ENV ${XCFLAGS}'
@@ -714,7 +613,6 @@ case $AFS_SYSNAME in
        s390_linux22)
                LD="ld"
                KERN_OPTMZ=-O2
-               LEX="flex -l"
                MT_CC="$CC"
                MT_CFLAGS='-DAFS_PTHREAD_ENV -pthread -D_REENTRANT ${XCFLAGS}'
                MT_LIBS="-lpthread"
@@ -725,14 +623,12 @@ case $AFS_SYSNAME in
                TXLIBS="-lncurses"
                OPTMZ=-O
                XCFLAGS="-D_LARGEFILE64_SOURCE"
-               YACC="bison -y"
                SHLIB_LINKER="${MT_CC} -shared"
                ;;
 
        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"
@@ -742,7 +638,6 @@ case $AFS_SYSNAME in
                SHLIB_LDFLAGS="-shared -Xlinker -x"
                TXLIBS="-lncurses"
                XCFLAGS="-D_LARGEFILE64_SOURCE"
-               YACC="bison -y"
                SHLIB_LINKER="${MT_CC} -shared"
                ;;
 
@@ -750,7 +645,6 @@ case $AFS_SYSNAME in
                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"
@@ -761,7 +655,6 @@ case $AFS_SYSNAME in
                TXLIBS="-lncurses"
                OPTMZ=-O
                XCFLAGS="-D_LARGEFILE64_SOURCE -D__s390x__"
-               YACC="bison -y"
                SHLIB_LINKER="${MT_CC} -shared"
                ;;
 
@@ -771,7 +664,6 @@ case $AFS_SYSNAME in
                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"
@@ -788,7 +680,6 @@ case $AFS_SYSNAME in
                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"
@@ -805,12 +696,11 @@ case $AFS_SYSNAME in
                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"
                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"
@@ -822,13 +712,12 @@ 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"
                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"
@@ -836,7 +725,6 @@ case $AFS_SYSNAME in
 
        sparc*_linux*)
                KERN_OPTMZ=-O2
-               LEX="flex -l"
                MT_CFLAGS='-DAFS_PTHREAD_ENV -pthread -D_REENTRANT ${XCFLAGS}'
                MT_LIBS="-lpthread"
                PAM_OPTMZ=-O2
@@ -847,7 +735,6 @@ case $AFS_SYSNAME in
                XCFLAGS="-D_LARGEFILE64_SOURCE"
                XCFLAGS64="-D_LARGEFILE64_SOURCE -m64"
                XLDFLAGS64="-m64"
-               YACC="bison -y"
                SHLIB_LINKER="${MT_CC} -shared"
                ;;
 
@@ -855,7 +742,6 @@ case $AFS_SYSNAME in
                CCXPG2="/usr/xpg2bin/cc"
                CC="gcc"
                CCOBJ="gcc"
-               LEX="lex"
                SHLIB_CFLAGS="-PIC"
                TXLIBS="-lcurses -ltermcap"
                XCFLAGS=""
@@ -868,7 +754,6 @@ case $AFS_SYSNAME in
        sun4x_55)
                CC=$SOLARISCC
                CCOBJ=$SOLARISCC
-               LEX="lex"
                MT_CC=$SOLARISCC
                MT_CFLAGS='-mt -DAFS_PTHREAD_ENV ${XCFLAGS}'
                MT_LIBS="-lpthread -lsocket"
@@ -886,7 +771,6 @@ case $AFS_SYSNAME in
        sun4x_56)
                CC=$SOLARISCC
                CCOBJ=$SOLARISCC
-               LEX="lex"
                MT_CC=$SOLARISCC
                MT_CFLAGS='-mt -DAFS_PTHREAD_ENV ${XCFLAGS}'
                MT_LIBS="-lpthread -lsocket"
@@ -907,7 +791,6 @@ case $AFS_SYSNAME in
        sun4x_57)
                CC=$SOLARISCC
                CCOBJ=$SOLARISCC
-               LEX="lex"
                LD="/usr/ccs/bin/ld"
                MT_CC=$SOLARISCC
                MT_CFLAGS='-mt -DAFS_PTHREAD_ENV ${XCFLAGS}'
@@ -929,7 +812,6 @@ case $AFS_SYSNAME in
        sun4x_58)
                CC=$SOLARISCC
                CCOBJ=$SOLARISCC
-               LEX="lex"
                LD="/usr/ccs/bin/ld"
                MT_CC=$SOLARISCC
                MT_CFLAGS='-mt -DAFS_PTHREAD_ENV ${XCFLAGS}'
@@ -951,7 +833,6 @@ case $AFS_SYSNAME in
        sun4x_59)
                CC=$SOLARISCC
                CCOBJ=$SOLARISCC
-               LEX="lex"
                LD="/usr/ccs/bin/ld"
                MT_CC=$SOLARISCC
                MT_CFLAGS='-mt -DAFS_PTHREAD_ENV ${XCFLAGS}'
@@ -973,7 +854,6 @@ case $AFS_SYSNAME in
        sun4x_510)
                CC=$SOLARISCC
                CCOBJ=$SOLARISCC
-               LEX="lex"
                LD="/usr/ccs/bin/ld"
                MT_CC=$SOLARISCC
                MT_CFLAGS='-mt -DAFS_PTHREAD_ENV ${XCFLAGS}'
@@ -995,7 +875,6 @@ case $AFS_SYSNAME in
        sun4x_511)
                CC=$SOLARISCC
                CCOBJ=$SOLARISCC
-               LEX="lex"
                LD="/usr/ccs/bin/ld"
                MT_CC=$SOLARISCC
                MT_CFLAGS='-mt -DAFS_PTHREAD_ENV ${XCFLAGS}'
@@ -1017,7 +896,6 @@ case $AFS_SYSNAME in
        sunx86_57)
                CC=$SOLARISCC
                CCOBJ=$SOLARISCC
-               LEX="lex"
                LD="/usr/ccs/bin/ld"
                MT_CC=$SOLARISCC
                MT_CFLAGS='-mt -DAFS_PTHREAD_ENV ${XCFLAGS}'
@@ -1038,7 +916,6 @@ case $AFS_SYSNAME in
        sunx86_58)
                CC=$SOLARISCC
                CCOBJ=$SOLARISCC
-               LEX="lex"
                LD="/usr/ccs/bin/ld"
                MT_CC=$SOLARISCC
                MT_CFLAGS='-mt -DAFS_PTHREAD_ENV ${XCFLAGS}'
@@ -1059,7 +936,6 @@ case $AFS_SYSNAME in
        sunx86_59)
                CC=$SOLARISCC
                CCOBJ=$SOLARISCC
-               LEX="lex"
                LD="/usr/ccs/bin/ld"
                MT_CC=$SOLARISCC
                MT_CFLAGS='-mt -DAFS_PTHREAD_ENV ${XCFLAGS}'
@@ -1080,7 +956,6 @@ case $AFS_SYSNAME in
        sunx86_510)
                CC=$SOLARISCC
                CCOBJ=$SOLARISCC
-               LEX="lex"
                LD="/usr/ccs/bin/ld"
                MT_CC=$SOLARISCC
                MT_CFLAGS='-mt -DAFS_PTHREAD_ENV ${XCFLAGS}'
@@ -1101,7 +976,6 @@ case $AFS_SYSNAME in
        sunx86_511)
                CC=$SOLARISCC
                CCOBJ=$SOLARISCC
-               LEX="lex"
                LD="/usr/ccs/bin/ld"
                MT_CC=$SOLARISCC
                MT_CFLAGS='-mt -DAFS_PTHREAD_ENV ${XCFLAGS}'
@@ -1136,18 +1010,6 @@ 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=
@@ -1185,6 +1047,9 @@ else
 fi
 
 CFLAGS_NOERROR=
+CFLAGS_NOSTRICT=
+CFLAGS_NOUNUSED=
+CFLAGS_NOOLDSTYLE=
 
 if test "x$GCC" = "xyes"; then
   if test "x$enable_warnings" = "xyes"; then
@@ -1194,15 +1059,28 @@ if test "x$GCC" = "xyes"; 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
-fi
-
-if test "x$GCC" = "xyes"; then
-  CFLAGS_NOUNUSED="-Wno-unused"
 else
-  CFLAGS_NOUNUSED=
+  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.
@@ -1255,7 +1133,9 @@ 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)