@@ -112,22 +112,24 @@
 		])
 
 		LDFLAGS="$OLD_LDFLAGS"
 		unset OLD_LDFLAGS
 
-		ADDLDFLAGS=""
-		for opt in $LDFLAGS $LIBS; do
-			if echo "$opt" | grep '^-L' >/dev/null; then
-				rpathdir="`echo "$opt" | sed 's@^-L *@@'`"
-				ADDLDFLAGS="$ADDLDFLAGS $rsk_cv_link_set_rpath -Wl,$rpathdir"
-			fi
-		done
-		unset opt
-
-		LDFLAGS="$LDFLAGS $ADDLDFLAGS"
-
-		unset ADDLDFLAGS
+		if test -n "$rsk_cv_link_set_rpath"; then
+			ADDLDFLAGS=""
+			for opt in $LDFLAGS $LIBS; do
+				if echo "$opt" | grep '^-L' >/dev/null; then
+					rpathdir="`echo "$opt" | sed 's@^-L *@@'`"
+					ADDLDFLAGS="$ADDLDFLAGS $rsk_cv_link_set_rpath -Wl,$rpathdir"
+				fi
+			done
+			unset opt
+
+			LDFLAGS="$LDFLAGS $ADDLDFLAGS"
+
+			unset ADDLDFLAGS
+		fi
 	fi
 ])
 
 AC_DEFUN([DC_CHK_OS_INFO], [
 	AC_CANONICAL_HOST
@@ -162,11 +164,10 @@
 						;;
 				esac
 				;;
 			mingw32|mingw32msvc*)
 				SHOBJEXT="dll"
-				AREXT='lib'
 				CFLAGS="$CFLAGS -mms-bitfields"
 				CPPFLAGS="$CPPFLAGS -mms-bitfields"
 				SHOBJCPPFLAGS="-DPIC"
 				SHOBJLDFLAGS='-shared -Wl,--dll -Wl,--enable-auto-image-base -Wl,--output-def,$[@].def,--out-implib,$[@].a'
 				;;