git://git.openafs.org / openafs.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw
Utilize --enable-warnings for SUNWspro
[openafs.git] / src / cf / osconf.m4
diff --git a/src/cf/osconf.m4 b/src/cf/osconf.m4
index 1b45bd8..7a6ea2e 100644 (file)
--- a/src/cf/osconf.m4
+++ b/src/cf/osconf.m4
@@ -2,14 +2,12 @@
 AC_DEFUN([OPENAFS_OSCONF], [
 
 dnl defaults, override in case below as needed
-CFLAGS=
 XCFLAGS='${DBG} ${OPTMZ}'
 RXDEBUG="-DRXDEBUG"
 SHLIB_SUFFIX="so"
-CC="cc"
-CCOBJ="cc"
-MT_CC="cc"
-XLIBS="${LIB_AFSDB} ${XBSA_XLIBS}"
+CCOBJ="$CC"
+MT_CC="$CC"
+XLIBS="${LIB_AFSDB} ${XBSA_XLIBS} ${LIB_libintl}"
 
 dnl debugging and optimization flag defaults
 dnl Note, these are all the defaults for if debug/optimize turned on, and
@@ -39,7 +37,9 @@ 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}'
@@ -50,6 +50,9 @@ case $AFS_SYSNAME in
                ;;
 
        alpha_dux50)
+               CC="cc"
+               CCOBJ="cc"
+               MT_CC="cc"
                LEX="flex -l"
                DBG="-g3"
                CSTATIC="-non_shared"
@@ -61,7 +64,9 @@ case $AFS_SYSNAME in
                ;;
 
        alpha_dux51)
-               LEX="flex -l"
+               CC="cc"
+               CCOBJ="cc"
+               MT_CC="cc"
                DBG="-g3"
                CSTATIC="-non_shared"
                LWP_OPTMZ="-O2"
@@ -74,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
@@ -83,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
@@ -99,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
@@ -115,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
@@ -131,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
@@ -147,13 +143,13 @@ case $AFS_SYSNAME in
                SHLIB_LDFLAGS="-shared -Xlinker -x"
                TXLIBS="-lncurses"
                XCFLAGS="-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"
@@ -241,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
@@ -250,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
@@ -263,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"
@@ -275,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
@@ -301,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
@@ -321,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
@@ -335,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
@@ -349,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
@@ -358,16 +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)
-               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_OPTMZ=-O2
@@ -376,16 +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*)
-               CC="gcc -pipe"
-               CCOBJ="gcc -pipe"
-               MT_CC="gcc -pipe"
                KERN_OPTMZ=-O2
-               LEX="flex -l"
                MT_CFLAGS='-DAFS_PTHREAD_ENV -pthread -D_REENTRANT ${XCFLAGS}'
                MT_LIBS="-lpthread"
                DBG=-g
@@ -402,11 +375,7 @@ case $AFS_SYSNAME in
                ;;
 
        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"
                DBG=-g
@@ -424,11 +393,7 @@ case $AFS_SYSNAME in
                ;;
 
        i386_umlinux26)
-               CC="gcc -pipe"
-               CCOBJ="gcc -pipe"
-               MT_CC="gcc -pipe"
                KERN_OPTMZ=-O2
-               LEX="flex -l"
                MT_CFLAGS='-DAFS_PTHREAD_ENV -pthread -D_REENTRANT ${XCFLAGS}'
                MT_LIBS="-lpthread"
                DBG=-g
@@ -446,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
@@ -458,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
@@ -472,71 +432,53 @@ 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)
-               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)
-               AFSD_LDFLAGS="-F/System/Library/PrivateFrameworks -framework DiskArbitration"
-               LEX="lex -l"
-               LWP_OPTMZ="-O2"
-               REGEX_OBJ="regex.o"
-               XCFLAGS="-no-cpp-precomp"
-               SHLIB_LINKER="${MT_CC} -dynamiclib"
-               SHLIB_SUFFIX="dylib"
-               ;;
-
-       ppc_darwin_14)
-               AFSD_LDFLAGS="-F/System/Library/PrivateFrameworks -framework DiskArbitration"
-               LEX="lex -l"
-               LWP_OPTMZ="-O2"
-               REGEX_OBJ="regex.o"
-               XCFLAGS="-no-cpp-precomp"
-               SHLIB_LINKER="${MT_CC} -dynamiclib"
-               SHLIB_SUFFIX="dylib"
-               ;;
-
-       ppc_darwin_60)
-               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='-DAFS_PTHREAD_ENV -D_REENTRANT ${XCFLAGS}'
+               KROOT=
+               KINCLUDES='-I$(KROOT)/System/Library/Frameworks/Kernel.framework/Headers'
                LWP_OPTMZ="-O2"
                REGEX_OBJ="regex.o"
                XCFLAGS="-no-cpp-precomp"
                TXLIBS="-lncurses"
+               EXTRA_VLIBOBJS="fstab.o"
                SHLIB_LINKER="${MT_CC} -dynamiclib"
                SHLIB_SUFFIX="dylib"
+               XLIBS="${LIB_AFSDB} ${XBSA_XLIBS} -framework CoreFoundation"
                ;;
 
-       ppc_darwin_70)
+       *_darwin_80)
+               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}'
+               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"
-               XCFLAGS="-no-cpp-precomp"
                TXLIBS="-lncurses"
                EXTRA_VLIBOBJS="fstab.o"
                SHLIB_LINKER="${MT_CC} -dynamiclib"
                SHLIB_SUFFIX="dylib"
+               RANLIB="ranlib -c"
+               XLIBS="${LIB_AFSDB} ${XBSA_XLIBS} -framework CoreFoundation"
                ;;
 
-       *_darwin_80)
+       *_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'
+               LD="cc"
                KERN_OPTMZ="-Os"
                LWP_OPTMZ="-Os"
                OPTMZ="-Os"
@@ -546,29 +488,31 @@ case $AFS_SYSNAME in
                SHLIB_LINKER="${MT_CC} -dynamiclib"
                SHLIB_SUFFIX="dylib"
                RANLIB="ranlib -c"
+               XLIBS="${LIB_AFSDB} ${XBSA_XLIBS} -framework CoreFoundation"
                ;;
 
-       *_darwin_90)
+       *_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=
                KINCLUDES='-I$(KROOT)/System/Library/Frameworks/Kernel.framework/Headers'
                LD="cc"
                KERN_OPTMZ="-Os"
                LWP_OPTMZ="-Os"
                OPTMZ="-Os"
+               PAM_LIBS="-lpam"
                REGEX_OBJ="regex.o"
                TXLIBS="-lncurses"
                EXTRA_VLIBOBJS="fstab.o"
                SHLIB_LINKER="${MT_CC} -dynamiclib"
                SHLIB_SUFFIX="dylib"
-               RANLIB="ranlib -c"
+               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_OPTMZ=-O2
@@ -577,13 +521,13 @@ case $AFS_SYSNAME in
                SHLIB_LDFLAGS="-shared -Xlinker -x"
                TXLIBS="-lncurses"
                XCFLAGS="-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}'
@@ -591,7 +535,7 @@ case $AFS_SYSNAME in
                SHLIB_SUFFIX="o"
                TXLIBS="-lcurses"
                XCFLAGS="-K -D_NONSTD_TYPES -D_MBI=void"
-               XLIBS="${LIB_AFSDB} -ldl"
+               XLIBS="${LIB_AFSDB} ${LIB_libintl} -ldl"
                SHLIB_LINKER="${MT_CC} -bM:SRE -berok"
                AIX32=""
                AIX64="#"
@@ -599,8 +543,9 @@ case $AFS_SYSNAME in
 
 
        rs_aix51)
+               CC="cc"
+               CCOBJ="cc"
                DBG=""
-               LEX="lex"
                LIBSYS_AIX_EXP="afsl.exp"
                MT_CC="xlc_r"
                MT_CFLAGS='-DAFS_PTHREAD_ENV ${XCFLAGS}'
@@ -608,15 +553,16 @@ case $AFS_SYSNAME in
                SHLIB_SUFFIX="o"
                TXLIBS="-lcurses"
                XCFLAGS="-K -D_NONSTD_TYPES -D_MBI=void"
-               XLIBS="${LIB_AFSDB} -ldl"
+               XLIBS="${LIB_AFSDB} ${LIB_libintl} -ldl"
                SHLIB_LINKER="${MT_CC} -bM:SRE -berok"
                AIX32=""
                AIX64=""
                ;;
 
        rs_aix52)       
+               CC="cc"
+               CCOBJ="cc"
                DBG=""
-               LEX="lex"
                LIBSYS_AIX_EXP="afsl.exp"
                MT_CC="xlc_r"
                MT_CFLAGS='-DAFS_PTHREAD_ENV ${XCFLAGS}'
@@ -624,15 +570,16 @@ case $AFS_SYSNAME in
                SHLIB_SUFFIX="o"
                TXLIBS="-lcurses"
                XCFLAGS="-K -D_NONSTD_TYPES -D_MBI=void"
-               XLIBS="${LIB_AFSDB} -ldl"
+               XLIBS="${LIB_AFSDB} ${LIB_libintl} -ldl"
                SHLIB_LINKER="${MT_CC} -bM:SRE -berok"
                AIX32=""
                AIX64=""
                ;;
 
        rs_aix53)       
+               CC="cc"
+               CCOBJ="cc"
                DBG="-g"
-               LEX="lex"
                LIBSYS_AIX_EXP="afsl.exp"
                MT_CC="xlc_r"
                MT_CFLAGS='-DAFS_PTHREAD_ENV ${XCFLAGS}'
@@ -640,15 +587,16 @@ case $AFS_SYSNAME in
                SHLIB_SUFFIX="o"
                TXLIBS="-lcurses"
                XCFLAGS="-K -D_NONSTD_TYPES -D_MBI=void"
-               XLIBS="${LIB_AFSDB} -ldl"
+               XLIBS="${LIB_AFSDB} ${LIB_libintl} -ldl"
                SHLIB_LINKER="${MT_CC} -bM:SRE -berok"
                AIX32=""
                AIX64=""
                ;;
 
        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}'
@@ -656,18 +604,15 @@ case $AFS_SYSNAME in
                SHLIB_SUFFIX="o"
                TXLIBS="-lcurses"
                XCFLAGS="-K -D_NONSTD_TYPES -D_MBI=void"
-               XLIBS="${LIB_AFSDB} -ldl"
+               XLIBS="${LIB_AFSDB} ${LIB_libintl} -ldl"
                SHLIB_LINKER="${MT_CC} -bM:SRE -berok"
                AIX32="#"
                AIX64=""
                ;;
 
        s390_linux22)
-               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"
@@ -678,16 +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)
-               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"
@@ -697,16 +638,13 @@ case $AFS_SYSNAME in
                SHLIB_LDFLAGS="-shared -Xlinker -x"
                TXLIBS="-lncurses"
                XCFLAGS="-D_LARGEFILE64_SOURCE"
-               YACC="bison -y"
                SHLIB_LINKER="${MT_CC} -shared"
                ;;
 
        s390x_linux24|s390x_linux26)
-               CC="gcc"
-               CCOBJ="gcc -fPIC"
+               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"
@@ -717,14 +655,15 @@ case $AFS_SYSNAME in
                TXLIBS="-lncurses"
                OPTMZ=-O
                XCFLAGS="-D_LARGEFILE64_SOURCE -D__s390x__"
-               YACC="bison -y"
                SHLIB_LINKER="${MT_CC} -shared"
                ;;
 
        sgi_62)
+               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"
@@ -736,9 +675,11 @@ case $AFS_SYSNAME in
                ;;
 
        sgi_63)
+               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"
@@ -750,14 +691,16 @@ 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"
                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"
@@ -769,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"
@@ -783,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
@@ -794,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"
                ;;
 
@@ -802,7 +742,6 @@ case $AFS_SYSNAME in
                CCXPG2="/usr/xpg2bin/cc"
                CC="gcc"
                CCOBJ="gcc"
-               LEX="lex"
                SHLIB_CFLAGS="-PIC"
                TXLIBS="-lcurses -ltermcap"
                XCFLAGS=""
@@ -813,10 +752,9 @@ case $AFS_SYSNAME in
                ;;
 
        sun4x_55)
-               CC="/opt/SUNWspro/bin/cc"
-               CCOBJ="/opt/SUNWspro/bin/cc"
-               LEX="lex"
-               MT_CC="/opt/SUNWspro/bin/cc"
+               CC=$SOLARISCC
+               CCOBJ=$SOLARISCC
+               MT_CC=$SOLARISCC
                MT_CFLAGS='-mt -DAFS_PTHREAD_ENV ${XCFLAGS}'
                MT_LIBS="-lpthread -lsocket"
                SHLIB_CFLAGS="-KPIC"
@@ -831,10 +769,9 @@ case $AFS_SYSNAME in
                ;;
 
        sun4x_56)
-               CC="/opt/SUNWspro/bin/cc"
-               CCOBJ="/opt/SUNWspro/bin/cc"
-               LEX="lex"
-               MT_CC="/opt/SUNWspro/bin/cc"
+               CC=$SOLARISCC
+               CCOBJ=$SOLARISCC
+               MT_CC=$SOLARISCC
                MT_CFLAGS='-mt -DAFS_PTHREAD_ENV ${XCFLAGS}'
                MT_LIBS="-lpthread -lsocket"
                PAM_CFLAGS="-KPIC"
@@ -852,11 +789,10 @@ case $AFS_SYSNAME in
                ;;
 
        sun4x_57)
-               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_CC=$SOLARISCC
                MT_CFLAGS='-mt -DAFS_PTHREAD_ENV ${XCFLAGS}'
                MT_LIBS="-lpthread -lsocket"
                PAM_CFLAGS="-KPIC"
@@ -874,11 +810,10 @@ case $AFS_SYSNAME in
                ;;
 
        sun4x_58)
-               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_CC=$SOLARISCC
                MT_CFLAGS='-mt -DAFS_PTHREAD_ENV ${XCFLAGS}'
                MT_LIBS="-lpthread -lsocket"
                PAM_CFLAGS="-KPIC"
@@ -896,11 +831,10 @@ case $AFS_SYSNAME in
                ;;
 
        sun4x_59)
-               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_CC=$SOLARISCC
                MT_CFLAGS='-mt -DAFS_PTHREAD_ENV ${XCFLAGS}'
                MT_LIBS="-lpthread -lsocket"
                PAM_CFLAGS="-KPIC"
@@ -918,11 +852,10 @@ case $AFS_SYSNAME in
                ;;
 
        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_CC=$SOLARISCC
                MT_CFLAGS='-mt -DAFS_PTHREAD_ENV ${XCFLAGS}'
                MT_LIBS="-lpthread -lsocket"
                PAM_CFLAGS="-KPIC"
@@ -940,11 +873,10 @@ case $AFS_SYSNAME in
                ;;
 
        sun4x_511)
-               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_CC=$SOLARISCC
                MT_CFLAGS='-mt -DAFS_PTHREAD_ENV ${XCFLAGS}'
                MT_LIBS="-lpthread -lsocket"
                PAM_CFLAGS="-KPIC"
@@ -962,11 +894,10 @@ case $AFS_SYSNAME in
                ;;
 
        sunx86_57)
-               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_CC=$SOLARISCC
                MT_CFLAGS='-mt -DAFS_PTHREAD_ENV ${XCFLAGS}'
                MT_LIBS="-lpthread -lsocket"
                PAM_CFLAGS="-KPIC"
@@ -983,11 +914,10 @@ case $AFS_SYSNAME in
                ;;
 
        sunx86_58)
-               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_CC=$SOLARISCC
                MT_CFLAGS='-mt -DAFS_PTHREAD_ENV ${XCFLAGS}'
                MT_LIBS="-lpthread -lsocket"
                PAM_CFLAGS="-KPIC"
@@ -1004,11 +934,10 @@ case $AFS_SYSNAME in
                ;;
 
        sunx86_59)
-               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_CC=$SOLARISCC
                MT_CFLAGS='-mt -DAFS_PTHREAD_ENV ${XCFLAGS}'
                MT_LIBS="-lpthread -lsocket"
                PAM_CFLAGS="-KPIC"
@@ -1025,11 +954,10 @@ case $AFS_SYSNAME in
                ;;
 
        sunx86_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_CC=$SOLARISCC
                MT_CFLAGS='-mt -DAFS_PTHREAD_ENV ${XCFLAGS}'
                MT_LIBS="-lpthread -lsocket"
                PAM_CFLAGS="-KPIC"
@@ -1046,11 +974,10 @@ case $AFS_SYSNAME in
                ;;
 
        sunx86_511)
-               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_CC=$SOLARISCC
                MT_CFLAGS='-mt -DAFS_PTHREAD_ENV ${XCFLAGS}'
                MT_LIBS="-lpthread -lsocket"
                PAM_CFLAGS="-KPIC"
@@ -1083,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=
@@ -1131,10 +1046,41 @@ else
   NO_STRIP_BIN=
 fi
 
-if test "x$enable_warnings" = "xyes"; then
-  if test "x$GCC" = "xyes"; then
-    XCFLAGS="${XCFLAGS} -Wall -Wstrict-prototypes -Wold-style-definition"
+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.
@@ -1186,6 +1132,10 @@ 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)
OpenAFS Master Repository