diff --git a/src/configure b/src/configure
index 098e32891..b3ddb625a 100755
--- a/src/configure
+++ b/src/configure
@@ -4076,7 +4076,7 @@ TARGETS="ecl${EXEEXT}"
 LIBRARIES=""
 LSP_LIBRARIES="libecl.a"
 SUBDIR=c
-CLIBS="-lecl ${CLIBS} -lgmp -lm"
+CLIBS="${CLIBS} -lgmp -lm"
 if test ${boehm} = "no" ; then
   EXTRA_OBJS="${EXTRA_OBJS} alloc.o gbc.o"
 else
@@ -4087,7 +4087,6 @@ else
   else
     BOEHM_HEADERS=""
   fi
-  CLIBS="-lgc ${CLIBS}"
   EXTRA_OBJS="${EXTRA_OBJS} alloc_2.o"
   cat >>confdefs.h <<\_ACEOF
 #define GBC_BOEHM 1
@@ -4099,8 +4098,9 @@ if test ${shared} = "yes"; then
 #define ENABLE_DLOPEN 1
 _ACEOF
 
-  LSP_LIBRARIES="libecl.so"
-  LDFLAGS="${LDRPATH} ${LDFLAGS}"
+  LSP_LIBRARIES="${LSP_LIBRARIES} libecl.so"
+else
+  LDRPATH='~*'
 fi
 if test ${local_gmp} = "no" ; then
   LIBRARIES="${LIBRARIES} libgmp.a"
diff --git a/src/configure.in b/src/configure.in
index 93fadfc48..5dd4dcd19 100644
--- a/src/configure.in
+++ b/src/configure.in
@@ -180,6 +180,8 @@ fi
 if test ${shared} = "yes"; then
   AC_DEFINE(ENABLE_DLOPEN)
   LSP_LIBRARIES="${LSP_LIBRARIES} libecl.so"
+else
+  LDRPATH='~*'
 fi
 if test ${local_gmp} = "no" ; then
   LIBRARIES="${LIBRARIES} libgmp.a"