configure.in
changeset 1467 b69f2b0309a0
parent 1459 1e8582152d44
child 1468 fecfef92fc94
     1.1 --- a/configure.in	Sun Mar 05 22:18:15 2006 +0000
     1.2 +++ b/configure.in	Mon Mar 06 00:50:03 2006 +0000
     1.3 @@ -324,7 +324,7 @@
     1.4              BUILD_CFLAGS="$BUILD_CFLAGS $ALSA_CFLAGS"
     1.5              if test x$have_loadso != xyes && \
     1.6                 test x$enable_alsa_shared = xyes; then
     1.7 -                AC_MSG_ERROR([You must have SDL_LoadObject() support])
     1.8 +                AC_MSG_WARN([You must have SDL_LoadObject() support for dynamic ALSA loading])
     1.9              fi
    1.10              if test x$have_loadso = xyes && \
    1.11                 test x$enable_alsa_shared = xyes && test x$alsa_lib != x; then
    1.12 @@ -335,42 +335,6 @@
    1.13              have_audio=yes
    1.14          fi
    1.15      fi
    1.16 -        if test x$have_alsa = xyes; then
    1.17 -            AC_ARG_ENABLE(alsa-shared,
    1.18 -[  --enable-alsa-shared     dynamically load ALSA audio support [default=yes]],
    1.19 -                          , enable_alsa_shared=yes)
    1.20 -            if test "x`echo $ALSA_LIBS | grep -- -L`" = "x"; then
    1.21 -                if test "x`ls /lib/libasound.so.* 2> /dev/null`" != "x"; then
    1.22 -                    ALSA_LIBS="-L/lib $ALSA_LIBS"
    1.23 -                elif test "x`ls /usr/lib/libasound.so.* 2> /dev/null`" != "x"; then
    1.24 -                    ALSA_LIBS="-L/usr/lib $ALSA_LIBS"
    1.25 -                elif test "x`ls /usr/local/lib/libasound.so.* 2> /dev/null`" != "x"; then
    1.26 -                    ALSA_LIBS="-L/usr/local/lib $ALSA_LIBS"
    1.27 -                fi
    1.28 -            fi
    1.29 -            alsa_lib_spec=`echo $ALSA_LIBS | sed 's/.*-L\([[^ ]]*\).*/\1\/libasound.so.*/'`
    1.30 -            alsa_lib=`ls $alsa_lib_spec | sed 's/.*\/\(.*\)/\1/; q'`
    1.31 -            echo "-- $alsa_lib_spec -> $alsa_lib"
    1.32 -
    1.33 -            if test x$have_loadso != xyes && \
    1.34 -               test x$enable_alsa_shared = xyes; then
    1.35 -                AC_MSG_ERROR([You must have SDL_LoadObject() support])
    1.36 -            fi
    1.37 -            if test x$have_loadso = xyes && \
    1.38 -               test x$enable_alsa_shared = xyes && test x$alsa_lib != x; then
    1.39 -                CFLAGS="$CFLAGS -DALSA_SUPPORT -DALSA_DYNAMIC=\$(alsa_lib) $ALSA_CFLAGS"
    1.40 -                AC_SUBST(alsa_lib)
    1.41 -
    1.42 -                use_dlvsym=no
    1.43 -                AC_CHECK_LIB(dl, dlvsym, [use_dlvsym=yes])
    1.44 -                if test x$use_dlvsym = xyes; then
    1.45 -                    CFLAGS="$CFLAGS -DUSE_DLVSYM"
    1.46 -                fi
    1.47 -            else
    1.48 -                CFLAGS="$CFLAGS -DALSA_SUPPORT $ALSA_CFLAGS"
    1.49 -                SYSTEM_LIBS="$SYSTEM_LIBS $ALSA_LIBS"
    1.50 -            fi
    1.51 -        fi
    1.52  }
    1.53  
    1.54  dnl Check whether we want to use IRIX 6.5+ native audio or not
    1.55 @@ -450,18 +414,20 @@
    1.56              esd_lib_spec=`echo $ESD_LIBS | sed 's/.*-L\([[^ ]]*\).*/\1\/libesd.so.*/'`
    1.57              esd_lib=`ls $esd_lib_spec | sed 's/.*\/\(.*\)/\1/; q'`
    1.58              echo "-- $esd_lib_spec -> $esd_lib"
    1.59 +
    1.60 +            AC_DEFINE(SDL_AUDIO_DRIVER_ESD)
    1.61 +            SOURCES="$SOURCES $srcdir/src/audio/esd/*.c"
    1.62 +            BUILD_CFLAGS="$BUILD_CFLAGS $ESD_CFLAGS"
    1.63              if test x$have_loadso != xyes && \
    1.64                 test x$enable_esd_shared = xyes; then
    1.65 -                AC_MSG_ERROR([You must have SDL_LoadObject() support])
    1.66 +                AC_MSG_WARN([You must have SDL_LoadObject() support for dynamic ESD loading])
    1.67              fi
    1.68              if test x$have_loadso = xyes && \
    1.69                 test x$enable_esd_shared = xyes && test x$esd_lib != x; then
    1.70                  AC_DEFINE_UNQUOTED(SDL_AUDIO_DRIVER_ESD_DYNAMIC, "$esd_lib")
    1.71 +            else
    1.72 +                BUILD_LDFLAGS="$BUILD_LDFLAGS $ESD_LIBS"
    1.73              fi
    1.74 -            AC_DEFINE(SDL_AUDIO_DRIVER_ESD)
    1.75 -            SOURCES="$SOURCES $srcdir/src/audio/esd/*.c"
    1.76 -            BUILD_CFLAGS="$BUILD_CFLAGS $ESD_CFLAGS"
    1.77 -            BUILD_LDFLAGS="$BUILD_LDFLAGS $ESD_LIBS"
    1.78              have_audio=yes
    1.79          fi
    1.80      fi
    1.81 @@ -500,18 +466,20 @@
    1.82                  arts_lib_spec="$ARTS_PREFIX/lib/libartsc.so.*"
    1.83                  arts_lib=`ls $arts_lib_spec | sed 's/.*\/\(.*\)/\1/; q'`
    1.84                  echo "-- $arts_lib_spec -> $arts_lib"
    1.85 +
    1.86 +                AC_DEFINE(SDL_AUDIO_DRIVER_ARTS)
    1.87 +                SOURCES="$SOURCES $srcdir/src/audio/arts/*.c"
    1.88 +                BUILD_CFLAGS="$BUILD_CFLAGS $ARTS_CFLAGS"
    1.89                  if test x$have_loadso != xyes && \
    1.90                     test x$enable_arts_shared = xyes; then
    1.91 -                    AC_MSG_ERROR([You must have SDL_LoadObject() support])
    1.92 +                    AC_MSG_WARN([You must have SDL_LoadObject() support for dynamic ARTS loading])
    1.93                  fi
    1.94                  if test x$have_loadso = xyes && \
    1.95                     test x$enable_arts_shared = xyes && test x$arts_lib != x; then
    1.96                      AC_DEFINE_UNQUOTED(SDL_AUDIO_DRIVER_ARTS_DYNAMIC, "$arts_lib")
    1.97 +                else
    1.98 +                    BUILD_LDFLAGS="$BUILD_LDFLAGS $ARTS_LIBS"
    1.99                  fi
   1.100 -                AC_DEFINE(SDL_AUDIO_DRIVER_ARTS)
   1.101 -                SOURCES="$SOURCES $srcdir/src/audio/arts/*.c"
   1.102 -                BUILD_CFLAGS="$BUILD_CFLAGS $ARTS_CFLAGS"
   1.103 -                BUILD_LDFLAGS="$BUILD_LDFLAGS $ARTS_LIBS"
   1.104                  have_audio=yes
   1.105              fi
   1.106          fi
   1.107 @@ -797,7 +765,7 @@
   1.108              fi
   1.109              if test x$have_loadso != xyes && \
   1.110                 test x$enable_x11_shared = xyes; then
   1.111 -                AC_MSG_ERROR([You must have SDL_LoadObject() support])
   1.112 +                AC_MSG_WARN([You must have SDL_LoadObject() support for dynamic X11 loading])
   1.113              fi
   1.114  
   1.115              if test x$have_loadso = xyes && \