From: Theodore Tso <tytso@mit.edu>
Date: Wed, 28 Jun 1995 21:13:07 +0000 (+0000)
Subject: aclocal.m4 (KRB_INCLUDE): Search the build directories before the
X-Git-Tag: krb5-1.0-beta6~1625
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=5f71e52f0d2f6bb0adc602b8746604eef572dcff;p=krb5.git

aclocal.m4 (KRB_INCLUDE): Search the build directories before the
	source directories.  (Doesn't hurt anything, and it helps in a few
	cases of user error.)

configure.in: Conditionalize on the name of CC to determine whether to
	use the gcc or suncc flags for shared libraries.  (This is a little
	bit ugly; we might want to use a better test later on.)

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@6190 dc483132-0cff-0310-8789-dd5450dbe970
---

diff --git a/src/ChangeLog b/src/ChangeLog
index 7534f23cd..fe4b5eee6 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,14 @@
+Wed Jun 28 17:07:08 1995  Theodore Y. Ts'o  <tytso@dcl>
+
+	* aclocal.m4 (KRB_INCLUDE): Search the build directories before
+		the source directories.  (Doesn't hurt anything, and it
+		helps in a few cases of user error.)
+
+	* configure.in: Conditionalize on the name of CC to determine
+		whether to use the gcc or suncc flags for shared
+		libraries.  (This is a little bit ugly; we might want to
+		use a better test later on.)
+
 Wed Jun 28 10:43:10 1995    <tytso@rsx-11.mit.edu>
 
 	* aclocal.m4 (INSTALL_VARIABLE_HACKSRCTOP): Work around bug in
diff --git a/src/aclocal.m4 b/src/aclocal.m4
index 3949790f6..d947415f9 100644
--- a/src/aclocal.m4
+++ b/src/aclocal.m4
@@ -548,7 +548,7 @@ dnl
 dnl local includes are used -- KRB_INCLUDE
 dnl
 define(KRB_INCLUDE,[
-ADD_DEF([-I$(SRCTOP)/include -I$(BUILDTOP)/include -I$(SRCTOP)/include/krb5 -I$(BUILDTOP)/include/krb5])dnl
+ADD_DEF([-I$(BUILDTOP)/include -I$(SRCTOP)/include -I$(BUILDTOP)/include/krb5 -I$(SRCTOP)/include/krb5])dnl
 ])dnl
 dnl
 dnl check for yylineno -- HAVE_YYLINENO
diff --git a/src/configure.in b/src/configure.in
index 570989889..e37fad24b 100644
--- a/src/configure.in
+++ b/src/configure.in
@@ -12,7 +12,7 @@ case $krb5_cv_host in
 	echo "Enabling shared libraries for Linux...."
 	krb5_cv_shlibs_cflags=-fPIC
 	krb5_cv_shlibs_ext=so
-krb5_cv_noshlibs_ext=a
+	krb5_cv_noshlibs_ext=a
 	krb5_cv_shlibs_dir=shared
 	krb5_cv_shlibs_ldflag="-dy"
 	krb5_cv_noshlibs_ldflag="-dn"
@@ -22,13 +22,13 @@ krb5_cv_noshlibs_ext=a
 	krb5_cv_shlibs_use_dirs=yes
 	krb5_cv_shlibs_tail_comp=
 	krb5_cv_shlibs_enabled=yes
-krb5_cv_staticlibs_enabled=yes
+	krb5_cv_staticlibs_enabled=yes
 	;;
 *-*-aix*)
 	echo "Enabling shared libraries for AIX...."
 	krb5_cv_shlibs_cflags=
 	krb5_cv_shlibs_ext=a
-       krb5_cv_noshlibs_ext=do-not-make
+	krb5_cv_noshlibs_ext=do-not-make
 	krb5_cv_shlibs_dir=
 	krb5_cv_shlibs_ldflag="-bex4:\$(BUILDTOP)/util/aix.bincmds"
 	krb5_cv_noshlibs_ldflag=
@@ -36,15 +36,18 @@ krb5_cv_staticlibs_enabled=yes
 	krb5_cv_shlibs_dirhead="-L"
 	krb5_cv_exe_need_dirs=yes
 	krb5_cv_shlibs_use_dirs=no
-        krb5_cv_staticlibs_enabled=
+	krb5_cv_staticlibs_enabled=
 	krb5_cv_shlibs_tail_comp=
 	krb5_cv_shlibs_enabled=yes
 ;;
 *-*-solaris*)
 	echo "Enabling shared libraries for Solaris...."
-	krb5_cv_shlibs_cflags=-Kpic
+	case "${CC}" in
+	gcc|*/gcc|gcc-*|*/gcc-*)	krb5_cv_shlibs_cflags=-fpic ;;
+	*)				krb5_cv_shlibs_cflags=-Kpic ;;
+	esac
 	krb5_cv_shlibs_ext=so
-       krb5_cv_noshlibs_ext=a
+	krb5_cv_noshlibs_ext=a
 	krb5_cv_shlibs_dir=shared
 	krb5_cv_shlibs_ldflag="-dy"
 	krb5_cv_noshlibs_ldflag="-dn"
@@ -53,14 +56,14 @@ krb5_cv_staticlibs_enabled=yes
 	krb5_cv_exe_need_dirs=yes
 	krb5_cv_shlibs_use_dirs=yes
 	krb5_cv_shlibs_tail_comp=
-       krb5_cv_staticlibs_enabled=yes
+	krb5_cv_staticlibs_enabled=yes
 	krb5_cv_shlibs_enabled=yes
 	;;
 alpha-dec-osf*)
 	echo "Enabling shared libraries for Alpha OSF...."
 	krb5_cv_shlibs_cflags=
 	krb5_cv_shlibs_ext=so
-krb5_cv_noshlibs_ext=a
+	krb5_cv_noshlibs_ext=a
 	krb5_cv_shlibs_dir=
 	krb5_cv_shlibs_ldflag="-call_shared"
 	krb5_cv_noshlibs_ldflag="-non_shared"
@@ -69,7 +72,7 @@ krb5_cv_noshlibs_ext=a
 	krb5_cv_exe_need_dirs=no
 	krb5_cv_shlibs_use_dirs=yes
 	krb5_cv_shlibs_tail_comp=
-       krb5_cv_staticlibs_enabled=yes
+	krb5_cv_staticlibs_enabled=yes
 	krb5_cv_shlibs_enabled=yes
 	if test ! -f so_locations; then
 		cp -p /usr/shlib/so_locations .