* configure.in: For OSF/1 specify that the -rpath directive takes

	a colon separated path.

* aclocal.m4 (SHLIB_RPATH_DIRS): Allow for directory path to be

This was a problem with OSF/1 where specifying -rpath multiple times
only includes the final one in the library. A colon separted path is the
correct invocation.

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

diff --git a/src/ChangeLog b/src/ChangeLog
index 179af8bceb06159aa034293ca3cebba95e65a65d..8a10c0dd63c5c37a31290b73d3c895e2bb81686b 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,12 @@
+Tue Aug 15 16:19:29 1995  Ezra Peisach  <epeisach@kangaroo.mit.edu>
+
+       * configure.in: For OSF/1 specify that the -rpath directive takes
+               a colon separated path.
+
+       * aclocal.m4 (SHLIB_RPATH_DIRS): Allow for directory path to be
+               colon separated for different directories.
+
+
 Tue Aug 15 01:37:19 1995  Tom Yu  <tlyu@dragons-lair.MIT.EDU>
 
        * Makefile.in: Change some spaces back to tabs

diff --git a/src/aclocal.m4 b/src/aclocal.m4
index 5ba013ed4086d782f3a88f2a9b31e102ebd594df..c2d322355251f337934a81e3ae7c0022d61ee82b 100644 (file)
--- a/src/aclocal.m4
+++ b/src/aclocal.m4
@@ -834,7 +834,11 @@ LD_SHLIBDIR_PREFIX=$krb5_cv_shlibs_dirhead
 AC_SUBST(LD_SHLIBDIR_PREFIX)
 SHLIB_RPATH_DIRS=
 if test $krb5_cv_shlibs_use_dirs = yes ; then
-       SHLIB_RPATH_DIRS="$krb5_cv_shlibs_dirhead \$(KRB5_SHLIBDIR) $krb5_cv_shlibs_dirhead `pwd`/\$(TOPLIBD)"
+       if test $krb5_cv_shlibs_use_colon_dirs = yes ; then
+               SHLIB_RPATH_DIRS="$krb5_cv_shlibs_dirhead \$(KRB5_SHLIBDIR):`pwd`/\$(TOPLIBD)"
+       else
+               SHLIB_RPATH_DIRS="$krb5_cv_shlibs_dirhead \$(KRB5_SHLIBDIR) $krb5_cv_shlibs_dirhead `pwd`/\$(TOPLIBD)"
+       fi
 fi
 AC_SUBST(SHLIB_RPATH_DIRS)
 SHLIB_LIBDIRS="-L\$(TOPLIBD)"

diff --git a/src/configure.in b/src/configure.in
index ed822989dce152eac35080534ab35cf9258d09fa..e512c06186be3938c4a68641ef3d988302a20532 100644 (file)
--- a/src/configure.in
+++ b/src/configure.in
@@ -33,6 +33,7 @@ case $krb5_cv_host in
        krb5_cv_shlibs_dirhead="-L"
        krb5_cv_exe_need_dirs=yes
        krb5_cv_shlibs_use_dirs=yes
+       krb5_cv_shlibs_use_colon_dirs=no
        krb5_cv_shlibs_tail_comp=
        krb5_cv_shlibs_enabled=yes
        krb5_cv_staticlibs_enabled=yes
@@ -49,6 +50,7 @@ case $krb5_cv_host in
        krb5_cv_shlibs_dirhead="-R"
        krb5_cv_exe_need_dirs=yes
        krb5_cv_shlibs_use_dirs=yes
+       krb5_cv_shlibs_use_colon_dirs=no
        krb5_cv_shlibs_tail_comp=
        krb5_cv_shlibs_enabled=yes
        krb5_cv_staticlibs_enabled=yes
@@ -70,6 +72,7 @@ fi
        krb5_cv_shlibs_dirhead="-L"
        krb5_cv_exe_need_dirs=yes
        krb5_cv_shlibs_use_dirs=no
+       krb5_cv_shlibs_use_colon_dirs=no
        krb5_cv_staticlibs_enabled=
        krb5_cv_shlibs_tail_comp=
        krb5_cv_shlibs_enabled=yes
@@ -90,6 +93,7 @@ fi
        krb5_cv_shlibs_dirhead="-R"
        krb5_cv_exe_need_dirs=yes
        krb5_cv_shlibs_use_dirs=yes
+       krb5_cv_shlibs_use_colon_dirs=no
        krb5_cv_shlibs_tail_comp=
        krb5_cv_staticlibs_enabled=yes
        krb5_cv_shlibs_enabled=yes
@@ -106,6 +110,7 @@ alpha-dec-osf*)
        krb5_cv_shlibs_dirhead="-rpath"
        krb5_cv_exe_need_dirs=no
        krb5_cv_shlibs_use_dirs=yes
+       krb5_cv_shlibs_use_colon_dirs=yes
        krb5_cv_shlibs_tail_comp=
        krb5_cv_staticlibs_enabled=yes
        krb5_cv_shlibs_enabled=yes