summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBill Wendling <wendling@ncsa.uiuc.edu>2001-04-12 19:39:13 (GMT)
committerBill Wendling <wendling@ncsa.uiuc.edu>2001-04-12 19:39:13 (GMT)
commitef461a845410afe593a2b3a3854ea7d38c81408b (patch)
tree02b0c0096ffa6a83fa3c57cbe62ca5cfab846dda
parent365b06f606dac49dd7f09e5defdb7fff6c48efd3 (diff)
downloadhdf5-ef461a845410afe593a2b3a3854ea7d38c81408b.zip
hdf5-ef461a845410afe593a2b3a3854ea7d38c81408b.tar.gz
hdf5-ef461a845410afe593a2b3a3854ea7d38c81408b.tar.bz2
[svn-r3804] Purpose:
Bug Fix Description: If we need to specify a -R flag for dynamic libraries (like, in the case when we specify --with-hdf4), then this flag needs to be added to the linking line so that it will show up in the generated library and other programs linking to that library will be able to find the relevant libraries. Solution: Added the DYNAMIC_DIRS macro to the link line. Platforms tested: Arabica
-rw-r--r--c++/config/commence.in2
-rw-r--r--config/commence.in2
-rw-r--r--fortran/config/commence.in2
3 files changed, 3 insertions, 3 deletions
diff --git a/c++/config/commence.in b/c++/config/commence.in
index a6a3237..dcc4fc8 100644
--- a/c++/config/commence.in
+++ b/c++/config/commence.in
@@ -44,7 +44,7 @@ LT_STATIC_EXEC=@LT_STATIC_EXEC@
DYNAMIC_DIRS=@DYNAMIC_DIRS@
LT=$(top_builddir)/libtool
LT_COMPILE=$(LT) --mode=compile $(CXX)
-LT_LINK_LIB=$(LT) --mode=link $(CXX) -static -rpath $(libdir)
+LT_LINK_LIB=$(LT) --mode=link $(CXX) -static -rpath $(libdir) $(DYNAMIC_DIRS)
LT_LINK_EXE=$(LT) --mode=link $(CXX) $(LT_STATIC_EXEC) -dlopen self -static -rpath $(bindir) $(DYNAMIC_DIRS)
LT_RUN=$(LT) --mode=execute
LT_INSTALL_PROG=$(LT) --mode=install $(INSTALL_PROGRAM)
diff --git a/config/commence.in b/config/commence.in
index 1b32fa9..fdd11a6 100644
--- a/config/commence.in
+++ b/config/commence.in
@@ -46,7 +46,7 @@ LT_STATIC_EXEC=@LT_STATIC_EXEC@
DYNAMIC_DIRS=@DYNAMIC_DIRS@
LT=$(top_builddir)/libtool
LT_COMPILE=$(LT) --mode=compile $(CC)
-LT_LINK_LIB=$(LT) --mode=link $(CC) -rpath $(libdir)
+LT_LINK_LIB=$(LT) --mode=link $(CC) -rpath $(libdir) $(DYNAMIC_DIRS)
LT_LINK_EXE=$(LT) --mode=link $(CC) $(LT_STATIC_EXEC) -dlopen self -rpath $(bindir) $(DYNAMIC_DIRS)
LT_RUN=$(LT) --mode=execute
LT_INSTALL_PROG=$(LT) --mode=install $(INSTALL_PROGRAM)
diff --git a/fortran/config/commence.in b/fortran/config/commence.in
index 50105e0..83daa9d 100644
--- a/fortran/config/commence.in
+++ b/fortran/config/commence.in
@@ -50,7 +50,7 @@ LT_STATIC_EXEC=@LT_STATIC_EXEC@
DYNAMIC_DIRS=@DYNAMIC_DIRS@
LT=$(top_builddir)/libtool
LT_CCOMPILE=$(LT) --mode=compile $(CC)
-LT_LINK_CLIB=$(LT) --mode=link $(CC) $(LT_STATIC_EXEC) -rpath $(libdir)
+LT_LINK_CLIB=$(LT) --mode=link $(CC) $(DYNAMIC_DIRS) $(LT_STATIC_EXEC) -rpath $(libdir)
LT_LINK_CEXE=$(LT) --mode=link $(CC) $(DYNAMIC_DIRS) -rpath $(bindir)
LT_RUN=$(LT) --mode=execute
LT_INSTALL_PROG=$(LT) --mode=install $(INSTALL_PROGRAM)