* aclocal.m4 (KRB5_RUN_FLAGS): Allows for setting of proper paths

		for executing programs in the build tree with proper
		overriding of potentially installed libraries.

	* configure.in: Setup for KRB5_RUN_FLAGS

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

diff --git a/src/ChangeLog b/src/ChangeLog
index 86db2cb0ad8cfeee4441bbdbf49b864b0c8c46d2..f5e5dda3b743801b845f2039fdd5a34f5a5aef15 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,11 @@
+Mon Mar 18 21:33:15 1996  Ezra Peisach  <epeisach@kangaroo.mit.edu>
+
+       * aclocal.m4 (KRB5_RUN_FLAGS): Allows for setting of proper paths
+               for executing programs in the build tree with proper
+               overriding of potentially installed libraries.
+
+       * configure.in: Setup for KRB5_RUN_FLAGS
+
 Fri Mar 15 01:45:54 1996  Tom Yu  <tlyu@dragons-lair.MIT.EDU>
 
        * aclocal.m4 (V5_OUTPUT_MAKEFILE): nuke some redundant sed rules

diff --git a/src/aclocal.m4 b/src/aclocal.m4
index 85303bf2f3106726cad06b58bbd1dfd490651e35..69101163ddabeac8e335b94b5d9b5edbc3342241 100644 (file)
--- a/src/aclocal.m4
+++ b/src/aclocal.m4
@@ -1245,5 +1245,27 @@ fi dnl stdarg test failure
 
 ])dnl
 dnl
+dnl Set environment variables so that shared library executables can run
+dnl in the build tree.
 dnl
-dnl
+define(KRB5_RUN_FLAGS,[
+if test "$krb5_cv_shlibs_enabled" = yes ; then
+       KRB5_RUN_ENV=
+       if test "$krb5_cv_shlibs_run_ldpath" = default ; then
+               KRB5_RUN_ENV="$KRB5_RUN_ENV LD_LIBRARY_PATH=\$(TOPLIBD) ;  export LD_LIBRARY_PATH;"
+       elif test "$krb5_cv_shlibs_run_ldpath" != no ; then
+               KRB5_RUN_ENV="$KRB5_RUN_ENV LD_LIBRARY_PATH=\$(TOPLIBD):$krb5_cv_shlibs_run_ldpath ; export LD_LIBRARY_PATH;"
+       fi
+       # For OSF/1 this commits us to ignore built in rpath libraries
+       if test "$krb5_cv_shlibs_run_rldroot" = dummy ; then
+               KRB5_RUN_ENV="$KRB5_RUN_ENV _RLD_ROOT=/dev/dummy/d; export _RLD_ROOT;"
+       fi
+       # For AIX
+       if test "$krb5_cv_shlibs_run_libpath" != no ; then
+               KRB5_RUN_ENV="$KRB5_RUN_ENV LIBPATH=\$(TOPLIBD):$krb5_cv_shlibs_run_libpath ; export LIBPATH;"
+       fi
+else
+       KRB5_RUN_ENV=
+fi
+AC_SUBST(KRB5_RUN_ENV)
+])dnl

diff --git a/src/configure.in b/src/configure.in
index 9ac8428d76cdcd80ab90f0e0838996218b182f2f..76e438f91f2d67b39be6e3c597dc3e15144912be 100644 (file)
--- a/src/configure.in
+++ b/src/configure.in
@@ -39,6 +39,9 @@ krb5_cv_shlibs_versioned_filenames=yes # version in filename of library
        krb5_cv_shlibs_tail_comp=
        krb5_cv_shlibs_enabled=yes
        krb5_cv_staticlibs_enabled=yes
+       krb5_cv_shlibs_run_ldpath=default
+       krb5_cv_shlibs_run_libpath=no
+       krb5_cv_shlibs_run_rldroot=no
        ;;
 *-*-linux*)
        echo "Enabling shared libraries for Linux...."
@@ -58,6 +61,9 @@ krb5_cv_shlibs_versioned_filenames=yes # version in filename of library
        krb5_cv_shlibs_tail_comp=
        krb5_cv_shlibs_enabled=yes
        krb5_cv_staticlibs_enabled=yes
+       krb5_cv_shlibs_run_ldpath=default
+       krb5_cv_shlibs_run_libpath=no
+       krb5_cv_shlibs_run_rldroot=no
        ;;
 *-*-aix*)
        echo "Enabling shared libraries for AIX...."
@@ -83,6 +89,10 @@ krb5_cv_shlibs_versioned_filenames=yes # version in filename of library
        krb5_cv_staticlibs_enabled=
        krb5_cv_shlibs_tail_comp=
        krb5_cv_shlibs_enabled=yes
+       krb5_cv_shlibs_run_ldpath=no
+       # This ugly line indicates to put $LIBPATH: into the path only if set
+       krb5_cv_shlibs_run_libpath="\$\$LIBPATH\$\${LIBPATH:+:}/usr/lib:/lib"
+       krb5_cv_shlibs_run_rldroot=no
        ;;
 mips-sni-sysv4)
        echo "Enabling shared libraries for Sinix...."
@@ -106,6 +116,9 @@ mips-sni-sysv4)
        krb5_cv_shlibs_tail_comp=
        krb5_cv_staticlibs_enabled=yes
        krb5_cv_shlibs_enabled=yes
+       krb5_cv_shlibs_run_ldpath=default
+       krb5_cv_shlibs_run_libpath=no
+       krb5_cv_shlibs_run_rldroot=no
        ;;
 *-*-solaris*)
        echo "Enabling shared libraries for Solaris...."
@@ -116,7 +129,7 @@ mips-sni-sysv4)
        fi
        krb5_cv_shlibs_ext=so
        krb5_cv_noshlibs_ext=a
-krb5_cv_shlibs_versioned_filenames=yes
+       krb5_cv_shlibs_versioned_filenames=yes
        krb5_cv_shlibs_need_nover=yes
        krb5_cv_shlibs_dir=shared
        krb5_cv_shlibs_ldflag="-dy"
@@ -129,13 +142,16 @@ krb5_cv_shlibs_versioned_filenames=yes
        krb5_cv_shlibs_tail_comp=
        krb5_cv_staticlibs_enabled=yes
        krb5_cv_shlibs_enabled=yes
+       krb5_cv_shlibs_run_ldpath=default
+       krb5_cv_shlibs_run_libpath=no
+       krb5_cv_shlibs_run_rldroot=no
        ;;
 alpha-dec-osf*)
        echo "Enabling shared libraries for Alpha OSF...."
        krb5_cv_shlibs_cflags=
        krb5_cv_shlibs_ext=so
        krb5_cv_noshlibs_ext=a
-krb5_cv_shlibs_versioned_filenames=yes
+       krb5_cv_shlibs_versioned_filenames=yes
        krb5_cv_shlibs_need_nover=yes
        krb5_cv_shlibs_dir=
        krb5_cv_shlibs_ldflag="-call_shared"
@@ -148,6 +164,11 @@ krb5_cv_shlibs_versioned_filenames=yes
        krb5_cv_shlibs_tail_comp=
        krb5_cv_staticlibs_enabled=yes
        krb5_cv_shlibs_enabled=yes
+       # OSF/1 needs a dummy rldroot to bypath -rpath and therefore
+       # needs all library paths indicated
+       krb5_cv_shlibs_run_ldpath="/usr/shlib:/usr/ccs/lib:/usr/lib/cmplrs/cc:/usr/lib:/usr/local/lib"
+       krb5_cv_shlibs_run_rldroot=dummy
+       krb5_cv_shlibs_run_libpath=no
        if test ! -f so_locations; then
                cp -p /usr/shlib/so_locations .
        fi
@@ -172,6 +193,9 @@ krb5_cv_shlibs_versioned_filenames=yes
        krb5_cv_shlibs_tail_comp=
        krb5_cv_shlibs_enabled=yes
        krb5_cv_staticlibs_enabled=yes
+       krb5_cv_shlibs_run_ldpath=default
+       krb5_cv_shlibs_run_libpath=no
+       krb5_cv_shlibs_run_rldroot=no
        ;;
 *) 
        echo " "