diff --git a/m4/sharedlib.m4 b/m4/buildsys.m4
similarity index 95%
rename from m4/sharedlib.m4
rename to m4/buildsys.m4
index 56594d4..955a339 100644
--- a/m4/sharedlib.m4
+++ b/m4/buildsys.m4
@@ -18,6 +18,20 @@ dnl ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 dnl POSSIBILITY OF SUCH DAMAGE.
 dnl
 
+AC_DEFUN([AM_PROG_SUFFIX], [
+	AC_MSG_CHECKING(for program suffix)
+	case "$target" in
+		*-*-cygwin | *-*-mingw32)
+			PROG_SUFFIX='.exe'
+			;;
+		*)
+			PROG_SUFFIX=''
+			;;
+	esac
+
+	AC_SUBST(PROG_SUFFIX)
+])
+
 AC_DEFUN([AM_SHARED_LIB], [
 	AC_MSG_CHECKING(for shared library system)
 	case "$target" in
@@ -66,7 +80,7 @@ AC_DEFUN([AM_SHARED_LIB], [
 			UNINSTALL_LIB='rm -f ${DESTDIR}${libdir}/$$i ${DESTDIR}${libdir}/$$i.${LIB_MAJOR}.${LIB_MINOR}'
 			CLEAN_LIB=''
 			;;
-		*-*-mingw32 | *-*-cygwin)
+		*-*-cygwin | *-*-ming32)
 			AC_MSG_RESULT(Win32)
 			LIB_CPPFLAGS='-DPIC'
 			LIB_CFLAGS=''