From: Paul Park <pjpark@mit.edu>
Date: Fri, 16 Jun 1995 15:28:24 +0000 (+0000)
Subject: Explicitly handle default cases when neither --enable-shared or
X-Git-Tag: krb5-1.0-beta6~1734
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=eec2b809e21403bec6b09fecab52adc6d394a47b;p=krb5.git

Explicitly handle default cases when neither --enable-shared or
--with-shared is specified.

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

diff --git a/src/aclocal.m4 b/src/aclocal.m4
index c8dcf5465..54942e252 100644
--- a/src/aclocal.m4
+++ b/src/aclocal.m4
@@ -785,7 +785,8 @@ AC_ARG_WITH([shared],
 ,
 withval=yes
 )dnl
-if test "$withval" = yes; then
+if test "$krb5_cv_shlibs_enabled" = yes ; then
+  if test "$withval" = yes; then
 	AC_MSG_RESULT(Using shared libraries)
 	LDARGS="$krb5_cv_shlibs_ldflag -L[$](TOPLIBD) $LDARGS"
 	if test "$krb5_cv_exe_need_dirs" = yes; then
@@ -793,9 +794,12 @@ if test "$withval" = yes; then
 	fi
 	SHLIB_TAIL_COMP=$krb5_cv_shlibs_tail_comp
 	AC_SUBST(SHLIB_TAIL_COMP)
-else
+  else
 	AC_MSG_RESULT(Using archive libraries)
 	LDARGS="$krb5_cv_noshlibs_ldflag -L[$](TOPLIBD) $LDARGS"
+  fi
+else
+  LDARGS="-L[$](TOPLIBD) $LDARGS"
 fi
 AC_SUBST(LDARGS)
 ])dnl
diff --git a/src/configure.in b/src/configure.in
index e61dd6220..5c2934f9b 100644
--- a/src/configure.in
+++ b/src/configure.in
@@ -20,6 +20,7 @@ case $krb5_cv_host in
 	krb5_cv_exe_need_dirs=yes
 	krb5_cv_shlibs_use_dirs=yes
 	krb5_cv_shlibs_tail_comp=
+	krb5_cv_shlibs_enabled=yes
 	;;
 *-*-solaris*)
 	echo "Enabling shared libraries for Solaris...."
@@ -33,6 +34,7 @@ case $krb5_cv_host in
 	krb5_cv_exe_need_dirs=yes
 	krb5_cv_shlibs_use_dirs=yes
 	krb5_cv_shlibs_tail_comp=
+	krb5_cv_shlibs_enabled=yes
 	;;
 alpha-dec-osf*)
 	echo "Enabling shared libraries for Alpha OSF...."
@@ -46,6 +48,7 @@ alpha-dec-osf*)
 	krb5_cv_exe_need_dirs=no
 	krb5_cv_shlibs_use_dirs=yes
 	krb5_cv_shlibs_tail_comp=
+	krb5_cv_shlibs_enabled=yes
 	if test ! -f so_locations; then
 		cp -p /usr/shlib/so_locations .
 	fi
@@ -63,7 +66,8 @@ krb5_cv_shlibs_ldflag=
 krb5_cv_noshlibs_ldflag=
 krb5_cv_shlibs_sym_ufo=
 krb5_cv_shlibs_dirhead=
-krb5_cv_shlibs_tail_comp=])
+krb5_cv_shlibs_tail_comp=
+krb5_cv_shlibs_enabled=])
 AC_ARG_ENABLE([athena],
 [  --enable-athena         build with MIT Project Athena configuration],,)
 if test -z "$KRB4_LIB"; then