diff --git a/configure b/configure
index f992b8e8d8..578ea7deeb 100755
--- a/configure
+++ b/configure
@@ -7893,7 +7893,7 @@ LIBTOOL='$(SHELL) $(top_builddir)/libtool'
 
 
 LTSTATIC=""
-if test "${OPENLDAP_CVS}"; then
+if test -z "$LTDYNAMIC" -a "${OPENLDAP_CVS}"; then
 	LTSTATIC="-static"
 fi
 
diff --git a/configure.in b/configure.in
index 45a36c81a8..4ae5aacb9f 100644
--- a/configure.in
+++ b/configure.in
@@ -659,7 +659,7 @@ AC_LIBTOOL_DLOPEN
 AC_PROG_LIBTOOL
 
 LTSTATIC=""
-if test "${OPENLDAP_CVS}"; then
+if test -z "$LTDYNAMIC" -a "${OPENLDAP_CVS}"; then
 	LTSTATIC="-static"
 fi
 AC_SUBST(LTSTATIC)dnl