Fix up handling of libkrb4 libraries so includes and stuff work with

divergent versions of libkrb4.  That way, Athena Kerberos can be used.

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

diff --git a/src/ChangeLog b/src/ChangeLog
index c2946db49a1aa55b5154ada7ffb3f73268aed0d3..fdfbd2e22d90511b918204404ec27bc205e87176 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -5,11 +5,23 @@ Mon Jun 17 18:34:10 1996  Tom Yu  <tlyu@voltage-multiplier.mit.edu>
                linked against while checking for function existence.
                This may need some more testing.
 
+Fri Jun 14 13:10:26 1996  Sam Hartman  <hartmans@mit.edu>
+
+       * aclocal.m4 (USE_KRB4_LIBRARY)): Include appropriate include
+       files for the krb4 library we are actually using.  This way,
+       KEYFILE is a constant string if we are using Athena Kerberos libs.
+       (LDFLAGS): Force TOPLIBD to be expanded in the configure script
+       for LDFLAGS, so they are valid for autoconf AC_HAVE_FUNCS
+       tests. Note you cannot actually use libraries out of the top level
+       library directory; this just gets around some gcc complaints with
+       $(TOPLIBD) not being a bvalid path.
+
 Thu Jun 13 23:03:03 1996  Tom Yu  <tlyu@voltage-multiplier.mit.edu>
 
        * aclocal.m4: break some stuff out into pre.in and post.in in
                preparation for doing away with PUSH_MAKEFILE cruft
 
+
 Wed Jun 12 15:27:14 1996  Ezra Peisach  <epeisach@kangaroo.mit.edu>
 
        * aclocal.m4 (AC_CHECK_DBM_PROTO): Correct to use correct cache

diff --git a/src/aclocal.m4 b/src/aclocal.m4
index 48d8aed142bc2cea925b8543ec12f09269f1cf42..774178661fe0d6d6cb74872ff5a31fc4eac07247 100644 (file)
--- a/src/aclocal.m4
+++ b/src/aclocal.m4
@@ -221,6 +221,7 @@ else
  ADD_DEF(-DKRB5_KRB4_COMPAT)
  if test $withval = yes; then
        AC_MSG_RESULT(built in krb4 support)
+       KRB4_INCLUDE="-I$SRCTOP/include/kerberosIV"
        KRB4_LIB='-lkrb4'
        DEPKRB4_LIB='$(TOPLIBD)/libkrb4.a'
        KRB4_CRYPTO_LIB='-ldes425'
@@ -230,6 +231,7 @@ else
        krb5_cv_krb4_libdir=
  else
        AC_MSG_RESULT(preinstalled krb4 in $withval)
+       KRB4_INCLUDE="-I$withval/include"
        KRB4_LIB="-lkrb"
        DEPKRB4_LIB="$withval/lib/libkrb.a"
        KRB4_CRYPTO_LIB='-ldes425'
@@ -728,7 +730,8 @@ krb4_deplib=''
 krb5_lib=''
 define(USE_KRB4_LIBRARY,[
 krb4_deplib="$DEPKRB4_LIB $DEPKRB4_CRYPTO_LIB"
-krb4_lib="$KRB4_LIB $KRB4_CRYPTO_LIB"])
+krb4_lib="$KRB4_LIB $KRB4_CRYPTO_LIB"]
+       CPPFLAGS="$CPPFLAGS $KRB4_INCLUDE") dnl
 dnl
 dnl This rule tells KRB5_LIBRARIES to include the ss library.
 dnl
@@ -747,7 +750,7 @@ USE_ANAME
 fi
 DEPLIBS="\[$](DEPLOCAL_LIBRARIES) $kadm_deplib $kdb5_deplib $kutil_deplib \[$](TOPLIBD)/libkrb5.a $krb4_deplib $kdbm_deplib $kaname_deplib \[$](TOPLIBD)/libcrypto.a $ss_deplib \[$](TOPLIBD)/libcom_err.a"
 LIBS="\[$](LOCAL_LIBRARIES) $kadm_lib $kdb5_lib $kutil_lib $krb4_lib -lkrb5 $kdbm_libs $kaname_libs -lcrypto $ss_lib -lcom_err $LIBS"
-LDFLAGS="$LDFLAGS -L\$(TOPLIBD)"
+LDFLAGS="$LDFLAGS -L${BUILDTOP}/lib"
 AC_SUBST(LDFLAGS)
 AC_SUBST(LDARGS)
 AC_SUBST(DEPLIBS)])