diff options
| author | Ken Raeburn <raeburn@mit.edu> | 2007-03-25 23:07:09 +0000 |
|---|---|---|
| committer | Ken Raeburn <raeburn@mit.edu> | 2007-03-25 23:07:09 +0000 |
| commit | 67add7ce15f01e788d8cecbc60c61fb47d5e759f (patch) | |
| tree | 4eaec32e208cb372b1894c228d3fe9b18be4a485 /src/aclocal.m4 | |
| parent | ead4c700f9c5f05f921be90da282566be1548d16 (diff) | |
| download | krb5-67add7ce15f01e788d8cecbc60c61fb47d5e759f.tar.gz krb5-67add7ce15f01e788d8cecbc60c61fb47d5e759f.tar.xz krb5-67add7ce15f01e788d8cecbc60c61fb47d5e759f.zip | |
Never set krb5_force_static. Instead, set the defaults for building
shared libraries, and allow a Makefile.in to include a new makefile
fragment for building private (static, not installed) libraries.
Created another makefile fragment to be included to indicate the
shared library has no dependencies. (Currently this is the case only
for the libdb2 library, which we don't install, but do build for
testing.) The way we construct the library dependency search path
arguments doesn't work for an empty list on some platforms.
Updated Makefile.in to use @libpriv_frag@ and @libnodeps_frag@ as
necessary.
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@19265 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/aclocal.m4')
| -rw-r--r-- | src/aclocal.m4 | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/src/aclocal.m4 b/src/aclocal.m4 index aaacac2fff..c6c6a36bff 100644 --- a/src/aclocal.m4 +++ b/src/aclocal.m4 @@ -98,6 +98,10 @@ libobj_frag=$srcdir/$ac_config_fragdir/libobj.in AC_SUBST_FILE(libobj_frag) libnover_frag=$srcdir/$ac_config_fragdir/libnover.in AC_SUBST_FILE(libnover_frag) +libpriv_frag=$srcdir/$ac_config_fragdir/libpriv.in +AC_SUBST_FILE(libpriv_frag) +libnodeps_frag=$srcdir/$ac_config_fragdir/libnodeps.in +AC_SUBST_FILE(libnodeps_frag) dnl KRB5_AC_PRAGMA_WEAK_REF WITH_LDAP @@ -1119,7 +1123,8 @@ dnl Force static library build. AC_DEFUN(KRB5_AC_FORCE_STATIC,[dnl AC_BEFORE([$0],[KRB5_LIB_AUX])dnl -krb5_force_static=yes]) +# krb5_force_static=yes +]) AC_DEFUN(KRB5_BUILD_LIBRARY_STATIC, dnl Use define rather than AC_DEFUN to avoid ordering problems. [AC_REQUIRE([KRB5_AC_FORCE_STATIC])dnl @@ -1244,11 +1249,13 @@ else fi case "$SHLIBSEXT" in .so.s-nobuild) + SHLIB_HAVE_MINOR_VERS=no LIBLIST='lib$(LIBBASE)$(SHLIBEXT)' LIBLINKS='$(TOPLIBD)/lib$(LIBBASE)$(SHLIBEXT) $(TOPLIBD)/lib$(LIBBASE)$(SHLIBVEXT)' LIBINSTLIST="install-shared" ;; *) + SHLIB_HAVE_MINOR_VERS=yes LIBLIST='lib$(LIBBASE)$(SHLIBEXT) lib$(LIBBASE)$(SHLIBSEXT)' LIBLINKS='$(TOPLIBD)/lib$(LIBBASE)$(SHLIBEXT) $(TOPLIBD)/lib$(LIBBASE)$(SHLIBVEXT) $(TOPLIBD)/lib$(LIBBASE)$(SHLIBSEXT)' LIBINSTLIST="install-shlib-soname" @@ -1257,6 +1264,7 @@ else OBJLISTS="OBJS.SH" fi CC_LINK="$CC_LINK_SHARED" +AC_SUBST(SHLIB_HAVE_MINOR_VERS) if test -z "$LIBLIST"; then AC_MSG_ERROR([must enable one of shared or static libraries]) |