configure.in
changeset 1 4ef9250a6471
parent 0 4ce2db4db959
child 6 cb0e8db1f996
     1.1 --- a/configure.in	Thu Oct 21 18:02:08 1999 +0000
     1.2 +++ b/configure.in	Thu Oct 21 19:12:17 1999 +0000
     1.3 @@ -64,19 +64,19 @@
     1.4  if test x$enable_music_wave = xyes; then
     1.5      CFLAGS="$CFLAGS -DWAV_MUSIC"
     1.6  fi
     1.7 +AC_ARG_ENABLE(music-mod,
     1.8 +[  --enable-music-mod      enable MOD music via mikmod [default=yes]],
     1.9 +              , enable_music_mod=yes)
    1.10 +if test x$enable_music_mod = xyes; then
    1.11 +    CFLAGS="$CFLAGS -DMOD_MUSIC -I\$(top_srcdir)/mikmod"
    1.12 +    MUSIC_SUBDIRS="$MUSIC_SUBDIRS mikmod"
    1.13 +fi
    1.14  AC_ARG_ENABLE(music-midi,
    1.15  [  --enable-music-midi     enable MIDI music via timidity [default=yes]],
    1.16                , enable_music_midi=yes)
    1.17  if test x$enable_music_midi = xyes; then
    1.18      CFLAGS="$CFLAGS -DMID_MUSIC -I\$(top_srcdir)/timidity"
    1.19 -    #MUSIC_SUBDIRS="$MUSIC_SUBDIRS timidity"
    1.20 -fi
    1.21 -AC_ARG_ENABLE(music-mod,
    1.22 -[  --enable-music-mod      enable MOD music via mikmod [default=yes]],
    1.23 -              , enable_music_mod=yes)
    1.24 -if test x$enable_music_mod = xyes; then
    1.25 -    CFLAGS="$CFLAGS -DMOD_MUSIC -I\$(top_srcdir)/mikmod"
    1.26 -    #MUSIC_SUBDIRS="$MUSIC_SUBDIRS mikmod"
    1.27 +    MUSIC_SUBDIRS="$MUSIC_SUBDIRS timidity"
    1.28  fi
    1.29  AC_ARG_ENABLE(music-mp3,
    1.30  [  --enable-music-mp3      enable MP3 music via smpeg [default=yes]],
    1.31 @@ -97,6 +97,11 @@
    1.32      fi
    1.33  fi
    1.34  
    1.35 +dnl Add Makefile conditionals
    1.36 +AC_SUBST(MUSIC_SUBDIRS)
    1.37 +AM_CONDITIONAL(USE_MIKMOD, test x$enable_music_mod = xyes)
    1.38 +AM_CONDITIONAL(USE_TIMIDITY, test x$enable_music_midi = xyes)
    1.39 +
    1.40  # Finally create all the generated files
    1.41  AC_OUTPUT([
    1.42  Makefile