From 83ee23909b9dcfaf85d756f51242a16bdd4adae8 Mon Sep 17 00:00:00 2001
From: Sam Hartman <hartmans@mit.edu>
Date: Mon, 3 Jul 1995 01:46:55 +0000
Subject: * Replace Gcc test from top level configure.in with one from
 util/configure.in.

* Modify top level configure.in and util/makeshlib.sh so AIX can
build/use shared libs with Gcc.

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@6223 dc483132-0cff-0310-8789-dd5450dbe970
---
 src/util/ChangeLog    |  6 ++++++
 src/util/configure.in | 13 +++++--------
 src/util/makeshlib.sh |  7 +++++--
 3 files changed, 16 insertions(+), 10 deletions(-)

(limited to 'src/util')

diff --git a/src/util/ChangeLog b/src/util/ChangeLog
index e94a433102..bbd20fea70 100644
--- a/src/util/ChangeLog
+++ b/src/util/ChangeLog
@@ -1,3 +1,9 @@
+Sun Jul  2 20:42:45 1995  Sam Hartman  <hartmans@tertius.mit.edu>
+
+	* makeshlib.sh (ldflags): Adapt AIX case to work with Gcc.
+
+	* configure.in: Move Gcc test to top level configure.in.
+
 Fri Jun 23 19:11:20 1995  Sam Hartman  <hartmans@tardis.MIT.EDU>
 
 	* configure.in: Add aix.bincmds as target on AIX.
diff --git a/src/util/configure.in b/src/util/configure.in
index b5520236c2..3e042aed54 100644
--- a/src/util/configure.in
+++ b/src/util/configure.in
@@ -2,14 +2,11 @@ AC_INIT(configure.in)
 CONFIG_RULES
 AC_PROG_ARCHIVE
 AC_PROG_ARCHIVE_ADD
-AC_MSG_CHECKING(whether running Gcc)
-AC_EGREP_CPP(yes,[#ifdef __GNUC__
-yes;
-#endif],HAVE_GCC=yes,HAVE_GCC=)
-if test -n "$HAVE_GCC" ; then
-        AC_MSG_RESULT(yes)
-        else AC_MSG_RESULT(no)
-        fi
+if test $krb5_cv_prog_gcc = yes ; then
+     HAVE_GCC=yes
+     else HAVE_GCC=
+fi
+
 AC_SUBST(HAVE_GCC)
 HOST_TYPE=$krb5_cv_host
 AC_SUBST(HOST_TYPE)
diff --git a/src/util/makeshlib.sh b/src/util/makeshlib.sh
index 729d7f2d3e..4bc56bfc13 100644
--- a/src/util/makeshlib.sh
+++ b/src/util/makeshlib.sh
@@ -38,8 +38,11 @@ ar cq $library $FILES || exit $?
 	stat=$?
 	if [ $stat -eq 0 ]
 	then
-	   ld -o shr.o $library -H512 -T512 -bM:SRE -lc $ldflags -bfilelist -bgcbypass:1 -bnodelcsect -x -bE:${library}.syms $libdirfl $liblist
-	stat=$?
+	if test $HAVE_GCC = "yes" ; then
+		$CC -o shr.o $library -nostartfiles -Xlinker -bgcbypass:1 -Xlinker -bfilelist -Xlinker -bM:SRE -Xlinker -bE:${library}.syms $ldflags $liblist $libdirfl
+		else ld -o shr.o $library -H512 -T512 -bM:SRE -lc $ldflags -bfilelist -bgcbypass:1 -bnodelcsect -x -bE:${library}.syms $libdirfl $liblist
+            fi
+ stat=$?
 	if [ $stat -eq 0 ]
 	      then
 	      rm $library ${library}.syms
-- 
cgit