* configure.in: Substitute RPATH_ENVVAR.
* configure: Rebuild. * Makefile.in (RPATH_ENVVAR): New variable. (check): Use $(RPATH_ENVVAR) rather than LD_LIBRARY_PATH.
This commit is contained in:
parent
b5e4f36959
commit
efa864530f
|
@ -1,5 +1,10 @@
|
||||||
Thu Feb 15 12:44:45 1996 Ian Lance Taylor <ian@cygnus.com>
|
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
|
* objcopy.c (smart_rename): Rather than doing chmod then chown, do
|
||||||
chmod without setuid, then chown, then chmod with setuid.
|
chmod without setuid, then chown, then chmod with setuid.
|
||||||
|
|
||||||
|
|
|
@ -58,6 +58,7 @@ CC = @CC@
|
||||||
CFLAGS = @CFLAGS@
|
CFLAGS = @CFLAGS@
|
||||||
LDFLAGS = @LDFLAGS@
|
LDFLAGS = @LDFLAGS@
|
||||||
HLDFLAGS = @HLDFLAGS@
|
HLDFLAGS = @HLDFLAGS@
|
||||||
|
RPATH_ENVVAR = @RPATH_ENVVAR@
|
||||||
MAKEINFO = makeinfo
|
MAKEINFO = makeinfo
|
||||||
TEXI2DVI = texi2dvi
|
TEXI2DVI = texi2dvi
|
||||||
RANLIB = ranlib
|
RANLIB = ranlib
|
||||||
|
@ -229,8 +230,8 @@ check: site.exp
|
||||||
r=`pwd`; export r ; \
|
r=`pwd`; export r ; \
|
||||||
srcroot=`cd ${srcdir}; pwd` ; export srcroot ; \
|
srcroot=`cd ${srcdir}; pwd` ; export srcroot ; \
|
||||||
EXPECT=${EXPECT} ; export EXPECT ; \
|
EXPECT=${EXPECT} ; export EXPECT ; \
|
||||||
LD_LIBRARY_PATH=$$r/../bfd:$$r/../opcodes:$$LD_LIBRARY_PATH; \
|
$(RPATH_ENVVAR)=$$r/../bfd:$$r/../opcodes:$$$(RPATH_ENVVAR); \
|
||||||
export LD_LIBRARY_PATH; \
|
export $(RPATH_ENVVAR); \
|
||||||
if [ -f $$r/../expect/expect ] ; then \
|
if [ -f $$r/../expect/expect ] ; then \
|
||||||
TCL_LIBRARY=$${srcroot}/../tcl/library ; \
|
TCL_LIBRARY=$${srcroot}/../tcl/library ; \
|
||||||
export TCL_LIBRARY ; else true; fi ; \
|
export TCL_LIBRARY ; else true; fi ; \
|
||||||
|
|
|
@ -678,6 +678,7 @@ test "$program_transform_name" = "" && program_transform_name="s,x,x,"
|
||||||
HDEFINES=
|
HDEFINES=
|
||||||
LDFLAGS=
|
LDFLAGS=
|
||||||
HLDFLAGS=
|
HLDFLAGS=
|
||||||
|
RPATH_ENVVAR=LD_LIBRARY_PATH
|
||||||
|
|
||||||
. ${srcdir}/../bfd/configure.host
|
. ${srcdir}/../bfd/configure.host
|
||||||
|
|
||||||
|
@ -760,6 +761,7 @@ fi
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
AR=${AR-ar}
|
AR=${AR-ar}
|
||||||
|
|
||||||
# Extract the first word of "ranlib", so it can be a program name with args.
|
# 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
|
ac_cv_c_cross=yes
|
||||||
else
|
else
|
||||||
cat > conftest.$ac_ext <<EOF
|
cat > conftest.$ac_ext <<EOF
|
||||||
#line 881 "configure"
|
#line 883 "configure"
|
||||||
#include "confdefs.h"
|
#include "confdefs.h"
|
||||||
main(){return(0);}
|
main(){return(0);}
|
||||||
EOF
|
EOF
|
||||||
|
@ -919,7 +921,7 @@ else
|
||||||
# On the NeXT, cc -E runs the code through the compiler's parser,
|
# On the NeXT, cc -E runs the code through the compiler's parser,
|
||||||
# not just through cpp.
|
# not just through cpp.
|
||||||
cat > conftest.$ac_ext <<EOF
|
cat > conftest.$ac_ext <<EOF
|
||||||
#line 923 "configure"
|
#line 925 "configure"
|
||||||
#include "confdefs.h"
|
#include "confdefs.h"
|
||||||
#include <assert.h>
|
#include <assert.h>
|
||||||
Syntax Error
|
Syntax Error
|
||||||
|
@ -933,7 +935,7 @@ else
|
||||||
rm -rf conftest*
|
rm -rf conftest*
|
||||||
CPP="${CC-cc} -E -traditional-cpp"
|
CPP="${CC-cc} -E -traditional-cpp"
|
||||||
cat > conftest.$ac_ext <<EOF
|
cat > conftest.$ac_ext <<EOF
|
||||||
#line 937 "configure"
|
#line 939 "configure"
|
||||||
#include "confdefs.h"
|
#include "confdefs.h"
|
||||||
#include <assert.h>
|
#include <assert.h>
|
||||||
Syntax Error
|
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
|
echo $ac_n "(cached) $ac_c" 1>&6
|
||||||
else
|
else
|
||||||
cat > conftest.$ac_ext <<EOF
|
cat > conftest.$ac_ext <<EOF
|
||||||
#line 970 "configure"
|
#line 972 "configure"
|
||||||
#include "confdefs.h"
|
#include "confdefs.h"
|
||||||
#include <$ac_hdr>
|
#include <$ac_hdr>
|
||||||
EOF
|
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
|
echo $ac_n "(cached) $ac_c" 1>&6
|
||||||
else
|
else
|
||||||
cat > conftest.$ac_ext <<EOF
|
cat > conftest.$ac_ext <<EOF
|
||||||
#line 1003 "configure"
|
#line 1005 "configure"
|
||||||
#include "confdefs.h"
|
#include "confdefs.h"
|
||||||
#include <sys/types.h>
|
#include <sys/types.h>
|
||||||
#include <sys/wait.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
|
echo $ac_n "(cached) $ac_c" 1>&6
|
||||||
else
|
else
|
||||||
cat > conftest.$ac_ext <<EOF
|
cat > conftest.$ac_ext <<EOF
|
||||||
#line 1046 "configure"
|
#line 1048 "configure"
|
||||||
#include "confdefs.h"
|
#include "confdefs.h"
|
||||||
/* System header to define __stub macros and hopefully few prototypes,
|
/* System header to define __stub macros and hopefully few prototypes,
|
||||||
which can conflict with char $ac_func(); below. */
|
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
|
echo $ac_n "(cached) $ac_c" 1>&6
|
||||||
else
|
else
|
||||||
cat > conftest.$ac_ext <<EOF
|
cat > conftest.$ac_ext <<EOF
|
||||||
#line 1096 "configure"
|
#line 1098 "configure"
|
||||||
#include "confdefs.h"
|
#include "confdefs.h"
|
||||||
#include <time.h>
|
#include <time.h>
|
||||||
int main() { return 0; }
|
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
|
echo $ac_n "(cached) $ac_c" 1>&6
|
||||||
else
|
else
|
||||||
cat > conftest.$ac_ext <<EOF
|
cat > conftest.$ac_ext <<EOF
|
||||||
#line 1128 "configure"
|
#line 1130 "configure"
|
||||||
#include "confdefs.h"
|
#include "confdefs.h"
|
||||||
#include <sys/types.h>
|
#include <sys/types.h>
|
||||||
int main() { return 0; }
|
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
|
echo $ac_n "(cached) $ac_c" 1>&6
|
||||||
else
|
else
|
||||||
cat > conftest.$ac_ext <<EOF
|
cat > conftest.$ac_ext <<EOF
|
||||||
#line 1162 "configure"
|
#line 1164 "configure"
|
||||||
#include "confdefs.h"
|
#include "confdefs.h"
|
||||||
#include <sys/types.h>
|
#include <sys/types.h>
|
||||||
#ifdef HAVE_TIME_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
|
echo $ac_n "(cached) $ac_c" 1>&6
|
||||||
else
|
else
|
||||||
cat > conftest.$ac_ext <<EOF
|
cat > conftest.$ac_ext <<EOF
|
||||||
#line 1198 "configure"
|
#line 1200 "configure"
|
||||||
#include "confdefs.h"
|
#include "confdefs.h"
|
||||||
|
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
|
@ -1458,6 +1460,7 @@ s%@build_os@%$build_os%g
|
||||||
s%@CC@%$CC%g
|
s%@CC@%$CC%g
|
||||||
s%@HDEFINES@%$HDEFINES%g
|
s%@HDEFINES@%$HDEFINES%g
|
||||||
s%@HLDFLAGS@%$HLDFLAGS%g
|
s%@HLDFLAGS@%$HLDFLAGS%g
|
||||||
|
s%@RPATH_ENVVAR@%$RPATH_ENVVAR%g
|
||||||
s%@AR@%$AR%g
|
s%@AR@%$AR%g
|
||||||
s%@RANLIB@%$RANLIB%g
|
s%@RANLIB@%$RANLIB%g
|
||||||
s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g
|
s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g
|
||||||
|
|
|
@ -36,6 +36,7 @@ AC_ARG_PROGRAM
|
||||||
HDEFINES=
|
HDEFINES=
|
||||||
LDFLAGS=
|
LDFLAGS=
|
||||||
HLDFLAGS=
|
HLDFLAGS=
|
||||||
|
RPATH_ENVVAR=LD_LIBRARY_PATH
|
||||||
|
|
||||||
. ${srcdir}/../bfd/configure.host
|
. ${srcdir}/../bfd/configure.host
|
||||||
|
|
||||||
|
@ -44,6 +45,7 @@ AC_SUBST(CFLAGS)
|
||||||
AC_SUBST(HDEFINES)
|
AC_SUBST(HDEFINES)
|
||||||
AC_SUBST(LDFLAGS)
|
AC_SUBST(LDFLAGS)
|
||||||
AC_SUBST(HLDFLAGS)
|
AC_SUBST(HLDFLAGS)
|
||||||
|
AC_SUBST(RPATH_ENVVAR)
|
||||||
AR=${AR-ar}
|
AR=${AR-ar}
|
||||||
AC_SUBST(AR)
|
AC_SUBST(AR)
|
||||||
AC_PROG_RANLIB
|
AC_PROG_RANLIB
|
||||||
|
|
Loading…
Reference in New Issue