--- configure.in.orig
+++ configure.in
@@ -134,9 +134,8 @@ AC_PROG_CC
 AC_PROG_CPP
 AC_PROG_INSTALL
 AC_PROG_LN_S
-AM_PROG_LIBTOOL
 AC_PROG_MAKE_SET
-AC_PROG_RANLIB
+AC_PROG_LIBTOOL
 
 # Check if makeinfo support html output. If it doesn't, pretend it's missing
 # rather than failing rebuilding the documentation.
@@ -377,7 +376,7 @@ fi
 AC_CHECK_FUNCS(setenv snprintf srandom)
 AC_REPLACE_FUNCS(strcasecmp strdup strstr)
 # Change extension, as we use libtool
-LIBOBJS="`echo $LIBOBJS|sed -e 's/\.o/\.lo/g'`"
+# LIBOBJS="`echo $LIBOBJS|sed -e 's/\.o/\.lo/g'`"
 
 AC_HEADER_EGREP(srandom,math.h,AC_DEFINE(SRANDOM_IN_MATH_H))
 
@@ -546,8 +545,8 @@ if test $libmikmod_dynload != no
 then
 	AC_DEFINE(MIKMOD_DYNAMIC)
 	if test "`uname`" = "Linux" && \
-	   test $libmikmod_cv_esd_needs_alsa = yes && \
-	   test $libmikmod_driver_esd = yes
+	   test x$libmikmod_cv_esd_needs_alsa = xyes && \
+	   test x$libmikmod_driver_esd = xyes
 	then
 		# @#!$ libmikmod_dynloading esd requires us to define and make visible
 		# extra symbols (at least for 0.2.6 to 0.2.8)
--- libmikmod.m4.orig
+++ libmikmod.m4
@@ -64,6 +64,7 @@ dnl
 #include <mikmod.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 
 char* my_strdup (char *str)
 {
@@ -78,7 +79,7 @@ char* my_strdup (char *str)
   return new_str;
 }
 
-int main()
+int main(void)
 {
   int major,minor,micro;
   int libmikmod_major_version,libmikmod_minor_version,libmikmod_micro_version;
@@ -118,7 +119,7 @@ int main()
            (libmikmod_micro_version != LIBMIKMOD_REVISION))
     {
       printf("*** libmikmod header files (version %d.%d.%d) do not match\n",
-	     LIBMIKMOD_VERSION_MAJOR, LIBMIKMOD_VERSION_MINOR, LIBMIKMOD_REVISION);
+	     (int)LIBMIKMOD_VERSION_MAJOR, (int)LIBMIKMOD_VERSION_MINOR, (int)LIBMIKMOD_REVISION);
       printf("*** library (version %d.%d.%d)\n",
 	     libmikmod_major_version, libmikmod_minor_version, libmikmod_micro_version);
     }