configure
changeset 1 4ef9250a6471
parent 0 4ce2db4db959
child 6 cb0e8db1f996
     1.1 --- a/configure	Thu Oct 21 18:02:08 1999 +0000
     1.2 +++ b/configure	Thu Oct 21 19:12:17 1999 +0000
     1.3 @@ -34,10 +34,10 @@
     1.4  ac_help="$ac_help
     1.5    --enable-music-wave     enable streaming WAVE music [default=yes]"
     1.6  ac_help="$ac_help
     1.7 +  --enable-music-mod      enable MOD music via mikmod [default=yes]"
     1.8 +ac_help="$ac_help
     1.9    --enable-music-midi     enable MIDI music via timidity [default=yes]"
    1.10  ac_help="$ac_help
    1.11 -  --enable-music-mod      enable MOD music via mikmod [default=yes]"
    1.12 -ac_help="$ac_help
    1.13    --enable-music-mp3      enable MP3 music via smpeg [default=yes]"
    1.14  
    1.15  # Initialize some variables set by options.
    1.16 @@ -1925,6 +1925,18 @@
    1.17  if test x$enable_music_wave = xyes; then
    1.18      CFLAGS="$CFLAGS -DWAV_MUSIC"
    1.19  fi
    1.20 +# Check whether --enable-music-mod or --disable-music-mod was given.
    1.21 +if test "${enable_music_mod+set}" = set; then
    1.22 +  enableval="$enable_music_mod"
    1.23 +  :
    1.24 +else
    1.25 +  enable_music_mod=yes
    1.26 +fi
    1.27 +
    1.28 +if test x$enable_music_mod = xyes; then
    1.29 +    CFLAGS="$CFLAGS -DMOD_MUSIC -I\$(top_srcdir)/mikmod"
    1.30 +    MUSIC_SUBDIRS="$MUSIC_SUBDIRS mikmod"
    1.31 +fi
    1.32  # Check whether --enable-music-midi or --disable-music-midi was given.
    1.33  if test "${enable_music_midi+set}" = set; then
    1.34    enableval="$enable_music_midi"
    1.35 @@ -1935,19 +1947,7 @@
    1.36  
    1.37  if test x$enable_music_midi = xyes; then
    1.38      CFLAGS="$CFLAGS -DMID_MUSIC -I\$(top_srcdir)/timidity"
    1.39 -    #MUSIC_SUBDIRS="$MUSIC_SUBDIRS timidity"
    1.40 -fi
    1.41 -# Check whether --enable-music-mod or --disable-music-mod was given.
    1.42 -if test "${enable_music_mod+set}" = set; then
    1.43 -  enableval="$enable_music_mod"
    1.44 -  :
    1.45 -else
    1.46 -  enable_music_mod=yes
    1.47 -fi
    1.48 -
    1.49 -if test x$enable_music_mod = xyes; then
    1.50 -    CFLAGS="$CFLAGS -DMOD_MUSIC -I\$(top_srcdir)/mikmod"
    1.51 -    #MUSIC_SUBDIRS="$MUSIC_SUBDIRS mikmod"
    1.52 +    MUSIC_SUBDIRS="$MUSIC_SUBDIRS timidity"
    1.53  fi
    1.54  # Check whether --enable-music-mp3 or --disable-music-mp3 was given.
    1.55  if test "${enable_music_mp3+set}" = set; then
    1.56 @@ -1989,6 +1989,26 @@
    1.57      fi
    1.58  fi
    1.59  
    1.60 +
    1.61 +
    1.62 +
    1.63 +if test x$enable_music_mod = xyes; then
    1.64 +  USE_MIKMOD_TRUE=
    1.65 +  USE_MIKMOD_FALSE='#'
    1.66 +else
    1.67 +  USE_MIKMOD_TRUE='#'
    1.68 +  USE_MIKMOD_FALSE=
    1.69 +fi
    1.70 +
    1.71 +
    1.72 +if test x$enable_music_midi = xyes; then
    1.73 +  USE_TIMIDITY_TRUE=
    1.74 +  USE_TIMIDITY_FALSE='#'
    1.75 +else
    1.76 +  USE_TIMIDITY_TRUE='#'
    1.77 +  USE_TIMIDITY_FALSE=
    1.78 +fi
    1.79 +
    1.80  # Finally create all the generated files
    1.81  trap '' 1 2 15
    1.82  cat > confcache <<\EOF
    1.83 @@ -2178,6 +2198,11 @@
    1.84  s%@SDL_CONFIG@%$SDL_CONFIG%g
    1.85  s%@SDL_CFLAGS@%$SDL_CFLAGS%g
    1.86  s%@SDL_LIBS@%$SDL_LIBS%g
    1.87 +s%@MUSIC_SUBDIRS@%$MUSIC_SUBDIRS%g
    1.88 +s%@USE_MIKMOD_TRUE@%$USE_MIKMOD_TRUE%g
    1.89 +s%@USE_MIKMOD_FALSE@%$USE_MIKMOD_FALSE%g
    1.90 +s%@USE_TIMIDITY_TRUE@%$USE_TIMIDITY_TRUE%g
    1.91 +s%@USE_TIMIDITY_FALSE@%$USE_TIMIDITY_FALSE%g
    1.92  
    1.93  CEOF
    1.94  EOF