--- SDL_mixer-1.2.7/configure.in.libmikmod	2006-05-12 11:33:37.000000000 +0200
+++ SDL_mixer-1.2.7/configure.in	2007-02-03 04:14:41.000000000 +0100
@@ -132,32 +132,12 @@ AC_ARG_ENABLE([music-libmikmod],
 AC_HELP_STRING([--enable-music-libmikmod], [enable MOD music via external libmikmod [[default=no]]]),
               [], [enable_music_libmikmod=no])
 if test x$enable_music_libmikmod = xyes; then
-	AC_PATH_PROG(LIBMIKMOD_CONFIG, libmikmod-config, no, [$PATH])
-	if test "$LIBMIKMOD_CONFIG" != "no" ; then
-		no_libmikmod=no
-		CFLAGS_SAVED="$CFLAGS"
-		LIBS_SAVED="$LIBS"
-		CFLAGS="$CFLAGS -DLIBMIKMOD_MUSIC `$LIBMIKMOD_CONFIG --cflags`"
-		LIBS="$LIBS `$LIBMIKMOD_CONFIG --libs`"
-		AC_MSG_CHECKING([for libmikmod - version >= $libmikmod_ver])
-		AC_TRY_RUN([
-#include "mikmod.h"
-#include "stdio.h"
-
-int main(int argc, char **argv)
-{
-	long maj=$libmikmod_maj,min=$libmikmod_min,rev=$libmikmod_rev,ver=MikMod_GetVersion();
-	/*printf("(%d.%d.%d) ",ver>>16,(ver>>8)&0xff,ver&0xff);*/
-	if(ver>=((maj<<16)|(min<<8)|(rev))) {
-		printf("yes\n");
-		return 0;
-	}
-	printf("no\n*** libmikmod is older than %d.%d.%d, not using.\n",maj,min,rev);
-	return 1;
-}
-],,CFLAGS="$CFLAGS_SAVED";LIBS="$LIBS_SAVED",
-[echo $ac_n "cross compiling; assumed OK... $ac_c"])
-	fi
+	AM_PATH_LIBMIKMOD($libmikmod_ver,
+	EXTRA_CFLAGS="$CFLAGS -DLIBMIKMOD_MUSIC $LIBMIKMOD_CFLAGS"
+	EXTRA_LDFLAGS="$SYSTEM_LIBS $LIBMIKMOD_LIBS",
+	no_libmikmod=no)
+else
+       no_libmikmod=yes
 fi
 
 AC_ARG_ENABLE([music-mod],