* configure.in: Set and substitute SUPPORTLIB_MAJOR based on operating system.

* util/support/Makefile.in (LIBMAJOR): Use it.
(LIBMINOR): Bump.

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

diff --git a/src/configure.in b/src/configure.in
index 7c6cc95eb7bbb84e318b03dac9c94d5112e26dc6..ca4830cdc06a30044eba5ad8b64a0695e497fe3a 100644 (file)
--- a/src/configure.in
+++ b/src/configure.in
@@ -878,6 +878,17 @@ dnl
 HOST_TYPE=$krb5_cv_host
 AC_SUBST(HOST_TYPE)
 dnl
+dnl Sadly, we seem to have accidentally committed ourselves in 1.4 to
+dnl an ABI that includes the existence of libkrb5support.0 even
+dnl though random apps should never use anything from it.  And on
+dnl the Mac, to which that didn't apply, we can't use major version 0.
+dnl
+case $krb5_cv_host in
+*-*-darwin* | *-*-rhapsody*) SUPPORTLIB_MAJOR=1 ;;
+*)                          SUPPORTLIB_MAJOR=0 ;;
+esac
+AC_SUBST(SUPPORTLIB_MAJOR)
+dnl
 dnl
 if test "$COM_ERR_VERSION" = k5 ; then
 dnl  AC_CONFIG_SUBDIRS(util/et)

diff --git a/src/util/support/Makefile.in b/src/util/support/Makefile.in
index 4b0ea81bb684b0cfe38e1edeeb5698b141706f9b..fdc923e7fc321e6844152ace9ef220428a2e3109 100644 (file)
--- a/src/util/support/Makefile.in
+++ b/src/util/support/Makefile.in
@@ -19,8 +19,8 @@ PROG_LIBPATH=-L$(TOPLIBD)
 PROG_RPATH=$(KRB5_LIBDIR)
 
 LIBBASE=krb5support
-LIBMAJOR=1
-LIBMINOR=0
+LIBMAJOR=@SUPPORTLIB_MAJOR@
+LIBMINOR=1
 
 LIBINITFUNC=krb5int_thread_support_init
 LIBFINIFUNC=krb5int_thread_support_fini