use -R for indicating dependent directories to libtool instead of

-rpath


git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@9532 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Assar Westerlund
2001-01-28 00:20:05 +00:00
parent 3cc49bc385
commit f62296ac3b

View File

@@ -80,7 +80,7 @@ LIB_roken="\$(top_builddir)/lib/vers/libvers.la $LIB_roken"
AC_TEST_PACKAGE_NEW(openldap,[#include <ldap.h>],[-lldap -llber],,,OPENLDAP) AC_TEST_PACKAGE_NEW(openldap,[#include <ldap.h>],[-lldap -llber],,,OPENLDAP)
if test "$openldap_libdir"; then if test "$openldap_libdir"; then
LIB_openldap="-rpath $openldap_libdir $LIB_openldap" LIB_openldap="-R $openldap_libdir $LIB_openldap"
fi fi
AC_TEST_PACKAGE_NEW(krb4,[#include <krb.h>],-lkrb,-ldes,/usr/athena, KRB4) AC_TEST_PACKAGE_NEW(krb4,[#include <krb.h>],-lkrb,-ldes,/usr/athena, KRB4)
@@ -154,8 +154,8 @@ if test "$with_krb4" != "no"; then
CFLAGS="$save_CFLAGS" CFLAGS="$save_CFLAGS"
LIB_kdb="-lkdb -lkrb" LIB_kdb="-lkdb -lkrb"
if test "$krb4_libdir"; then if test "$krb4_libdir"; then
LIB_krb4="-rpath $krb4_libdir $LIB_krb4" LIB_krb4="-R $krb4_libdir $LIB_krb4"
LIB_kdb="-rpath $krb4_libdir -L$krb4_libdir $LIB_kdb" LIB_kdb="-R $krb4_libdir -L$krb4_libdir $LIB_kdb"
fi fi
fi fi
AM_CONDITIONAL(KRB4, test "$with_krb4" != "no") AM_CONDITIONAL(KRB4, test "$with_krb4" != "no")
@@ -561,7 +561,7 @@ if test "$ac_cv_func_des_cbc_encrypt" = "yes" -a \
\( "$ac_cv_func_SHA1Init" = "yes" -o "$ac_cv_func_SHA1_Init" = "yes" \) -a \ \( "$ac_cv_func_SHA1Init" = "yes" -o "$ac_cv_func_SHA1_Init" = "yes" \) -a \
"$ac_cv_func_RC4" = "yes"; then "$ac_cv_func_RC4" = "yes"; then
DIR_des='' DIR_des=''
LIB_des="-rpath $krb4_libdir -L$krb4_libdir $ac_cv_funclib_MD4Init" LIB_des="-R $krb4_libdir -L$krb4_libdir $ac_cv_funclib_MD4Init"
else else
DIR_des='des' DIR_des='des'
LIB_des='$(top_builddir)/lib/des/libdes.la' LIB_des='$(top_builddir)/lib/des/libdes.la'