diff options
| author | Ken Raeburn <raeburn@mit.edu> | 2006-06-15 23:58:19 +0000 |
|---|---|---|
| committer | Ken Raeburn <raeburn@mit.edu> | 2006-06-15 23:58:19 +0000 |
| commit | 0795715f6731138f24c1e87f4773b099d20adc09 (patch) | |
| tree | 24d21d719a9dd55a84ba1b45db7559c8f0563e14 /src | |
| parent | 1b47bac1c93c53d6c2501b080c969adc65d1dbe1 (diff) | |
* 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
Diffstat (limited to 'src')
| -rw-r--r-- | src/configure.in | 11 | ||||
| -rw-r--r-- | src/util/support/Makefile.in | 4 |
2 files changed, 13 insertions, 2 deletions
diff --git a/src/configure.in b/src/configure.in index 7c6cc95eb..ca4830cdc 100644 --- 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 4b0ea81bb..fdc923e7f 100644 --- 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 |