--- configure.in.orig	2006-07-24 04:18:18.000000000 -0400
+++ configure.in	2006-07-24 04:21:23.000000000 -0400
@@ -155,7 +155,7 @@
 	printf("no\n*** libmikmod is older than %d.%d.%d, not using.\n",maj,min,rev);
 	return 1;
 }
-],,CFLAGS="$CFLAGS_SAVED";LIBS="$LIBS_SAVED",
+],EXTRA_CFLAGS="$EXTRA_CFLAGS -DLIBMIKMOD_MUSIC `$LIBMIKMOD_CONFIG --cflags`";EXTRA_LDFLAGS="$EXTRA_LDFLAGS `$LIBMIKMOD_CONFIG --libs`",CFLAGS="$CFLAGS_SAVED";LIBS="$LIBS_SAVED",
 [echo $ac_n "cross compiling; assumed OK... $ac_c"])
 	fi
 fi
@@ -163,7 +163,7 @@
 AC_ARG_ENABLE([music-mod],
 AC_HELP_STRING([--enable-music-mod], [enable MOD music via mikmod [[default=yes]]]),
               [], [enable_music_mod=$no_libmikmod])
-if test x$enable_music_mod = xyes; then
+if test x$enable_music_mod = xyes -a x$enable_music_libmikmod = xno; then
     EXTRA_CFLAGS="$EXTRA_CFLAGS -DMOD_MUSIC -I\$(srcdir)/mikmod"
     SOURCES="$SOURCES $srcdir/mikmod/*.c"
 fi