* ltconfig.in: Removed all references to what used to be

hardcode_into_libs=all.  2000-09-03's patch was wrong.
* ltmain.in: Likewise.
* tests/build-relink.test, tests/build-relink2.test: Adjust.
* mdemo/Makefile.am (lib_LTLIBRARIES): Move libsub.la before
libfoo2.la, so that they're installed in the right order.

diff --git a/ChangeLog b/ChangeLog
index b2f619bfff720b2a96de54f6b0f1470eaf4c2d59..881fbbcc9835db7854186b28114fd4943402b74f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2000-09-05  Alexandre Oliva  <aoliva@redhat.com>
+
+       * ltconfig.in: Removed all references to what used to be
+       hardcode_into_libs=all.  2000-09-03's patch was wrong.
+       * ltmain.in: Likewise.
+       * tests/build-relink.test, tests/build-relink2.test: Adjust.
+       * mdemo/Makefile.am (lib_LTLIBRARIES): Move libsub.la before
+       libfoo2.la, so that they're installed in the right order.
+
 2000-09-04  Alexandre Oliva  <aoliva@redhat.com>
 
        * tests/dryrun.test: Build libsub.la along with the object files,

diff --git a/ltconfig.in b/ltconfig.in
index 470f073661bedda6b186a031a3e00549403ecd7a..a3c869b1e2e04e4a9bf464abcdc6914076eda287 100755 (executable)
--- a/ltconfig.in
+++ b/ltconfig.in
@@ -2084,9 +2084,7 @@ test "$enable_shared" = yes || enable_static=yes
 
 echo "checking whether to build static libraries... $enable_static" 1>&6
 
-if test "$hardcode_action" = relink ||
-   { test "$hardcode_into_libs" = yes &&
-     test "$shlibpath_overrides_runpath" != yes; }; then
+if test "$hardcode_action" = relink; then
   # Fast installation is not supported
   enable_fast_install=no
 elif test "$shlibpath_overrides_runpath" = yes ||

diff --git a/ltmain.in b/ltmain.in
index 89410a005d6a8b41fdbaaf6cf35dc28c050e3151..e32afdf59c773ad5a8167350ce368ba716b1e4ba 100644 (file)
--- a/ltmain.in
+++ b/ltmain.in
@@ -1691,9 +1691,6 @@ compiler."
 
        if test "$linkmode,$pass" = "prog,link"; then
          if test -n "$library_names" &&
-            { test "$hardcode_into_libs" != yes ||
-              test "$shlibpath_overrides_runpath" = yes ||
-              test "$alldeplibs" != yes; } &&
             { test "$prefer_static_libs" = no || test -z "$old_library"; }; then
            # We need to hardcode the library path
            if test -n "$shlibpath_var"; then
@@ -1747,8 +1744,7 @@ compiler."
          fi
          # This is a shared library
          if test $linkmode = lib &&
-            test "$hardcode_into_libs" = yes &&
-            test "$shlibpath_overrides_runpath" != yes; then
+            test $hardcode_into_libs = yes; then
            # Hardcode the library path.
            # Skip directories that are in the system default run-time
            # search path.
@@ -1948,7 +1944,7 @@ compiler."
 
        if test $linkmode = lib; then
          if test -n "$dependency_libs" &&
-            { test "$hardcode_into_libs" = no || test $build_old_libs = yes ||
+            { test $hardcode_into_libs != yes || test $build_old_libs = yes ||
               test $link_static = yes; }; then
            # Extract -R from dependency_libs
            temp_deplibs=
@@ -2374,7 +2370,7 @@ compiler."
          *) finalize_rpath="$finalize_rpath $libdir" ;;
          esac
        done
-       if test "$hardcode_into_libs" = no || test $build_old_libs = yes; then
+       if test $hardcode_into_libs != yes || test $build_old_libs = yes; then
          dependency_libs="$temp_xrpath $dependency_libs"
        fi
       fi
@@ -2624,7 +2620,7 @@ EOF
 
       # Test again, we may have decided not to build it any more
       if test "$build_libtool_libs" = yes; then
-       if test "$hardcode_into_libs" != no; then
+       if test $hardcode_into_libs = yes; then
          # Hardcode the library paths
          hardcode_libdirs=
          dep_rpath=
@@ -2790,9 +2786,7 @@ EOF
        fi
 
        # Make a backup of the uninstalled library when relinking
-       if test "$mode" = relink &&
-          test "$hardcode_into_libs" = yes &&
-          test "$shlibpath_overrides_runpath" != yes; then
+       if test "$mode" = relink; then
          $run eval '(cd $output_objdir && $rm ${realname}U && $mv $realname ${realname}U)' || exit $?
        fi
 
@@ -2811,9 +2805,7 @@ EOF
        IFS="$save_ifs"
 
        # Restore the uninstalled library and exit
-       if test "$mode" = relink &&
-          test "$hardcode_into_libs" = yes &&
-          test "$shlibpath_overrides_runpath" != yes; then
+       if test "$mode" = relink; then
          $run eval '(cd $output_objdir && $rm ${realname}T && $mv $realname ${realname}T && $mv "$realname"U $realname)' || exit $?
          exit 0
        fi
@@ -3380,9 +3372,7 @@ static const void *lt_preloaded_setup() {
        exit 0
       fi
 
-      if test "$hardcode_action" = relink ||
-         { test "$hardcode_into_libs" = yes &&
-          test "$shlibpath_overrides_runpath" != yes; }; then
+      if test "$hardcode_action" = relink; then
        # Fast installation is not supported
        link_command="$compile_var$compile_command$compile_rpath"
        relink_command="$finalize_var$finalize_command$finalize_rpath"
@@ -3838,9 +3828,7 @@ dlpreopen='$dlprefiles'
 
 # Directory that this library needs to be installed in:
 libdir='$install_libdir'"
-         if test "$hardcode_into_libs" = yes &&
-            test "$shlibpath_overrides_runpath" != yes &&
-            test "$installed" = no && test $need_relink = yes; then
+         if test "$installed" = no && test $need_relink = yes; then
            $echo >> $output "\
 relink_command=\"$relink_command\""
          fi
@@ -4050,9 +4038,7 @@ relink_command=\"$relink_command\""
        test "X$dir" = "X$file/" && dir=
        dir="$dir$objdir"
 
-       if test "$hardcode_into_libs" = yes &&
-          test "$shlibpath_overrides_runpath" != yes &&
-          test -n "$relink_command"; then
+       if test -n "$relink_command"; then
          $echo "$modename: warning: relinking \`$file'" 1>&2
          $show "$relink_command"
          if $run eval "$relink_command"; then :
@@ -4070,8 +4056,6 @@ relink_command=\"$relink_command\""
          shift
 
          srcname="$realname"
-         test "$hardcode_into_libs" = yes &&
-         test "$shlibpath_overrides_runpath" != yes &&
          test -n "$relink_command" && srcname="$realname"T
 
          # Install the shared library and build the symlinks.

diff --git a/mdemo/Makefile.am b/mdemo/Makefile.am
index 0453e9f0464cef34ac6e0ae16218004b24c0dbfc..35c02d4d6c91eab43d6d740596d8376b3c7863d1 100644 (file)
--- a/mdemo/Makefile.am
+++ b/mdemo/Makefile.am
@@ -6,7 +6,7 @@ INCLUDES = $(INCLTDL)
 
 EXTRA_DIST = acinclude.m4
 
-lib_LTLIBRARIES = foo1.la libfoo2.la libsub.la
+lib_LTLIBRARIES = libsub.la foo1.la libfoo2.la
 
 foo1_la_SOURCES = foo1.c
 foo1_la_LIBADD = $(LIBM)

diff --git a/tests/build-relink.test b/tests/build-relink.test
index 5050519e238af872a3b7a10a08285e87df63413b..00427703efa17c71be888d56dd9456a4cb7a24e3 100755 (executable)
--- a/tests/build-relink.test
+++ b/tests/build-relink.test
@@ -99,9 +99,7 @@ else
   echo "Failed, as expected"
 fi
 
-if test "x$hardcode_action" = xrelink ||
-   { test "x$hardcode_into_libs" = xyes &&
-     test "x$shlibpath_overrides_runpath" != xyes; }; then
+if test "x$hardcode_action" = xrelink; then
   echo "= Exiting: install-time relinking is required"
   exit 0
 fi

diff --git a/tests/build-relink2.test b/tests/build-relink2.test
index c842e5b54aeba090f41f3e7da70526f2bb2a5db2..d0b560e07133a0834108d71de92705c019f016db 100755 (executable)
--- a/tests/build-relink2.test
+++ b/tests/build-relink2.test
@@ -99,9 +99,7 @@ else
   echo "Failed, as expected"
 fi
 
-if test "x$hardcode_action" = xrelink ||
-   { test "x$hardcode_into_libs" = xyes &&
-     test "x$shlibpath_overrides_runpath" != xyes; }; then
+if test "x$hardcode_action" = xrelink; then
   echo "= Exiting: install-time relinking is required"
   exit 0
 fi