[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: OSF sia stuff in 0.4b
Mark Davies <mark@MCS.VUW.AC.NZ> writes:
> Hi,
> The Makefile for the sia lib (lib/auth/sia) in 0.4b hasn't been updated to
> deal with the possibility of using openssl's libcrypto rather than libdes and
> also tries to do the link explicitly with "ld" rather than letting libtool do
> it so the library search paths aren't getting set properly.
Hello. Thanks for noticing this problem.
> I've made a quick hack to the Makefile to get it to build for me but someone
> who understands autoconf can probably fix this up properly pretty easily.
This is a little bit tricky, since automake/libtool are not very happy
about always building shared libraries (it doesn't make much point
building a static sia library), and it's not very fond of linking with
non-installed libraries.
There's an untested patch below. You will need to rerun `autoconf -f'
after having applied it. If you like to test it and haven't got
autoconf/automake/libtool installed, I can generate the files for you.
/assar
Index: configure.in
===================================================================
RCS file: /afs/pdc.kth.se/src/packages/kth-krb/SourceRepository/heimdal/configure.in,v
retrieving revision 1.284
diff -u -w -r1.284 configure.in
--- configure.in 2001/07/02 22:05:31 1.284
+++ configure.in 2001/07/06 15:59:33
@@ -553,14 +553,20 @@
LIB_des="-R $krb4_libdir -L$krb4_libdir"
fi
LIB_des="$LIB_des $ac_cv_funclib_MD4_Init"
+ LIB_des_a="$LIB_des"
+ LIB_des_so="$LIB_des"
LIB_des_appl="$LIB_des"
else
DIR_des='des'
LIB_des='$(top_builddir)/lib/des/libdes.la'
+ LIB_des_a='$(top_builddir)/lib/des/.libs/libdes.a'
+ LIB_des_so='$(top_builddir)/lib/des/.libs/libdes.so'
LIB_des_appl="-ldes"
fi
AC_SUBST(DIR_des)
AC_SUBST(LIB_des)
+AC_SUBST(LIB_des_a)
+AC_SUBST(LIB_des_so)
AC_SUBST(LIB_des_appl)
KRB_READLINE
Index: lib/auth/sia/Makefile.am
===================================================================
RCS file: /afs/pdc.kth.se/src/packages/kth-krb/SourceRepository/lib/auth/sia/Makefile.am,v
retrieving revision 1.9
diff -u -w -r1.9 Makefile.am
--- lib/auth/sia/Makefile.am 2001/03/06 16:57:09 1.9
+++ lib/auth/sia/Makefile.am 2001/07/06 16:01:23
@@ -23,7 +23,7 @@
$(top_builddir)/lib/krb5/.libs/libkrb5.a \
$(top_builddir)/lib/asn1/.libs/libasn1.a \
$(LIB_krb4) \
- $(top_builddir)/lib/des/.libs/libdes.a \
+ $(LIB_des_a) \
$(top_builddir)/lib/com_err/.libs/libcom_err.a \
$(top_builddir)/lib/roken/.libs/libroken.a \
$(LIB_getpwnam_r) \
@@ -34,7 +34,7 @@
$(top_builddir)/lib/krb5/.libs/libkrb5.so \
$(top_builddir)/lib/asn1/.libs/libasn1.so \
$(LIB_krb4) \
- $(top_builddir)/lib/des/.libs/libdes.so \
+ $(LIB_des_so) \
$(top_builddir)/lib/com_err/.libs/libcom_err.so \
$(top_builddir)/lib/roken/.libs/libroken.so \
$(LIB_getpwnam_r) \
@@ -48,7 +48,7 @@
$(KAFS) \
$(top_builddir)/lib/kadm/.libs/libkadm.a \
$(top_builddir)/lib/krb/.libs/libkrb.a \
- $(top_builddir)/lib/des/.libs/libdes.a \
+ $(LIB_des_a) \
$(top_builddir)/lib/com_err/.libs/libcom_err.a \
$(top_builddir)/lib/roken/.libs/libroken.a \
$(LIB_getpwnam_r) \
@@ -58,7 +58,7 @@
$(KAFS_S) \
$(top_builddir)/lib/kadm/.libs/libkadm.so \
$(top_builddir)/lib/krb/.libs/libkrb.so \
- $(top_builddir)/lib/des/.libs/libdes.so \
+ $(LIB_des_so) \
$(top_builddir)/lib/com_err/.libs/libcom_err.so \
$(top_builddir)/lib/roken/.libs/libroken.so \
$(LIB_getpwnam_r) \