git://git.openafs.org / openafs.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw
OpenBSD: Change code optimization setting
[openafs.git] / src / cf / osconf.m4
diff --git a/src/cf/osconf.m4 b/src/cf/osconf.m4
index 250a76d..be15b14 100644 (file)
--- a/src/cf/osconf.m4
+++ b/src/cf/osconf.m4
@@ -8,6 +8,7 @@ SHLIB_SUFFIX="so"
 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
@@ -44,7 +45,6 @@ case $AFS_SYSNAME in
                DBG="-g3"
                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 \"*\""
                ;;
@@ -58,7 +58,6 @@ case $AFS_SYSNAME in
                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 \"*\""
                ;;
@@ -72,7 +71,6 @@ case $AFS_SYSNAME in
                LWP_OPTMZ="-O2"
                MT_CFLAGS='-D_REENTRANT=1 -pthread -DAFS_PTHREAD_ENV ${XCFLAGS}'
                MT_LIBS="-pthread -lpthread -lmach -lexc -lc"
-               TXLIBS="-lcurses"
                XCFLAGS="-D_NO_PROTO -DOSF"
                SHLIB_LINKER="${CC} -all -shared -expect_unresolved \"*\""
                ;;
@@ -80,12 +78,10 @@ case $AFS_SYSNAME in
        alpha_linux_22)
                KERN_OPTMZ=-O2
                MT_CFLAGS='-DAFS_PTHREAD_ENV -pthread -D_REENTRANT ${XCFLAGS}'
-               MT_LIBS="-lpthread"
                PAM_OPTMZ=-O2
                PAM_CFLAGS="-Dlinux -DLINUX_PAM -fPIC"
                SHLIB_CFLAGS="-fPIC"
                SHLIB_LDFLAGS="-shared -Xlinker -x"
-               TXLIBS="-lncurses"
                XCFLAGS="-D_LARGEFILE64_SOURCE"
                SHLIB_LINKER="${MT_CC} -shared"
                ;;
@@ -94,12 +90,10 @@ case $AFS_SYSNAME in
                CCOBJ="${CC} -fPIC"
                KERN_OPTMZ=-O2
                MT_CFLAGS='-DAFS_PTHREAD_ENV -pthread -D_REENTRANT ${XCFLAGS}'
-               MT_LIBS="-lpthread"
                PAM_OPTMZ=-O2
                PAM_CFLAGS="-Dlinux -DLINUX_PAM -fPIC"
                SHLIB_CFLAGS="-fPIC"
                SHLIB_LDFLAGS="-shared -Xlinker -x"
-               TXLIBS="-lncurses"
                XCFLAGS="-D_LARGEFILE64_SOURCE"
                SHLIB_LINKER="${MT_CC} -shared"
                ;;
@@ -108,12 +102,10 @@ case $AFS_SYSNAME in
                CCOBJ="${CC} -fPIC"
                KERN_OPTMZ=-O2
                MT_CFLAGS='-DAFS_PTHREAD_ENV -pthread -D_REENTRANT ${XCFLAGS}'
-               MT_LIBS="-lpthread"
                PAM_OPTMZ=-O2
                PAM_CFLAGS="-Dlinux -DLINUX_PAM -fPIC"
                SHLIB_CFLAGS="-fPIC"
                SHLIB_LDFLAGS="-shared -Xlinker -x"
-               TXLIBS="-lncurses"
                XCFLAGS="-D_LARGEFILE64_SOURCE"
                SHLIB_LINKER="${MT_CC} -shared"
                ;;
@@ -122,12 +114,10 @@ case $AFS_SYSNAME in
                CCOBJ="${CC} -fPIC"
                KERN_OPTMZ=-O2
                MT_CFLAGS='-DAFS_PTHREAD_ENV -pthread -D_REENTRANT ${XCFLAGS}'
-               MT_LIBS="-lpthread"
                PAM_OPTMZ=-O2
                PAM_CFLAGS="-Dlinux -DLINUX_PAM -fPIC"
                SHLIB_CFLAGS="-fPIC"
                SHLIB_LDFLAGS="-shared -Xlinker -x"
-               TXLIBS="-lncurses"
                XCFLAGS="-D_LARGEFILE64_SOURCE"
                SHLIB_LINKER="${MT_CC} -shared"
                ;;
@@ -136,12 +126,10 @@ case $AFS_SYSNAME in
                CCOBJ="${CC} -fPIC"
                KERN_OPTMZ=-O2
                MT_CFLAGS='-DAFS_PTHREAD_ENV -pthread -D_REENTRANT ${XCFLAGS}'
-               MT_LIBS="-lpthread"
                PAM_OPTMZ=-O2
                PAM_CFLAGS="-Dlinux -DLINUX_PAM -fPIC"
                SHLIB_CFLAGS="-fPIC"
                SHLIB_LDFLAGS="-shared -Xlinker -x"
-               TXLIBS="-lncurses"
                XCFLAGS="-D_LARGEFILE64_SOURCE"
                SHLIB_LINKER="${MT_CC} -shared"
                ;;
@@ -156,7 +144,7 @@ case $AFS_SYSNAME in
                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_LIBS='-L/opt/dce/lib -ldce ${XLIBS}'
                MV="/bin/mv"
                OPTMZ="-O"
                PAM_CFLAGS="+DA1.0 +z -Wl,+k"
@@ -165,7 +153,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"
@@ -185,7 +172,6 @@ case $AFS_SYSNAME in
                LWP_OPTMZ="-O"
                MT_CC="$CC"
                MT_CFLAGS='-D_POSIX_C_SOURCE=199506L -DAFS_PTHREAD_ENV ${XCFLAGS}'
-               MT_LIBS="-lpthread"
                MV="/bin/mv"
                OPTMZ="-O"
                PAM_CFLAGS="+DA1.0 +z -Wl,+k"
@@ -194,13 +180,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"
                YACC="/opt/langtools/bin/yacc"
                SHLIB_LINKER="ld -b"
                ;;
@@ -216,7 +200,6 @@ case $AFS_SYSNAME in
                LWP_OPTMZ=""
                MT_CC="$CC"
                MT_CFLAGS='-D_POSIX_C_SOURCE=199506L -DAFS_PTHREAD_ENV ${XCFLAGS}'
-               MT_LIBS="-lpthread"
                MV="/bin/mv"
                OPTMZ="-O"
                PAM_CFLAGS="-b +z -Wl,+k"
@@ -225,81 +208,68 @@ 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"
                YACC="/opt/langtools/bin/yacc"
                SHLIB_LINKER="ld -b"
                ;;
 
        i386_fbsd_*)
                MT_CFLAGS='-DAFS_PTHREAD_ENV -pthread -D_REENTRANT ${XCFLAGS}'
-               MT_LIBS="-pthread"
                PAM_OPTMZ=-O2
                PAM_CFLAGS="-pipe -fPIC"
                SHLIB_LDFLAGS="-shared -Xlinker -x"
                SHLIB_LINKER="${MT_CC} -shared"
-               TXLIBS="-lncurses"
                XCFLAGS="-pipe"
                ;;
 
        i386_dfbsd_*)
                MT_CFLAGS='-DAFS_PTHREAD_ENV -pthread -D_REENTRANT ${XCFLAGS}'
-               MT_LIBS="-pthread"
                PAM_OPTMZ=-O2
                PAM_CFLAGS="-pipe -fPIC"
                SHLIB_LDFLAGS="-shared -Xlinker -x"
                SHLIB_LINKER="${MT_CC} -shared"
-               TXLIBS="-lncurses"
                XCFLAGS="-pipe"
                ;;
 
        amd64_fbsd_*)
                MT_CFLAGS='-DAFS_PTHREAD_ENV -pthread -D_REENTRANT ${XCFLAGS}'
-               MT_LIBS="-pthread"
                PAM_CFLAGS="-O2 -pipe -fPIC"
                SHLIB_LDFLAGS="-shared -Xlinker -x"
                SHLIB_LINKER="${MT_CC} -shared"
-               TXLIBS="-lncurses"
                XCFLAGS="-O2 -pipe -fPIC"
                ;;
 
        *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="-lcurses"
                XCFLAGS="-pipe"
                ;;
 
        *nbsd15|*nbsd16)
                MT_CFLAGS='${XCFLAGS}'
-               MT_LIBS=""
+               MT_LIBS='${XLIBS}'
                PAM_OPTMZ=-O2
                PAM_CFLAGS="-pipe -fPIC"
                SHLIB_LDFLAGS="-shared -Xlinker -x"
                SHLIB_LINKER="${MT_CC} -shared"
-               TXLIBS="/usr/lib/libcurses.so"
                XCFLAGS="-pipe"
                ;;
 
        ia64_linux24|ia64_linux26)
                KERN_OPTMZ=-O2
                MT_CFLAGS='-DAFS_PTHREAD_ENV -pthread -D_REENTRANT ${XCFLAGS}'
-               MT_LIBS="-lpthread"
                PAM_OPTMZ=-O2
                PAM_CFLAGS="-Dlinux -DLINUX_PAM -fPIC"
                SHLIB_CFLAGS="-fPIC"
                SHLIB_LDFLAGS="-shared -Xlinker -x"
-               TXLIBS="-lncurses"
                XCFLAGS="-D_LARGEFILE64_SOURCE -G0"
                SHLIB_LINKER="${MT_CC} -shared"
                ;;
@@ -308,12 +278,10 @@ case $AFS_SYSNAME in
                CCOBJ="${CC} -fPIC"
                KERN_OPTMZ=-O2
                MT_CFLAGS='-DAFS_PTHREAD_ENV -pthread -D_REENTRANT ${XCFLAGS}'
-               MT_LIBS="-lpthread"
                PAM_OPTMZ=-O2
                PAM_CFLAGS="-Dlinux -DLINUX_PAM -fPIC"
                SHLIB_CFLAGS="-fPIC"
                SHLIB_LDFLAGS="-shared -Xlinker -x"
-               TXLIBS="-lncurses"
                XCFLAGS="-D_LARGEFILE64_SOURCE"
                SHLIB_LINKER="${MT_CC} -shared"
                ;;
@@ -321,12 +289,10 @@ case $AFS_SYSNAME in
        ppc64_linux24)
                KERN_OPTMZ=-O2
                MT_CFLAGS='-DAFS_PTHREAD_ENV -pthread -D_REENTRANT ${XCFLAGS}'
-               MT_LIBS="-lpthread"
                PAM_OPTMZ=-O2
                PAM_CFLAGS="-Dlinux -DLINUX_PAM -fPIC"
                SHLIB_LDFLAGS="-shared -Xlinker -x"
                SHLIB_CFLAGS="-fPIC"
-               TXLIBS="/usr/lib64/libncurses.so"
                XCFLAGS="-D_LARGEFILE64_SOURCE"
                SHLIB_LINKER="${MT_CC} -shared"
                ;;
@@ -334,12 +300,10 @@ case $AFS_SYSNAME in
        ppc64_linux26)
                KERN_OPTMZ=-O2
                MT_CFLAGS='-DAFS_PTHREAD_ENV -pthread -D_REENTRANT ${XCFLAGS}'
-               MT_LIBS="-lpthread"
                PAM_OPTMZ=-O2
                PAM_CFLAGS="-Dlinux -DLINUX_PAM -fPIC"
                SHLIB_LDFLAGS="-shared -Xlinker -x"
                SHLIB_CFLAGS="-fPIC"
-               TXLIBS="-lncurses"
                XCFLAGS="-D_LARGEFILE64_SOURCE -fPIC"
                SHLIB_LINKER="${MT_CC} -shared"
                ;;
@@ -347,12 +311,10 @@ case $AFS_SYSNAME in
        i386_umlinux22)
                KERN_OPTMZ=-O2
                MT_CFLAGS='-DAFS_PTHREAD_ENV -pthread -D_REENTRANT ${XCFLAGS}'
-               MT_LIBS="-lpthread"
                PAM_OPTMZ=-O2
                PAM_CFLAGS="-Dlinux -DLINUX_PAM -fPIC"
                SHLIB_CFLAGS="-fPIC"
                SHLIB_LDFLAGS="-shared -Xlinker -x"
-               TXLIBS="-lncurses"
                XCFLAGS="-D_LARGEFILE64_SOURCE"
                SHLIB_LINKER="${MT_CC} -shared"
                ;;
@@ -360,7 +322,6 @@ case $AFS_SYSNAME in
        i386_linux*)
                KERN_OPTMZ=-O2
                MT_CFLAGS='-DAFS_PTHREAD_ENV -pthread -D_REENTRANT ${XCFLAGS}'
-               MT_LIBS="-lpthread"
                DBG=-g
                KERN_DBG=-g
                LWP_DBG=-g
@@ -369,7 +330,6 @@ case $AFS_SYSNAME in
                PAM_CFLAGS="-Dlinux -DLINUX_PAM -fPIC"
                SHLIB_CFLAGS="-fPIC"
                SHLIB_LDFLAGS="-shared -Xlinker -x"
-               TXLIBS="-lncurses"
                XCFLAGS="-D_LARGEFILE64_SOURCE"
                SHLIB_LINKER="${MT_CC} -shared"
                ;;
@@ -377,7 +337,6 @@ case $AFS_SYSNAME in
        i386_umlinux24)
                KERN_OPTMZ=-O2
                MT_CFLAGS='-DAFS_PTHREAD_ENV -pthread -D_REENTRANT ${XCFLAGS}'
-               MT_LIBS="-lpthread"
                DBG=-g
                KERN_DBG=-g
                LWP_DBG=-g
@@ -387,7 +346,6 @@ case $AFS_SYSNAME in
                PAM_CFLAGS="-Dlinux -DLINUX_PAM -fPIC"
                SHLIB_CFLAGS="-fPIC"
                SHLIB_LDFLAGS="-shared -Xlinker -x"
-               TXLIBS="-lncurses"
                XCFLAGS="-D_LARGEFILE64_SOURCE"
                SHLIB_LINKER="${MT_CC} -shared"
                ;;
@@ -395,7 +353,6 @@ case $AFS_SYSNAME in
        i386_umlinux26)
                KERN_OPTMZ=-O2
                MT_CFLAGS='-DAFS_PTHREAD_ENV -pthread -D_REENTRANT ${XCFLAGS}'
-               MT_LIBS="-lpthread"
                DBG=-g
                KERN_DBG=-g
                LWP_DBG=-g
@@ -405,32 +362,30 @@ case $AFS_SYSNAME in
                PAM_CFLAGS="-Dlinux -DLINUX_PAM -fPIC"
                SHLIB_CFLAGS="-fPIC"
                SHLIB_LDFLAGS="-shared -Xlinker -x"
-               TXLIBS="-lncurses"
                XCFLAGS="-D_LARGEFILE64_SOURCE"
                SHLIB_LINKER="${MT_CC} -shared"
                ;;
 
        *_obsd*)
+               KERN_OPTMZ=-O2
                MT_CFLAGS='-DAFS_PTHREAD_ENV -pthread -D_REENTRANT ${XCFLAGS}'
-               MT_LIBS="-pthread"
+               LWP_OPTMZ=-O2
+               OPTMZ=-O2
                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=
                ;;
 
        parisc_linux24)
                KERN_OPTMZ=-O2
                MT_CFLAGS='-DAFS_PTHREAD_ENV -pthread -D_REENTRANT ${XCFLAGS}'
-               MT_LIBS="-lpthread"
                PAM_OPTMZ=-O2
                PAM_CFLAGS="-Dlinux -DLINUX_PAM -fPIC"
                SHLIB_CFLAGS="-fPIC"
                SHLIB_LDFLAGS="-shared -Xlinker -x"
-               TXLIBS="-lncurses"
                XCFLAGS="-D_LARGEFILE64_SOURCE"
                SHLIB_LINKER="${MT_CC} -shared"
                ;;
@@ -446,9 +401,8 @@ case $AFS_SYSNAME in
                LWP_OPTMZ="-O2"
                REGEX_OBJ="regex.o"
                XCFLAGS="-no-cpp-precomp"
-               TXLIBS="-lncurses"
                EXTRA_VLIBOBJS="fstab.o"
-               SHLIB_LINKER="${MT_CC} -dynamiclib"
+               SHLIB_LINKER="${MT_CC} \${ARCHFLAGS} -dynamiclib"
                SHLIB_SUFFIX="dylib"
                XLIBS="${LIB_AFSDB} ${XBSA_XLIBS} -framework CoreFoundation"
                ;;
@@ -458,16 +412,15 @@ case $AFS_SYSNAME in
                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} ${ARCHFLAGS}'
+               MT_CFLAGS="-DAFS_PTHREAD_ENV -D_REENTRANT ${XCFLAGS} \${ARCHFLAGS}"
                KROOT=
                KINCLUDES='-I$(KROOT)/System/Library/Frameworks/Kernel.framework/Headers'
                KERN_OPTMZ="-Os"
                LWP_OPTMZ="-Os"
                OPTMZ="-Os"
                REGEX_OBJ="regex.o"
-               TXLIBS="-lncurses"
                EXTRA_VLIBOBJS="fstab.o"
-               SHLIB_LINKER="${MT_CC} -dynamiclib"
+               SHLIB_LINKER="${MT_CC} \${ARCHFLAGS} -dynamiclib"
                SHLIB_SUFFIX="dylib"
                RANLIB="ranlib -c"
                XLIBS="${LIB_AFSDB} ${XBSA_XLIBS} -framework CoreFoundation"
@@ -475,7 +428,7 @@ case $AFS_SYSNAME in
 
        *_darwin_90)
                AFSD_LDFLAGS="-F/System/Library/PrivateFrameworks -framework DiskArbitration -framework SystemConfiguration -framework IOKit -framework CoreFoundation"
-               MT_CFLAGS='-DAFS_PTHREAD_ENV -D_REENTRANT ${XCFLAGS} ${ARCHFLAGS}'
+               MT_CFLAGS="-DAFS_PTHREAD_ENV -D_REENTRANT ${XCFLAGS} \${ARCHFLAGS}"
                KROOT=
                KINCLUDES='-I$(KROOT)/System/Library/Frameworks/Kernel.framework/Headers'
                LD="cc"
@@ -483,9 +436,8 @@ case $AFS_SYSNAME in
                LWP_OPTMZ="-Os"
                OPTMZ="-Os"
                REGEX_OBJ="regex.o"
-               TXLIBS="-lncurses"
                EXTRA_VLIBOBJS="fstab.o"
-               SHLIB_LINKER="${MT_CC} -dynamiclib"
+               SHLIB_LINKER="${MT_CC} \${ARCHFLAGS} -dynamiclib"
                SHLIB_SUFFIX="dylib"
                RANLIB="ranlib -c"
                XLIBS="${LIB_AFSDB} ${XBSA_XLIBS} -framework CoreFoundation"
@@ -493,8 +445,8 @@ case $AFS_SYSNAME in
 
        *_darwin_100)
                AFSD_LDFLAGS="-F/System/Library/PrivateFrameworks -framework DiskArbitration -framework SystemConfiguration -framework IOKit -framework CoreFoundation"
-               MT_CFLAGS='-DAFS_PTHREAD_ENV -D_REENTRANT ${XCFLAGS} ${ARCHFLAGS}'
-               MT_LIBS="${LIB_AFSDB} -framework CoreFoundation"
+               MT_CFLAGS="-DAFS_PTHREAD_ENV -D_REENTRANT ${XCFLAGS} \${ARCHFLAGS}"
+               MT_LIBS='${XLIBS}'
                KROOT=
                KINCLUDES='-I$(KROOT)/System/Library/Frameworks/Kernel.framework/Headers'
                LD="cc"
@@ -503,9 +455,8 @@ case $AFS_SYSNAME in
                OPTMZ="-Os"
                PAM_LIBS="-lpam"
                REGEX_OBJ="regex.o"
-               TXLIBS="-lncurses"
                EXTRA_VLIBOBJS="fstab.o"
-               SHLIB_LINKER="${MT_CC} -dynamiclib"
+               SHLIB_LINKER="${MT_CC} \${ARCHFLAGS} -dynamiclib"
                SHLIB_SUFFIX="dylib"
                RANLIB="ranlib"
                XLIBS="${LIB_AFSDB} ${XBSA_XLIBS} -framework CoreFoundation"
@@ -514,12 +465,10 @@ case $AFS_SYSNAME in
        ppc_linux*)
                KERN_OPTMZ=-O2
                MT_CFLAGS='-DAFS_PTHREAD_ENV -pthread -D_REENTRANT ${XCFLAGS}'
-               MT_LIBS="-lpthread"
                PAM_OPTMZ=-O2
                PAM_CFLAGS="-Dlinux -DLINUX_PAM -fPIC"
                SHLIB_CFLAGS="-fPIC"
                SHLIB_LDFLAGS="-shared -Xlinker -x"
-               TXLIBS="-lncurses"
                XCFLAGS="-D_LARGEFILE64_SOURCE"
                SHLIB_LINKER="${MT_CC} -shared"
                ;;
@@ -531,14 +480,12 @@ case $AFS_SYSNAME in
                LIBSYS_AIX_EXP="afsl.exp"
                MT_CC="xlc_r"
                MT_CFLAGS='-DAFS_PTHREAD_ENV ${XCFLAGS}'
-               MT_LIBS="-lpthreads"
                SHLIB_SUFFIX="o"
-               TXLIBS="-lcurses"
                XCFLAGS="-K -D_NONSTD_TYPES -D_MBI=void"
                XLIBS="${LIB_AFSDB} ${LIB_libintl} -ldl"
                SHLIB_LINKER="${MT_CC} -bM:SRE -berok"
-               AIX32=""
-               AIX64="#"
+               AIX32="yes"
+               AIX64="no"
                ;;
 
 
@@ -549,14 +496,12 @@ case $AFS_SYSNAME in
                LIBSYS_AIX_EXP="afsl.exp"
                MT_CC="xlc_r"
                MT_CFLAGS='-DAFS_PTHREAD_ENV ${XCFLAGS}'
-               MT_LIBS="-lpthreads"
                SHLIB_SUFFIX="o"
-               TXLIBS="-lcurses"
                XCFLAGS="-K -D_NONSTD_TYPES -D_MBI=void"
                XLIBS="${LIB_AFSDB} ${LIB_libintl} -ldl"
                SHLIB_LINKER="${MT_CC} -bM:SRE -berok"
-               AIX32=""
-               AIX64=""
+               AIX32="yes"
+               AIX64="yes"
                ;;
 
        rs_aix52)       
@@ -566,14 +511,12 @@ case $AFS_SYSNAME in
                LIBSYS_AIX_EXP="afsl.exp"
                MT_CC="xlc_r"
                MT_CFLAGS='-DAFS_PTHREAD_ENV ${XCFLAGS}'
-               MT_LIBS="-lpthreads"
                SHLIB_SUFFIX="o"
-               TXLIBS="-lcurses"
                XCFLAGS="-K -D_NONSTD_TYPES -D_MBI=void"
                XLIBS="${LIB_AFSDB} ${LIB_libintl} -ldl"
                SHLIB_LINKER="${MT_CC} -bM:SRE -berok"
-               AIX32=""
-               AIX64=""
+               AIX32="yes"
+               AIX64="yes"
                ;;
 
        rs_aix53)       
@@ -583,14 +526,12 @@ case $AFS_SYSNAME in
                LIBSYS_AIX_EXP="afsl.exp"
                MT_CC="xlc_r"
                MT_CFLAGS='-DAFS_PTHREAD_ENV ${XCFLAGS}'
-               MT_LIBS="-lpthreads"
                SHLIB_SUFFIX="o"
-               TXLIBS="-lcurses"
                XCFLAGS="-K -D_NONSTD_TYPES -D_MBI=void"
                XLIBS="${LIB_AFSDB} ${LIB_libintl} -ldl"
                SHLIB_LINKER="${MT_CC} -bM:SRE -berok"
-               AIX32=""
-               AIX64=""
+               AIX32="yes"
+               AIX64="yes"
                ;;
 
        rs_aix61)       
@@ -600,14 +541,12 @@ case $AFS_SYSNAME in
                LIBSYS_AIX_EXP="afsl.exp"
                MT_CC="xlc_r"
                MT_CFLAGS='-DAFS_PTHREAD_ENV ${XCFLAGS}'
-               MT_LIBS="-lpthreads"
                SHLIB_SUFFIX="o"
-               TXLIBS="-lcurses"
                XCFLAGS="-K -D_NONSTD_TYPES -D_MBI=void"
                XLIBS="${LIB_AFSDB} ${LIB_libintl} -ldl"
                SHLIB_LINKER="${MT_CC} -bM:SRE -berok"
-               AIX32="#"
-               AIX64=""
+               AIX32="no"
+               AIX64="yes"
                ;;
 
        s390_linux22)
@@ -615,12 +554,10 @@ case $AFS_SYSNAME in
                KERN_OPTMZ=-O2
                MT_CC="$CC"
                MT_CFLAGS='-DAFS_PTHREAD_ENV -pthread -D_REENTRANT ${XCFLAGS}'
-               MT_LIBS="-lpthread"
                PAM_OPTMZ=-O
                PAM_CFLAGS="-Dlinux -DLINUX_PAM -fPIC"
                SHLIB_CFLAGS="-fPIC"
                SHLIB_LDFLAGS="-shared -Xlinker -x"
-               TXLIBS="-lncurses"
                OPTMZ=-O
                XCFLAGS="-D_LARGEFILE64_SOURCE"
                SHLIB_LINKER="${MT_CC} -shared"
@@ -631,12 +568,10 @@ case $AFS_SYSNAME in
                KERN_OPTMZ=-O2
                MT_CC="$CC"
                MT_CFLAGS='-DAFS_PTHREAD_ENV -pthread -D_REENTRANT ${XCFLAGS}'
-               MT_LIBS="-lpthread"
                PAM_OPTMZ=-O2
                PAM_CFLAGS="-Dlinux -DLINUX_PAM -fPIC"
                SHLIB_CFLAGS="-fPIC"
                SHLIB_LDFLAGS="-shared -Xlinker -x"
-               TXLIBS="-lncurses"
                XCFLAGS="-D_LARGEFILE64_SOURCE"
                SHLIB_LINKER="${MT_CC} -shared"
                ;;
@@ -647,12 +582,10 @@ case $AFS_SYSNAME in
                KERN_OPTMZ=-O2
                MT_CC="$CC"
                MT_CFLAGS='-DAFS_PTHREAD_ENV -pthread -D_REENTRANT ${XCFLAGS}'
-               MT_LIBS="-lpthread"
                PAM_OPTMZ=-O
                PAM_CFLAGS="-Dlinux -DLINUX_PAM -fPIC"
                SHLIB_CFLAGS="-fPIC"
                SHLIB_LDFLAGS="-shared -Xlinker -x -Xlinker -Bsymbolic"
-               TXLIBS="-lncurses"
                OPTMZ=-O
                XCFLAGS="-D_LARGEFILE64_SOURCE -D__s390x__"
                SHLIB_LINKER="${MT_CC} -shared"
@@ -665,8 +598,6 @@ case $AFS_SYSNAME in
                AFSD_LIBS="/usr/lib/libdwarf.a /usr/lib/libelf.a"
                FSINCLUDES="-I/usr/include/sys/fs"
                MT_CFLAGS='-D_SGI_MP_SOURCE -DAFS_PTHREAD_ENV ${XCFLAGS}'
-               MT_LIBS="-lpthread"
-               TXLIBS="-lcurses"
                XCFLAGS64="-64 -mips3"
                XCFLAGS="-o32"
                XLDFLAGS64="-64"
@@ -681,8 +612,6 @@ case $AFS_SYSNAME in
                AFSD_LIBS="/usr/lib/libdwarf.a /usr/lib/libelf.a"
                FSINCLUDES="-I/usr/include/sys/fs"
                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 -o32"
                XLDFLAGS64="-64"
@@ -697,8 +626,6 @@ case $AFS_SYSNAME in
                AFSD_LIBS="/usr/lib32/libdwarf.a /usr/lib32/libelf.a"
                FSINCLUDES="-I/usr/include/sys/fs"
                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,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"
@@ -714,8 +641,6 @@ case $AFS_SYSNAME in
                LD="/usr/bin/ld"
                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,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"
@@ -726,12 +651,10 @@ case $AFS_SYSNAME in
        sparc*_linux*)
                KERN_OPTMZ=-O2
                MT_CFLAGS='-DAFS_PTHREAD_ENV -pthread -D_REENTRANT ${XCFLAGS}'
-               MT_LIBS="-lpthread"
                PAM_OPTMZ=-O2
                PAM_CFLAGS="-Dlinux -DLINUX_PAM -fPIC"
                SHLIB_CFLAGS="-fPIC"
                SHLIB_LDFLAGS="-shared -Xlinker -x"
-               TXLIBS="-lncurses"
                XCFLAGS="-D_LARGEFILE64_SOURCE"
                XCFLAGS64="-D_LARGEFILE64_SOURCE -m64"
                XLDFLAGS64="-m64"
@@ -743,7 +666,6 @@ case $AFS_SYSNAME in
                CC="gcc"
                CCOBJ="gcc"
                SHLIB_CFLAGS="-PIC"
-               TXLIBS="-lcurses -ltermcap"
                XCFLAGS=""
                XLIBELFA="-lelf"
                XLIBKVM="-lkvm"
@@ -756,9 +678,7 @@ case $AFS_SYSNAME in
                CCOBJ=$SOLARISCC
                MT_CC=$SOLARISCC
                MT_CFLAGS='-mt -DAFS_PTHREAD_ENV ${XCFLAGS}'
-               MT_LIBS="-lpthread -lsocket"
                SHLIB_CFLAGS="-KPIC"
-               TXLIBS="-lcurses"
                XCFLAGS="-dy -Bdynamic"
                XLIBELFA="-lelf"
                XLIBKVM="-lkvm"
@@ -773,12 +693,10 @@ case $AFS_SYSNAME in
                CCOBJ=$SOLARISCC
                MT_CC=$SOLARISCC
                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="-L/usr/ccs/lib -lcurses"
                XCFLAGS="-dy -Bdynamic"
                XLIBELFA="-lelf"
                LD="/usr/ccs/bin/ld"
@@ -794,12 +712,10 @@ case $AFS_SYSNAME in
                LD="/usr/ccs/bin/ld"
                MT_CC=$SOLARISCC
                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"
@@ -815,12 +731,10 @@ case $AFS_SYSNAME in
                LD="/usr/ccs/bin/ld"
                MT_CC=$SOLARISCC
                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"
@@ -836,12 +750,10 @@ case $AFS_SYSNAME in
                LD="/usr/ccs/bin/ld"
                MT_CC=$SOLARISCC
                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"
@@ -857,12 +769,10 @@ case $AFS_SYSNAME in
                LD="/usr/ccs/bin/ld"
                MT_CC=$SOLARISCC
                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} -m64'
                XCFLAGS="-dy -Bdynamic"
                XLIBELFA="-lelf"
@@ -878,12 +788,10 @@ case $AFS_SYSNAME in
                LD="/usr/ccs/bin/ld"
                MT_CC=$SOLARISCC
                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"
@@ -899,12 +807,10 @@ case $AFS_SYSNAME in
                LD="/usr/ccs/bin/ld"
                MT_CC=$SOLARISCC
                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"
@@ -919,12 +825,10 @@ case $AFS_SYSNAME in
                LD="/usr/ccs/bin/ld"
                MT_CC=$SOLARISCC
                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"
@@ -939,12 +843,10 @@ case $AFS_SYSNAME in
                LD="/usr/ccs/bin/ld"
                MT_CC=$SOLARISCC
                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"
@@ -959,12 +861,10 @@ case $AFS_SYSNAME in
                LD="/usr/ccs/bin/ld"
                MT_CC=$SOLARISCC
                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} -m64'
                XCFLAGS="-dy -Bdynamic"
                XLIBELFA="-lelf"
@@ -979,12 +879,10 @@ case $AFS_SYSNAME in
                LD="/usr/ccs/bin/ld"
                MT_CC=$SOLARISCC
                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"
@@ -1047,6 +945,9 @@ else
 fi
 
 CFLAGS_NOERROR=
+CFLAGS_NOSTRICT=
+CFLAGS_NOUNUSED=
+CFLAGS_NOOLDSTYLE=
 
 if test "x$GCC" = "xyes"; then
   if test "x$enable_warnings" = "xyes"; then
@@ -1056,27 +957,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
-
-CFLAGS_NOSTRICT=
-
-if test "x$GCC" = "xyes"; then
-  CFLAGS_NOSTRICT="-fno-strict-aliasing"
-fi
-
-if test "x$GCC" = "xyes"; then
-  CFLAGS_NOUNUSED="-Wno-unused"
-else
-  CFLAGS_NOUNUSED=
-fi
-
-if test "x$GCC" = "xyes"; then
-  CFLAGS_NOOLDSTYLE="-Wno-old-style-definition"
 else
-  CFLAGS_NOOLDSTYLE=
+  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.
@@ -1125,7 +1027,6 @@ 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)
OpenAFS Master Repository