* configure.in: Set and substitute HLDENV.

	* configure: Rebuild.
	* Makefile.in (HLDENV): New variable.
	(gprof): Use $(HLDENV).

diff --git a/gprof/ChangeLog b/gprof/ChangeLog
index 78a3d0587a7a9a6754cf60f18c569bdd57400f7f..98c23a8450ac41b203525e653909d9ee9cc51370 100644 (file)
--- a/gprof/ChangeLog
+++ b/gprof/ChangeLog
@@ -1,3 +1,10 @@
+Thu Aug 22 17:12:30 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+       * configure.in: Set and substitute HLDENV.
+       * configure: Rebuild.
+       * Makefile.in (HLDENV): New variable.
+       (gprof): Use $(HLDENV).
+
 Wed Aug  7 14:43:51 1996  Philippe De Muyter  <phdm@info.ucl.ac.be>
 
        * core.c (read_function_mappings): Cast xmalloc return.

diff --git a/gprof/Makefile.in b/gprof/Makefile.in
index c4507a369de4273b498832a3be373f7e79140ecc..a9bce7a30633ce5b8a6c3219f5bd50ffcaa35bbb 100644 (file)
--- a/gprof/Makefile.in
+++ b/gprof/Makefile.in
@@ -54,6 +54,7 @@ GEN_FILES = flat_bl.c bsd_callg_bl.c fsf_callg_bl.c
 CFLAGS=-g -DDEBUG
 LDFLAGS=
 HLDFLAGS = @HLDFLAGS@
+HLDENV = @HLDENV@
 .c.o:
        $(CC) -c $(CFLAGS) -I. -I$(srcdir) -I../bfd -I$(srcdir)/../include -I$(srcdir)/../bfd -DMACHINE_H=\"$(MY_TARGET).h\" $(TCFLAGS) $(HCFLAGS) $<
 
@@ -103,7 +104,7 @@ install: all
        $(INSTALL_XFORM1) $(srcdir)/gprof.1 $(man1dir)/gprof.1
 
 gprof: $(OBJS) $(LIBDEPS)
-       $(CC) -o $(PROG) $(CFLAGS) $(HLDFLAGS) $(LDFLAGS) $(OBJS) $(LIBS)
+       $(HLDENV) $(CC) -o $(PROG) $(CFLAGS) $(HLDFLAGS) $(LDFLAGS) $(OBJS) $(LIBS)
 
 mostlyclean:
        -rm -f *.o core gprof nohup.out \

diff --git a/gprof/configure b/gprof/configure
index e1aed82a46e64dbf539496c6cb6c6108fbc9da3e..d032cd039b75f0d3cff4977d197c1f5c1c0412a3 100755 (executable)
--- a/gprof/configure
+++ b/gprof/configure
@@ -894,6 +894,7 @@ esac
 
 
 HLDFLAGS=
+HLDENV=
 # If we have shared libraries, try to set rpath reasonably.
 if test "${shared}" = "true"; then
   case "${host}" in
@@ -908,9 +909,12 @@ if test "${shared}" = "true"; then
   *-*-linux*)
     HLDFLAGS='-Wl,-rpath,$(libdir)'
     ;;
-  *-*-sysv4* | *-*-solaris*)
+  *-*-solaris*)
     HLDFLAGS='-R $(libdir)'
     ;;
+  *-*-sysv4*)
+    HLDENV='if test -z "$${LD_RUN_PATH}"; then LD_RUN_PATH=$(libdir); else LD_RUN_PATH=$${LD_RUN_PATH}:$(libdir); fi; export LD_RUN_PATH;'
+    ;;
   esac
 fi
 
@@ -937,6 +941,7 @@ case "${host}" in
 esac
 
 
+
 trap '' 1 2 15
 cat > confcache <<\EOF
 # This file is a shell script that caches the results of configure
@@ -1087,6 +1092,7 @@ s%@build_os@%$build_os%g
 s%@MY_TARGET@%$MY_TARGET%g
 s%@BFDLIB@%$BFDLIB%g
 s%@HLDFLAGS@%$HLDFLAGS%g
+s%@HLDENV@%$HLDENV%g
 
 CEOF
 EOF

diff --git a/gprof/configure.in b/gprof/configure.in
index 21409d5beb9447286401dc5afe8457973c3dc350..82fde9cc9ab20b4f56688662a4a482c7af61407e 100644 (file)
--- a/gprof/configure.in
+++ b/gprof/configure.in
@@ -60,6 +60,7 @@ esac
 AC_SUBST(BFDLIB)
 
 HLDFLAGS=
+HLDENV=
 # If we have shared libraries, try to set rpath reasonably.
 if test "${shared}" = "true"; then
   case "${host}" in
@@ -74,9 +75,12 @@ if test "${shared}" = "true"; then
   *-*-linux*)
     HLDFLAGS='-Wl,-rpath,$(libdir)'
     ;;
-  *-*-sysv4* | *-*-solaris*)
+  *-*-solaris*)
     HLDFLAGS='-R $(libdir)'
     ;;
+  *-*-sysv4*)
+    HLDENV='if test -z "$${LD_RUN_PATH}"; then LD_RUN_PATH=$(libdir); else LD_RUN_PATH=$${LD_RUN_PATH}:$(libdir); fi; export LD_RUN_PATH;'
+    ;;
   esac
 fi
 
@@ -102,5 +106,6 @@ case "${host}" in
     ;;
 esac
 AC_SUBST(HLDFLAGS)
+AC_SUBST(HLDENV)
 
 AC_OUTPUT(Makefile)