From 6d76ebb8d9d035671a5e77c1d3f811ce8353d0f2 Mon Sep 17 00:00:00 2001 From: Bill Wendling <wendling@ncsa.uiuc.edu> Date: Thu, 12 Apr 2001 14:42:26 -0500 Subject: [svn-r3805] 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 --- c++/config/commence.in | 2 +- config/commence.in | 2 +- fortran/config/commence.in | 2 +- 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 c212a37..37f8131 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..c2488df 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) $(LT_STATIC_EXEC) -rpath $(libdir) $(DYNAMIC_DIRS) LT_LINK_CEXE=$(LT) --mode=link $(CC) $(DYNAMIC_DIRS) -rpath $(bindir) LT_RUN=$(LT) --mode=execute LT_INSTALL_PROG=$(LT) --mode=install $(INSTALL_PROGRAM) -- cgit v0.12