comparison configure.in @ 4325:df4108bfbe1e SDL-1.2

Merged fix from SDL 1.3
author Sam Lantinga <slouken@libsdl.org>
date Mon, 12 Oct 2009 23:21:19 +0000
parents 447fd6ae10cf
children a156aea07417
comparison
equal deleted inserted replaced
4324:1496aa09e41e 4325:df4108bfbe1e
361 elif test "x`ls /usr/local/$base_libdir/libasound.so.* 2> /dev/null`" != "x"; then 361 elif test "x`ls /usr/local/$base_libdir/libasound.so.* 2> /dev/null`" != "x"; then
362 ALSA_LIBS="-L/usr/local/$base_libdir $ALSA_LIBS" 362 ALSA_LIBS="-L/usr/local/$base_libdir $ALSA_LIBS"
363 fi 363 fi
364 fi 364 fi
365 alsa_lib_spec=`echo $ALSA_LIBS | sed 's/.*-L\([[^ ]]*\).*/\1\/libasound.so.*/'` 365 alsa_lib_spec=`echo $ALSA_LIBS | sed 's/.*-L\([[^ ]]*\).*/\1\/libasound.so.*/'`
366 if [ x$alsa_lib_spec = x ]; then 366 if test x$alsa_lib_spec = x; then
367 alsa_lib_spec="/usr/$base_libdir/libasound.so.*" 367 alsa_lib_spec="/usr/$base_libdir/libasound.so.*"
368 fi 368 fi
369 alsa_lib=`ls -- $alsa_lib_spec | sed 's/.*\/\(.*\)/\1/; q'` 369 alsa_lib=`ls -- $alsa_lib_spec | sed 's/.*\/\(.*\)/\1/; q'`
370 echo "-- $alsa_lib_spec -> $alsa_lib" 370 echo "-- $alsa_lib_spec -> $alsa_lib"
371 371
460 if test x$have_esd = xyes; then 460 if test x$have_esd = xyes; then
461 AC_ARG_ENABLE(esd-shared, 461 AC_ARG_ENABLE(esd-shared,
462 AC_HELP_STRING([--enable-esd-shared], [dynamically load ESD audio support [[default=yes]]]), 462 AC_HELP_STRING([--enable-esd-shared], [dynamically load ESD audio support [[default=yes]]]),
463 , enable_esd_shared=yes) 463 , enable_esd_shared=yes)
464 esd_lib_spec=`echo $ESD_LIBS | sed 's/.*-L\([[^ ]]*\).*/\1\/libesd.so.*/'` 464 esd_lib_spec=`echo $ESD_LIBS | sed 's/.*-L\([[^ ]]*\).*/\1\/libesd.so.*/'`
465 if [ x$esd_lib_spec = x ]; then 465 if test x$esd_lib_spec = x; then
466 esd_lib_spec="/usr/$base_libdir/libesd.so.*" 466 esd_lib_spec="/usr/$base_libdir/libesd.so.*"
467 fi 467 fi
468 esd_lib=`ls -- $esd_lib_spec | sed 's/.*\/\(.*\)/\1/; q'` 468 esd_lib=`ls -- $esd_lib_spec | sed 's/.*\/\(.*\)/\1/; q'`
469 echo "-- $esd_lib_spec -> $esd_lib" 469 echo "-- $esd_lib_spec -> $esd_lib"
470 470
520 elif test "x`ls /usr/local/$base_libdir/libpulse-simple.so.* 2> /dev/null`" != "x"; then 520 elif test "x`ls /usr/local/$base_libdir/libpulse-simple.so.* 2> /dev/null`" != "x"; then
521 PULSE_LIBS="-L/usr/local/$base_libdir $PULSE_LIBS" 521 PULSE_LIBS="-L/usr/local/$base_libdir $PULSE_LIBS"
522 fi 522 fi
523 fi 523 fi
524 pulse_lib_spec=`echo $PULSE_LIBS | sed 's/.*-L\([[^ ]]*\).*/\1\/libpulse-simple.so.*/'` 524 pulse_lib_spec=`echo $PULSE_LIBS | sed 's/.*-L\([[^ ]]*\).*/\1\/libpulse-simple.so.*/'`
525 if [ x$pulse_lib_spec = x ]; then 525 if test x$pulse_lib_spec = x; then
526 pulse_lib_spec="/usr/$base_libdir/libpulse-simple.so.*" 526 pulse_lib_spec="/usr/$base_libdir/libpulse-simple.so.*"
527 fi 527 fi
528 pulse_lib=`ls -- $pulse_lib_spec | sed 's/.*\/\(.*\)/\1/; q'` 528 pulse_lib=`ls -- $pulse_lib_spec | sed 's/.*\/\(.*\)/\1/; q'`
529 echo "-- $pulse_lib_spec -> $pulse_lib" 529 echo "-- $pulse_lib_spec -> $pulse_lib"
530 530
643 elif test "x`ls /usr/local/lib/libaudio.so.* 2> /dev/null`" != "x"; then 643 elif test "x`ls /usr/local/lib/libaudio.so.* 2> /dev/null`" != "x"; then
644 NAS_LIBS="-L/usr/local/lib $NAS_LIBS" 644 NAS_LIBS="-L/usr/local/lib $NAS_LIBS"
645 fi 645 fi
646 fi 646 fi
647 nas_lib_spec=`echo $NAS_LIBS | sed 's/.*-L\([[^ ]]*\).*/\1\/libaudio.so.*/'` 647 nas_lib_spec=`echo $NAS_LIBS | sed 's/.*-L\([[^ ]]*\).*/\1\/libaudio.so.*/'`
648 if [ x$nas_lib_spec = x ]; then 648 if test x$nas_lib_spec = x ; then
649 nas_lib_spec="/usr/$base_libdir/libaudio.so.*" 649 nas_lib_spec="/usr/$base_libdir/libaudio.so.*"
650 fi 650 fi
651 nas_lib=`ls -- $nas_lib_spec | sed 's/.*\/\(.*\)/\1/; q'` 651 nas_lib=`ls -- $nas_lib_spec | sed 's/.*\/\(.*\)/\1/; q'`
652 echo "-- $nas_lib_spec -> $nas_lib" 652 echo "-- $nas_lib_spec -> $nas_lib"
653 653