From 3b1a964d95c0e47705d0384d95a65927fffaa034 Mon Sep 17 00:00:00 2001
From: Derrick Brashear <shadow@dementia.org>
Date: Mon, 26 Aug 2002 15:09:35 +0000
Subject: [PATCH] osconf-cleanup-20020826

don't set shlib stuff in makefile fragments. do include sun4_413 in
osconf
---
 src/cf/osconf.m4                     | 36 ++++++++++++++++++++++++++++
 src/config/Makefile.ppc_darwin_60.in |  3 ---
 src/config/Makefile.sparc_linux24.in |  2 --
 src/config/Makefile.sun4_413.in      |  2 --
 src/config/Makefile.sunx86_57.in     |  3 ---
 5 files changed, 36 insertions(+), 10 deletions(-)

diff --git a/src/cf/osconf.m4 b/src/cf/osconf.m4
index 20bcb7e8d..2690ab0fc 100644
--- a/src/cf/osconf.m4
+++ b/src/cf/osconf.m4
@@ -395,6 +395,20 @@ case $AFS_SYSNAME in
 		YACC="bison -y"
 		;;
 
+	sun4_413)
+		CC="gcc"
+		LEX="lex"
+		LWP_OPTMZ="-O"
+		OPTMZ="-O"
+		SHLIB_CFLAGS="-PIC"
+		TXLIBS="-lcurses -ltermcap"
+		XCFLAGS=""
+		XLIBELFA="-lelf"
+		XLIBKVM="-lkvm"
+		XLIBS="${LIB_AFSDB}"
+		LD="ld"
+		;;
+
 	sun4x_55)
 		CC="/opt/SUNWspro/bin/cc"
 		LEX="lex"
@@ -495,6 +509,28 @@ case $AFS_SYSNAME in
 		XLIBS="${LIB_AFSDB} -lsocket -lnsl -lintl -ldl"
 		;;
 
+	sunx86_57)
+		CC="/opt/SUNWspro/bin/cc"
+		LEX="lex"
+		LWP_OPTMZ="-g"
+		LD="/usr/ccs/bin/ld"
+		MT_CC="/opt/SUNWspro/bin/cc"
+		MT_CFLAGS='-mt -DAFS_PTHREAD_ENV ${XCFLAGS}'
+		MT_LIBS="-lpthread -lsocket"
+		OPTMZ="-O"
+		PAM_CFLAGS="-KPIC"
+		PAM_LIBS="-lc -lpam -lsocket -lnsl -lm"
+		SHLIB_CFLAGS="-KPIC"
+		SHLIB_LDFLAGS="-G -Bsymbolic"
+		TXLIBS="-lcurses"
+		XCFLAGS64='${XCFLAGS} -xarch=v9'
+		XCFLAGS="-dy -Bdynamic"
+		XLIBELFA="-lelf"
+		XLIBKVM="-lkvm"
+		XLIBS="${LIB_AFSDB} -lsocket -lnsl -lintl -ldl"
+		;;
+
+
 	sunx86_58)
 		CC="/opt/SUNWspro/bin/cc"
 		LEX="lex"
diff --git a/src/config/Makefile.ppc_darwin_60.in b/src/config/Makefile.ppc_darwin_60.in
index d032a3646..610b32788 100644
--- a/src/config/Makefile.ppc_darwin_60.in
+++ b/src/config/Makefile.ppc_darwin_60.in
@@ -25,9 +25,6 @@ TXLIBS=-lncurses
 #XLIBELFA=
 #XLIBKVM=
 #
-SHLIB_SUFFIX=
-SHLIB_CFLAGS=
-#
 # programs
 AR=ar
 AS=as
diff --git a/src/config/Makefile.sparc_linux24.in b/src/config/Makefile.sparc_linux24.in
index b550bd7d9..ece14bdd3 100644
--- a/src/config/Makefile.sparc_linux24.in
+++ b/src/config/Makefile.sparc_linux24.in
@@ -22,8 +22,6 @@ XCFLAGS= -O2
 MT_CFLAGS=-DAFS_PTHREAD_ENV -pthread -D_REENTRANT ${XCFLAGS}
 XLDFLAGS=
 SHARE_LDFLAGS = -shared -Xlinker -x
-SHLIB_SUFFIX=so
-SHLIB_CFLAGS=
 #
 # libraries
 MTLIBS=-lpthread
diff --git a/src/config/Makefile.sun4_413.in b/src/config/Makefile.sun4_413.in
index f4d7f66d3..93f1f736e 100644
--- a/src/config/Makefile.sun4_413.in
+++ b/src/config/Makefile.sun4_413.in
@@ -21,8 +21,6 @@ XLIBS=@LIB_AFSDB@
 TXLIBS=-lcurses -ltermcap
 XLIBELFA=-lelf
 XLIBKVM=-lkvm
-SHLIB_SUFFIX=so
-SHLIB_CFLAGS=-PIC
 #
 # programs
 AR=ar
diff --git a/src/config/Makefile.sunx86_57.in b/src/config/Makefile.sunx86_57.in
index e1fb1301a..44293de0e 100644
--- a/src/config/Makefile.sunx86_57.in
+++ b/src/config/Makefile.sunx86_57.in
@@ -24,9 +24,6 @@ MTLIBS=-lpthread -lsocket
 XLIBELFA=-lelf
 XLIBKVM=-lkvm
 #
-SHLIB_SUFFIX=so
-SHLIB_CFLAGS=-KPIC
-#
 # programs
 AR=/usr/ccs/bin/ar
 AS=as
-- 
2.39.5