* configure.in: Substitute RPATH_ENVVAR.

	* configure: Rebuild.
	* Makefile.in (RPATH_ENVVAR): New variable.
	(check): Use $(RPATH_ENVVAR) rather than LD_LIBRARY_PATH.

4 files changed, 23 insertions, 12 deletions

diff --git a/binutils/ChangeLog b/binutils/ChangeLog
index 9ce4d2a..a2cff49 100644
--- a/binutils/ChangeLog
+++ b/binutils/ChangeLog
@@ -1,5 +1,10 @@
 Thu Feb 15 12:44:45 1996  Ian Lance Taylor  <ian@cygnus.com>
 
+	* configure.in: Substitute RPATH_ENVVAR.
+	* configure: Rebuild.
+	* Makefile.in (RPATH_ENVVAR): New variable.
+	(check): Use $(RPATH_ENVVAR) rather than LD_LIBRARY_PATH.
+
 	* objcopy.c (smart_rename): Rather than doing chmod then chown, do
 	chmod without setuid, then chown, then chmod with setuid.
 
diff --git a/binutils/Makefile.in b/binutils/Makefile.in
index 454f1f6..c875c9a 100644
--- a/binutils/Makefile.in
+++ b/binutils/Makefile.in
@@ -58,6 +58,7 @@ CC = @CC@
 CFLAGS = @CFLAGS@
 LDFLAGS = @LDFLAGS@
 HLDFLAGS = @HLDFLAGS@
+RPATH_ENVVAR = @RPATH_ENVVAR@
 MAKEINFO = makeinfo
 TEXI2DVI = texi2dvi
 RANLIB = ranlib
@@ -229,8 +230,8 @@ check: site.exp
 	r=`pwd`; export r ; \
 	srcroot=`cd ${srcdir}; pwd` ; export srcroot ; \
 	EXPECT=${EXPECT} ; export EXPECT ; \
-	LD_LIBRARY_PATH=$$r/../bfd:$$r/../opcodes:$$LD_LIBRARY_PATH; \
-	export LD_LIBRARY_PATH; \
+	$(RPATH_ENVVAR)=$$r/../bfd:$$r/../opcodes:$$$(RPATH_ENVVAR); \
+	export $(RPATH_ENVVAR); \
 	if [ -f $$r/../expect/expect ] ; then  \
 	   TCL_LIBRARY=$${srcroot}/../tcl/library ; \
 	   export TCL_LIBRARY ; else true; fi ; \
diff --git a/binutils/configure b/binutils/configure
index e15e336..d9f44e5 100755
--- a/binutils/configure
+++ b/binutils/configure
@@ -678,6 +678,7 @@ test "$program_transform_name" = "" && program_transform_name="s,x,x,"
 HDEFINES=
 LDFLAGS=
 HLDFLAGS=
+RPATH_ENVVAR=LD_LIBRARY_PATH
 
 . ${srcdir}/../bfd/configure.host
 
@@ -760,6 +761,7 @@ fi
 
 
 
+
 AR=${AR-ar}
 
 # Extract the first word of "ranlib", so it can be a program name with args.
@@ -877,7 +879,7 @@ else
   ac_cv_c_cross=yes
 else
 cat > conftest.$ac_ext <<EOF
-#line 881 "configure"
+#line 883 "configure"
 #include "confdefs.h"
 main(){return(0);}
 EOF
@@ -919,7 +921,7 @@ else
   # On the NeXT, cc -E runs the code through the compiler's parser,
   # not just through cpp.
   cat > conftest.$ac_ext <<EOF
-#line 923 "configure"
+#line 925 "configure"
 #include "confdefs.h"
 #include <assert.h>
 Syntax Error
@@ -933,7 +935,7 @@ else
   rm -rf conftest*
   CPP="${CC-cc} -E -traditional-cpp"
   cat > conftest.$ac_ext <<EOF
-#line 937 "configure"
+#line 939 "configure"
 #include "confdefs.h"
 #include <assert.h>
 Syntax Error
@@ -966,7 +968,7 @@ if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 970 "configure"
+#line 972 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
@@ -999,7 +1001,7 @@ if eval "test \"`echo '$''{'ac_cv_header_sys_wait_h'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1003 "configure"
+#line 1005 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/wait.h>
@@ -1042,7 +1044,7 @@ if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1046 "configure"
+#line 1048 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -1092,7 +1094,7 @@ if eval "test \"`echo '$''{'bu_cv_decl_time_t_time_h'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1096 "configure"
+#line 1098 "configure"
 #include "confdefs.h"
 #include <time.h>
 int main() { return 0; }
@@ -1124,7 +1126,7 @@ if eval "test \"`echo '$''{'bu_cv_decl_time_t_types_h'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1128 "configure"
+#line 1130 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int main() { return 0; }
@@ -1158,7 +1160,7 @@ if eval "test \"`echo '$''{'bu_cv_header_utime_h'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1162 "configure"
+#line 1164 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #ifdef HAVE_TIME_H
@@ -1194,7 +1196,7 @@ if eval "test \"`echo '$''{'bfd_cv_decl_needed_fprintf'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1198 "configure"
+#line 1200 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -1458,6 +1460,7 @@ s%@build_os@%$build_os%g
 s%@CC@%$CC%g
 s%@HDEFINES@%$HDEFINES%g
 s%@HLDFLAGS@%$HLDFLAGS%g
+s%@RPATH_ENVVAR@%$RPATH_ENVVAR%g
 s%@AR@%$AR%g
 s%@RANLIB@%$RANLIB%g
 s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g
diff --git a/binutils/configure.in b/binutils/configure.in
index 710eedd..18e930e 100644
--- a/binutils/configure.in
+++ b/binutils/configure.in
@@ -36,6 +36,7 @@ AC_ARG_PROGRAM
 HDEFINES=
 LDFLAGS=
 HLDFLAGS=
+RPATH_ENVVAR=LD_LIBRARY_PATH
 
 . ${srcdir}/../bfd/configure.host
 
@@ -44,6 +45,7 @@ AC_SUBST(CFLAGS)
 AC_SUBST(HDEFINES)
 AC_SUBST(LDFLAGS)
 AC_SUBST(HLDFLAGS)
+AC_SUBST(RPATH_ENVVAR)
 AR=${AR-ar}
 AC_SUBST(AR)
 AC_PROG_RANLIB