* ltconfig.in (shlibpath_overrides_runpath): new variable;

determines whether LD_LIBRARY_PATH or equivalent can be used to
override a hard-coded library search path; default to unknown
(linux-gnu*): set it to no
(solaris*, sunos4*): set it to yes
* ltmain.in (build_libdirs_flags, build_libdirs, build_rpath): if
shlibpath_overrides_runpath is not yes, arrange that wrapper
scripts create, on demand, programs that use uninstalled libraries
* doc/libtool.texi: document it

diff --git a/ChangeLog b/ChangeLog
index 202acaa5434c495706eb730f2d4606cbe99fcf08..3d3663bc6233621c27979e71e79bbc7c2c6d8ea4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,15 @@
 1999-02-20  Alexandre Oliva  <oliva@dcc.unicamp.br>
 
+       * ltconfig.in (shlibpath_overrides_runpath): new variable;
+       determines whether LD_LIBRARY_PATH or equivalent can be used to
+       override a hard-coded library search path; default to unknown
+       (linux-gnu*): set it to no
+       (solaris*, sunos4*): set it to yes
+       * ltmain.in (build_libdirs_flags, build_libdirs, build_rpath): if
+       shlibpath_overrides_runpath is not yes, arrange that wrapper
+       scripts create, on demand, programs that use uninstalled libraries
+       * doc/libtool.texi: document it
+       
        * libtool.m4 (AC_LIBTOOL_DLOPEN): check for dlopen in libc before
        trying in dl.  Add the actual dlopening type to lt_cv_dlopen, and
        add any needed libraries to lt_cv_dlopen_LIBS.  Add test for

diff --git a/doc/libtool.texi b/doc/libtool.texi
index ca667c73bd0de221ef788037f5e8b79889204e37..bfd11ac0b2091b61e5d45926369a08ee553ecf61 100644 (file)
--- a/doc/libtool.texi
+++ b/doc/libtool.texi
@@ -3618,6 +3618,17 @@ The environment variable that tells the linker which directories to
 hardcode in the resulting executable.
 @end defvar
 
+@defvar shlibpath_overrides_runpath
+Indicates whether it is possible to override the hard-coded library
+search path of a program with an environment variable.  If this is set
+to no, libtool may have to create two copies of a program in the build
+tree, one to be installed and one to be run in the build tree only.  The 
+latter will be created on-demand, only if the program is actually run in
+the build tree.  If this is set to yes, libtool will set
+@code{shlibpath_var} in the wrapper script before starting the program.
+The default value is unknown, which is equivalent to no.
+@end defvar
+
 @defvar shlibpath_var
 The environment variable that tells the dynamic linker where to find
 shared libraries.

diff --git a/ltconfig.in b/ltconfig.in
index 1ed70169bfd72efc4ddae8d0c051a0a4c5f835a8..65ca86f7169a21ae6f94e175ecd4b1832731eb59 100755 (executable)
--- a/ltconfig.in
+++ b/ltconfig.in
@@ -1577,6 +1577,7 @@ postuninstall_cmds=
 finish_cmds=
 finish_eval=
 shlibpath_var=
+shlibpath_overrides_runpath=unknown
 version_type=none
 dynamic_linker="$host_os ld.so"
 sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
@@ -1735,6 +1736,7 @@ linux-gnu*)
   soname_spec='${libname}${release}.so$major'
   finish_cmds='PATH="$PATH:/sbin" ldconfig -n $libdir'
   shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
   deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )'
   file_magic_cmd=file
 
@@ -1804,6 +1806,7 @@ solaris*)
   library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
   soname_spec='${libname}${release}.so$major'
   shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
   # ldd complains unless libraries are executable
   postinstall_cmds='chmod +x $lib'
   deplibs_check_method="file_magic ELF [0-9][0-9]-bit [LM]SB dynamic lib"
@@ -1815,6 +1818,7 @@ sunos4*)
   library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix'
   finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
   shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
   if test "$with_gnu_ld" = yes; then
     need_lib_prefix=no
   fi
@@ -2170,6 +2174,9 @@ runpath_var=$runpath_var
 # This is the shared library path variable.
 shlibpath_var=$shlibpath_var
 
+# Is shlibpath searched before the hard-coded library search path?
+shlibpath_overrides_runpath=$shlibpath_overrides_runpath
+
 # How to hardcode a shared library path into an executable.
 hardcode_action=$hardcode_action
 

diff --git a/ltmain.in b/ltmain.in
index 41c6fb5959aa17d03ce99b71c31e538fc789f1ac..6af751598999a7b27dbb1c04ea8906d62bf7deee 100644 (file)
--- a/ltmain.in
+++ b/ltmain.in
@@ -780,7 +780,7 @@ compiler."
       allow_undefined=yes
       ;;
     esac
-    compile_command="$CC"
+    compile_command="$CC@BUILD_LIBDIRS_FLAGS@"
     finalize_command="$CC"
 
     compile_shlibpath=
@@ -807,7 +807,6 @@ compiler."
     export_symbols_regex=
     generated=
     hardcode_libdirs=
-    finalize_hardcode_libdirs=
     libobjs=
     link_against_libtool_libs=
     ltlibs=
@@ -821,7 +820,6 @@ compiler."
     xrpath=
     perm_rpath=
     temp_rpath=
-    finalize_rpath=
     thread_safe=no
     vinfo=
 
@@ -1211,21 +1209,6 @@ compiler."
 
          # This is the magic to use -rpath.
          if test -n "$hardcode_libdir_flag_spec"; then
-           saved_libdir="$libdir"
-           libdir="$dir"
-
-           # We need an absolute path.
-           case "$libdir" in
-           /* | [A-Za-z]:[/\\]*) ;;
-           *)
-             absdir=`cd "$libdir" && pwd`
-             if test -z "$absdir"; then
-               $echo "$modename: cannot determine absolute directory name of \`$libdir'" 1>&2
-             else
-               libdir="$absdir"
-             fi
-             ;;
-           esac
            if test -n "$hardcode_libdir_separator"; then
              if test -z "$hardcode_libdirs"; then
                # Put the magic libdir with the hardcode flag.
@@ -1248,54 +1231,13 @@ compiler."
              eval flag=\"$hardcode_libdir_flag_spec\"
 
              compile_command="$compile_command $flag"
-           fi
-
-           libdir="$saved_libdir"
-           if test -n "$hardcode_libdir_separator"; then
-             if test -z "$finalize_hardcode_libdirs"; then
-               # Put the magic libdir with the hardcode flag.
-               finalize_hardcode_libdirs="$libdir"
-               libdir="@HARDCODE_LIBDIRS@"
-             else
-               # Just accumulate the unique libdirs.
-               case "$hardcode_libdir_separator$finalize_hardcode_libdirs$hardcode_libdir_separator" in
-               *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
-                 ;;
-               *)
-                 finalize_hardcode_libdirs="$finalize_hardcode_libdirs$hardcode_libdir_separator$libdir"
-                 ;;
-               esac
-               libdir=
-             fi
-           fi
-
-           if test -n "$libdir"; then
-             eval flag=\"$hardcode_libdir_flag_spec\"
-
              finalize_command="$finalize_command $flag"
            fi
-           # libdir is also use after "$hardcode_action" case
-           libdir="$saved_libdir"
          elif test -n "$runpath_var"; then
-           # Do the same for the permanent run path.
-           case "$dir" in
-           /* | [A-Za-z]:[/\\]*) absdir="$dir";;
-           *)
-             absdir=`cd "$dir" && pwd`
-             if test -z "$absdir"; then
-               $echo "$modename: cannot determine absolute directory name of \`$dir'" 1>&2
-               absdir="$dir"
-             fi
-             ;;
-           esac
            case "$perm_rpath " in
            *" $absdir "*) ;;
            *) perm_rpath="$perm_rpath $absdir" ;;
            esac
-           case "$finalize_perm_rpath " in
-           *" $libdir "*) ;;
-           *) finalize_perm_rpath="$finalize_perm_rpath $libdir" ;;
-           esac
          fi
 
 
@@ -1727,8 +1669,13 @@ compiler."
 
       # Create the output directory, or remove our outputs if we need to.
       if test -d $output_objdir; then
-       $show "${rm}r $output_objdir/$outputname $output_objdir/$libname.* $output_objdir/${libname}${release}.*"
-       $run ${rm}r $output_objdir/$outputname $output_objdir/$libname.* $output_objdir/${libname}${release}.*
+       $show "${rm}r $output_objdir/$outputname $output_objdir/$objdir/$outputname $output_objdir/$libname.* $output_objdir/${libname}${release}.*"
+       $run ${rm}r $output_objdir/$outputname $output_objdir/$objdir/$outputname $output_objdir/$libname.* $output_objdir/${libname}${release}.*
+
+       if test -z "$run" && test -f "$output_objdir/$objdir/$outputname"; then
+         $echo "$modename: warning: $output_objdir/$objdir/$outputname could not be removed" 1>&2
+         exit 1
+       fi
       else
        $show "$mkdir $output_objdir"
        $run $mkdir $output_objdir
@@ -2176,7 +2123,6 @@ EOF
        # If the user specified any rpath flags, then add them.
        for libdir in $rpath $xrpath; do
          if test -n "$hardcode_libdir_flag_spec"; then
-           saved_libdir="$libdir"
            if test -n "$hardcode_libdir_separator"; then
              if test -z "$hardcode_libdirs"; then
                # Put the magic libdir with the hardcode flag.
@@ -2199,49 +2145,22 @@ EOF
              eval flag=\"$hardcode_libdir_flag_spec\"
 
              compile_command="$compile_command $flag"
+              finalize_command="$finalize_command $flag"
            fi
 
-           libdir="$saved_libdir"
-           if test -n "$hardcode_libdir_separator"; then
-             if test -z "$finalize_hardcode_libdirs"; then
-               # Put the magic libdir with the hardcode flag.
-               finalize_hardcode_libdirs="$libdir"
-               libdir="@HARDCODE_LIBDIRS@"
-             else
-               # Just accumulate the unique libdirs.
-               case "$hardcode_libdir_separator$finalize_hardcode_libdirs$hardcode_libdir_separator" in
-               *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
-                 ;;
-               *)
-                 finalize_hardcode_libdirs="$finalize_hardcode_libdirs$hardcode_libdir_separator$libdir"
-                 ;;
-               esac
-               libdir=
-             fi
-           fi
-
-           if test -n "$libdir"; then
-             eval flag=\"$hardcode_libdir_flag_spec\"
-
-             finalize_command="$finalize_command $flag"
-           fi
          elif test -n "$runpath_var"; then
            case "$perm_rpath " in
            *" $libdir "*) ;;
            *) perm_rpath="$perm_rpath $libdir" ;;
            esac
-           case "$finalize_perm_rpath " in
-           *" $libdir "*) ;;
-           *) finalize_perm_rpath="$finalize_perm_rpath $libdir" ;;
-           esac
          fi
        done
       fi
 
       # Substitute the hardcoded libdirs into the compile commands.
       if test -n "$hardcode_libdir_separator"; then
-       compile_command=`$echo "X$compile_command" | $Xsed -e "s%@HARDCODE_LIBDIRS@%$hardcode_libdirs%g"`
-       finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@HARDCODE_LIBDIRS@%$finalize_hardcode_libdirs%g"`
+       compile_command=`$echo "X$compile_command" | $Xsed -e "s%@HARDCODE_LIBDIRS@%@HARDCODE_BUILD_LIBDIRS@$hardcode_libdirs%g"`
+       finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@HARDCODE_LIBDIRS@%$hardcode_libdirs%g"`
       fi
 
       output_objdir=`$echo "X$output" | $Xsed -e 's%/[^/]*$%%'`
@@ -2446,8 +2365,7 @@ static const void *lt_preloaded_setup() {
 
       if test -z "$link_against_libtool_libs" || test "$build_libtool_libs" != yes; then
        # Replace the output file specification.
-       compile_command=`$echo "X$compile_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'`
-       finalize_command=`$echo "X$finalize_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'`
+       compile_command=`$echo "X$compile_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g' -e 's%@BUILD_LIBDIRS_FLAGS@%%' -e 's%@HARDCODE_BUILD_LIBDIRS@%%'`
 
        # We have no uninstalled library dependencies, so finalize right now.
        $show "$compile_command"
@@ -2455,10 +2373,6 @@ static const void *lt_preloaded_setup() {
        exit $?
       fi
 
-      # Replace the output file specification.
-      compile_command=`$echo "X$compile_command" | $Xsed -e 's%@OUTPUT@%'"$output_objdir/$outputname"'%g'`
-      finalize_command=`$echo "X$finalize_command" | $Xsed -e 's%@OUTPUT@%'"$output_objdir/$outputname"'T%g'`
-
       # Create the binary in the object directory, then wrap it.
       if test ! -d $output_objdir; then
        $show "$mkdir $output_objdir"
@@ -2469,6 +2383,63 @@ static const void *lt_preloaded_setup() {
        fi
       fi
 
+      if test "$shlibpath_overrides_runpath" != yes; then
+       build_libdirs_flags=
+       build_libdirs=
+       build_rpath=
+
+       for libdir in $temp_rpath; do
+         case "$libdir" in
+         /* | [A-Za-z]:[/\\]*)
+           # Absolute path, ok.
+           ;;
+         *)
+           # Relative path: add a thisdir entry.
+           libdir="@THISDIR@/$libdir"
+           ;;
+         esac
+
+         if test -n "$hardcode_libdir_flag_spec"; then
+           if test -n "$hardcode_libdir_separator"; then
+             if test -z "$build_libdirs"; then
+               # Put the magic libdir with the hardcode flag.
+               case "$hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator" in
+               *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
+                 ;;
+               *)
+                 build_libdirs="$libdir$hardcode_libdir_separator"
+                 ;;
+               esac
+             else
+               # Just accumulate the unique libdirs.
+               case "$hardcode_libdir_separator$build_libdirs$hardcode_libdirs$hardcode_libdir_separator" in
+               *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
+                 ;;
+               *)
+                 build_libdirs="$build_libdirs$libdir$hardcode_libdir_separator"
+                 ;;
+               esac
+             fi
+           else
+             eval flag=\"$hardcode_libdir_flag_spec\"
+
+             build_libdirs_flags="$build_libdirs_flags $flag"
+           fi
+
+         elif test -n "$runpath_var"; then
+           case ":$build_rpath" in
+           *":$libdir:"*) ;;
+           *)
+             case " $perm_rpath " in
+             *" $libdir "*) ;;
+             *) build_rpath="$build_rpath$libdir:" ;;
+             esac
+             ;;
+           esac
+         fi
+       done
+      fi
+
       if test -n "$shlibpath_var"; then
        # We should set the shlibpath_var
        rpath=
@@ -2504,15 +2475,7 @@ static const void *lt_preloaded_setup() {
          for dir in $perm_rpath; do
            rpath="$rpath$dir:"
          done
-         compile_command="$runpath_var=\"$rpath\$$runpath_var\" $compile_command"
-       fi
-       if test -n "$finalize_perm_rpath"; then
-         # We should set the runpath_var.
-         rpath=
-         for dir in $finalize_perm_rpath; do
-           rpath="$rpath$dir:"
-         done
-         finalize_command="$runpath_var=\"$rpath\$$runpath_var\" $finalize_command"
+         compile_command="$runpath_var=\"@BUILD_RPATH@$rpath\$$runpath_var\" $compile_command"
        fi
       fi
 
@@ -2522,6 +2485,14 @@ static const void *lt_preloaded_setup() {
        $echo "$modename: \`$output' will be relinked during installation" 1>&2
       fi
 
+      if test "$shlibpath_overrides_runpath" != yes; then
+       compile_for_build_command=`echo "X$compile_command" | $Xsed -e "s%@BUILD_LIBDIRS_FLAGS@%$build_libdirs_flags%" -e "s%@BUILD_RPATH@%$build_rpath%" -e "s%@HARDCODE_BUILD_LIBDIRS@%$build_libdirs%" -e 's%@THISDIR@%\$thisdir%g' -e 's%@OUTPUT@%\$progdir/\$program%g'`
+      fi
+
+      # Replace the output file specification.
+      compile_command=`$echo "X$compile_command" | $Xsed -e 's%@OUTPUT@%'"$output_objdir/$outputname"'%g' -e 's%@BUILD_LIBDIRS_FLAGS@%%' -e 's%@BUILD_RPATH@%%' -e 's%@HARDCODE_BUILD_LIBDIRS@%%'`
+      finalize_command=`$echo "X$finalize_command" | $Xsed -e 's%@OUTPUT@%'"$output_objdir/$outputname"'T%g'`
+
       $show "$compile_command"
       $run eval "$compile_command" || exit $?
 
@@ -2623,13 +2594,30 @@ else
   absdir=\`cd \"\$thisdir\" && pwd\`
   test -n \"\$absdir\" && thisdir=\"\$absdir\"
 
-  progdir=\"\$thisdir/$objdir\"
-  program='$outputname'
+  program='$outputname'"
+
+       if test "$shlibpath_overrides_runpath" = yes; then
+         echo >> $output "  progdir=\"\$thisdir/$objdir\""
+       else
+         echo >> $output "\
+  progdir=\"\$thisdir/$objdir/$objdir\"
+
+  if test ! -f \"\$progdir/\$program\"; then
+    if test ! -d \"\$progdir\"; then
+      mkdir \"\$progdir\"
+    fi
+
+    # link executable that searches the build-dir
+    (cd \$thisdir && $compile_for_build_command)
+  fi"
+       fi
+
+       echo >> $output "\
 
   if test -f \"\$progdir/\$program\"; then"
 
        # Export our shlibpath_var if we have one.
-       if test -n "$shlibpath_var" && test -n "$temp_rpath"; then
+       if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then
          $echo >> $output "\
     # Add our own library path to $shlibpath_var
     $shlibpath_var=\"$temp_rpath\$$shlibpath_var\"