configure.in
changeset 332 fb7c3d64963d
parent 314 8c791a6ba872
child 340 d85cb3c11238
     1.1 --- a/configure.in	Mon Jun 26 17:34:24 2006 +0000
     1.2 +++ b/configure.in	Thu Aug 10 15:06:40 2006 +0000
     1.3 @@ -155,7 +155,7 @@
     1.4  	printf("no\n*** libmikmod is older than %d.%d.%d, not using.\n",maj,min,rev);
     1.5  	return 1;
     1.6  }
     1.7 -],,CFLAGS="$CFLAGS_SAVED";LIBS="$LIBS_SAVED",
     1.8 +], EXTRA_CFLAGS="$EXTRA_CFLAGS -DLIBMIKMOD_MUSIC `$LIBMIKMOD_CONFIG --cflags`";EXTRA_LDFLAGS="$EXTRA_LDFLAGS `$LIBMIKMOD_CONFIG --libs`", CFLAGS="$CFLAGS_SAVED";LIBS="$LIBS_SAVED",
     1.9  [echo $ac_n "cross compiling; assumed OK... $ac_c"])
    1.10  	fi
    1.11  fi
    1.12 @@ -163,7 +163,7 @@
    1.13  AC_ARG_ENABLE([music-mod],
    1.14  AC_HELP_STRING([--enable-music-mod], [enable MOD music via mikmod [[default=yes]]]),
    1.15                [], [enable_music_mod=$no_libmikmod])
    1.16 -if test x$enable_music_mod = xyes; then
    1.17 +if test x$enable_music_mod = xyes -a x$enable_music_libmikmod = xno; then
    1.18      EXTRA_CFLAGS="$EXTRA_CFLAGS -DMOD_MUSIC -I\$(srcdir)/mikmod"
    1.19      SOURCES="$SOURCES $srcdir/mikmod/*.c"
    1.20  fi