diff options
| author | Ezra Peisach <epeisach@mit.edu> | 1995-08-15 20:22:59 +0000 |
|---|---|---|
| committer | Ezra Peisach <epeisach@mit.edu> | 1995-08-15 20:22:59 +0000 |
| commit | e0b140108ef0a9e9a3e2fd4268f32c0bdabf2697 (patch) | |
| tree | f278e7ca92a44fe01e978b22196f5f1c8f033d9f /src | |
| parent | f9e6358b005282a685c8a496be1dd027ba146fa1 (diff) | |
| download | krb5-e0b140108ef0a9e9a3e2fd4268f32c0bdabf2697.zip krb5-e0b140108ef0a9e9a3e2fd4268f32c0bdabf2697.tar.gz krb5-e0b140108ef0a9e9a3e2fd4268f32c0bdabf2697.tar.bz2 | |
* 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
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 9 | ||||
| -rw-r--r-- | src/aclocal.m4 | 6 | ||||
| -rw-r--r-- | src/configure.in | 5 |
3 files changed, 19 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 179af8b..8a10c0d 100644 --- 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 5ba013e..c2d3223 100644 --- 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 ed82298..e512c06 100644 --- 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 |