Remove unused variables sys_lib_search_path_spec, sys_lib_dlsearch_path_spec.

diff --git a/autoconf-lib-link/ChangeLog b/autoconf-lib-link/ChangeLog
index 2141a2f95ec414b3de3a0f15331ae24581dc0afe..a9fe0ded1cacde680fa9f59eefca922e39708f62 100644 (file)
--- a/autoconf-lib-link/ChangeLog
+++ b/autoconf-lib-link/ChangeLog
@@ -1,3 +1,8 @@
+2003-04-24  Bruno Haible  <bruno@clisp.org>
+
+       * config.rpath: Don't set sys_lib_search_path_spec and
+       sys_lib_dlsearch_path_spec.
+
 2003-02-28  Bruno Haible  <bruno@clisp.org>
 
        Support for relocatable installation.

diff --git a/autoconf-lib-link/config.rpath b/autoconf-lib-link/config.rpath
index 26c997d3c54aabdf37c3b1423096ec73f504411b..ff4b3b9a20d1ed09d6c0745d04568e241052ad24 100755 (executable)
--- a/autoconf-lib-link/config.rpath
+++ b/autoconf-lib-link/config.rpath
@@ -2,7 +2,7 @@
 # Output a system dependent set of variables, describing how to set the
 # run time search path of shared libraries in an executable.
 #
-#   Copyright 1996-2002 Free Software Foundation, Inc.
+#   Copyright 1996-2003 Free Software Foundation, Inc.
 #   Taken from GNU libtool, 2001
 #   Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
 #
@@ -358,8 +358,6 @@ fi
 
 # Check dynamic linker characteristics
 libname_spec='lib$name'
-sys_lib_dlsearch_path_spec="/lib /usr/lib"
-sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
 case "$host_os" in
   aix3*)
     shlibext=so
@@ -375,8 +373,6 @@ case "$host_os" in
     ;;
   bsdi4*)
     shlibext=so
-    sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
-    sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
     ;;
   cygwin* | mingw* | pw32*)
     case $GCC,$host_os in
@@ -385,7 +381,6 @@ case "$host_os" in
         ;;
       yes,mingw*)
         shlibext=dll
-        sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | sed -e "s/^libraries://" -e "s/;/ /g" -e "s,=/,/,g"`
         ;;
       yes,pw32*)
         shlibext=dll
@@ -424,8 +419,6 @@ case "$host_os" in
         esac
         ;;
     esac
-    sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
-    sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
     ;;
   linux-gnuoldld* | linux-gnuaout* | linux-gnucoff*)
     ;;
@@ -447,8 +440,6 @@ case "$host_os" in
     ;;
   osf3* | osf4* | osf5*)
     shlibext=so
-    sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
-    sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
     ;;
   sco3.2v5*)
     shlibext=so
@@ -461,11 +452,6 @@ case "$host_os" in
     ;;
   sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
     shlibext=so
-    case "$host_vendor" in
-      motorola)
-        sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
-        ;;
-    esac
     ;;
   uts4*)
     shlibext=so
@@ -483,8 +469,6 @@ esac
 sed_quote_subst='s/\(["`$\\]\)/\\\1/g'
 escaped_wl=`echo "X$wl" | sed -e 's/^X//' -e "$sed_quote_subst"`
 escaped_hardcode_libdir_flag_spec=`echo "X$hardcode_libdir_flag_spec" | sed -e 's/^X//' -e "$sed_quote_subst"`
-escaped_sys_lib_search_path_spec=`echo "X$sys_lib_search_path_spec" | sed -e 's/^X//' -e "$sed_quote_subst"`
-escaped_sys_lib_dlsearch_path_spec=`echo "X$sys_lib_dlsearch_path_spec" | sed -e 's/^X//' -e "$sed_quote_subst"`
 
 sed -e 's/^\([a-zA-Z0-9_]*\)=/acl_cv_\1=/' <<EOF
 
@@ -512,10 +496,4 @@ hardcode_direct="$hardcode_direct"
 # resulting binary.
 hardcode_minus_L="$hardcode_minus_L"
 
-# Compile-time system search path for libraries
-sys_lib_search_path_spec="$escaped_sys_lib_search_path_spec"
-
-# Run-time system search path for libraries
-sys_lib_dlsearch_path_spec="$escaped_sys_lib_dlsearch_path_spec"
-
 EOF

diff --git a/autoconf-lib-link/m4/ChangeLog b/autoconf-lib-link/m4/ChangeLog
index 70a579b123f339a59c0ed304e822236b4097aee7..b59773d3aa3a28204e53e1cf79d21ba3e33669d7 100644 (file)
--- a/autoconf-lib-link/m4/ChangeLog
+++ b/autoconf-lib-link/m4/ChangeLog
@@ -1,3 +1,8 @@
+2003-04-24  Bruno Haible  <bruno@clisp.org>
+
+       * lib-link.m4 (AC_LIB_RPATH): Don't set sys_lib_search_path_spec and
+       sys_lib_dlsearch_path_spec.
+
 2003-02-16  Bruno Haible  <bruno@clisp.org>
 
        Workaround autoconf >= 2.52 breakage.

diff --git a/autoconf-lib-link/m4/lib-link.m4 b/autoconf-lib-link/m4/lib-link.m4
index 74a86877240b3cdedcf6c0b59c788104eb1f4d64..eeb200d266db84b74456a376eabd7cb6f365fbb3 100644 (file)
--- a/autoconf-lib-link/m4/lib-link.m4
+++ b/autoconf-lib-link/m4/lib-link.m4
@@ -92,8 +92,7 @@ AC_DEFUN([AC_LIB_HAVE_LINKFLAGS],
 
 dnl Determine the platform dependent parameters needed to use rpath:
 dnl libext, shlibext, hardcode_libdir_flag_spec, hardcode_libdir_separator,
-dnl hardcode_direct, hardcode_minus_L,
-dnl sys_lib_search_path_spec, sys_lib_dlsearch_path_spec.
+dnl hardcode_direct, hardcode_minus_L.
 AC_DEFUN([AC_LIB_RPATH],
 [
   AC_REQUIRE([AC_PROG_CC])                dnl we use $CC, $GCC, $LDFLAGS
@@ -114,8 +113,6 @@ AC_DEFUN([AC_LIB_RPATH],
   hardcode_libdir_separator="$acl_cv_hardcode_libdir_separator"
   hardcode_direct="$acl_cv_hardcode_direct"
   hardcode_minus_L="$acl_cv_hardcode_minus_L"
-  sys_lib_search_path_spec="$acl_cv_sys_lib_search_path_spec"
-  sys_lib_dlsearch_path_spec="$acl_cv_sys_lib_dlsearch_path_spec"
   dnl Determine whether the user wants rpath handling at all.
   AC_ARG_ENABLE(rpath,
     [  --disable-rpath         do not hardcode runtime library paths],

diff --git a/config/config.rpath b/config/config.rpath
index 26c997d3c54aabdf37c3b1423096ec73f504411b..ff4b3b9a20d1ed09d6c0745d04568e241052ad24 100755 (executable)
--- a/config/config.rpath
+++ b/config/config.rpath
@@ -2,7 +2,7 @@
 # Output a system dependent set of variables, describing how to set the
 # run time search path of shared libraries in an executable.
 #
-#   Copyright 1996-2002 Free Software Foundation, Inc.
+#   Copyright 1996-2003 Free Software Foundation, Inc.
 #   Taken from GNU libtool, 2001
 #   Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
 #
@@ -358,8 +358,6 @@ fi
 
 # Check dynamic linker characteristics
 libname_spec='lib$name'
-sys_lib_dlsearch_path_spec="/lib /usr/lib"
-sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
 case "$host_os" in
   aix3*)
     shlibext=so
@@ -375,8 +373,6 @@ case "$host_os" in
     ;;
   bsdi4*)
     shlibext=so
-    sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
-    sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
     ;;
   cygwin* | mingw* | pw32*)
     case $GCC,$host_os in
@@ -385,7 +381,6 @@ case "$host_os" in
         ;;
       yes,mingw*)
         shlibext=dll
-        sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | sed -e "s/^libraries://" -e "s/;/ /g" -e "s,=/,/,g"`
         ;;
       yes,pw32*)
         shlibext=dll
@@ -424,8 +419,6 @@ case "$host_os" in
         esac
         ;;
     esac
-    sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
-    sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
     ;;
   linux-gnuoldld* | linux-gnuaout* | linux-gnucoff*)
     ;;
@@ -447,8 +440,6 @@ case "$host_os" in
     ;;
   osf3* | osf4* | osf5*)
     shlibext=so
-    sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
-    sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
     ;;
   sco3.2v5*)
     shlibext=so
@@ -461,11 +452,6 @@ case "$host_os" in
     ;;
   sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
     shlibext=so
-    case "$host_vendor" in
-      motorola)
-        sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
-        ;;
-    esac
     ;;
   uts4*)
     shlibext=so
@@ -483,8 +469,6 @@ esac
 sed_quote_subst='s/\(["`$\\]\)/\\\1/g'
 escaped_wl=`echo "X$wl" | sed -e 's/^X//' -e "$sed_quote_subst"`
 escaped_hardcode_libdir_flag_spec=`echo "X$hardcode_libdir_flag_spec" | sed -e 's/^X//' -e "$sed_quote_subst"`
-escaped_sys_lib_search_path_spec=`echo "X$sys_lib_search_path_spec" | sed -e 's/^X//' -e "$sed_quote_subst"`
-escaped_sys_lib_dlsearch_path_spec=`echo "X$sys_lib_dlsearch_path_spec" | sed -e 's/^X//' -e "$sed_quote_subst"`
 
 sed -e 's/^\([a-zA-Z0-9_]*\)=/acl_cv_\1=/' <<EOF
 
@@ -512,10 +496,4 @@ hardcode_direct="$hardcode_direct"
 # resulting binary.
 hardcode_minus_L="$hardcode_minus_L"
 
-# Compile-time system search path for libraries
-sys_lib_search_path_spec="$escaped_sys_lib_search_path_spec"
-
-# Run-time system search path for libraries
-sys_lib_dlsearch_path_spec="$escaped_sys_lib_dlsearch_path_spec"
-
 EOF