comparison configure.in @ 4239:3d467ee2af5e SDL-1.2

Fixed bug #732 If no -L is present in the library spec, try /usr/lib
author Sam Lantinga <slouken@libsdl.org>
date Wed, 23 Sep 2009 07:07:44 +0000
parents 68ee433ec474
children 3af45468df66
comparison
equal deleted inserted replaced
4238:cbe5222d051a 4239:3d467ee2af5e
358 elif test "x`ls /usr/local/$base_libdir/libasound.so.* 2> /dev/null`" != "x"; then 358 elif test "x`ls /usr/local/$base_libdir/libasound.so.* 2> /dev/null`" != "x"; then
359 ALSA_LIBS="-L/usr/local/$base_libdir $ALSA_LIBS" 359 ALSA_LIBS="-L/usr/local/$base_libdir $ALSA_LIBS"
360 fi 360 fi
361 fi 361 fi
362 alsa_lib_spec=`echo $ALSA_LIBS | sed 's/.*-L\([[^ ]]*\).*/\1\/libasound.so.*/'` 362 alsa_lib_spec=`echo $ALSA_LIBS | sed 's/.*-L\([[^ ]]*\).*/\1\/libasound.so.*/'`
363 if [ x$alsa_lib_spec = x ]; then
364 alsa_lib_spec="/usr/$base_libdir/libasound.so.*"
365 fi
363 alsa_lib=`ls -- $alsa_lib_spec | sed 's/.*\/\(.*\)/\1/; q'` 366 alsa_lib=`ls -- $alsa_lib_spec | sed 's/.*\/\(.*\)/\1/; q'`
364 echo "-- $alsa_lib_spec -> $alsa_lib" 367 echo "-- $alsa_lib_spec -> $alsa_lib"
365 368
366 AC_DEFINE(SDL_AUDIO_DRIVER_ALSA) 369 AC_DEFINE(SDL_AUDIO_DRIVER_ALSA)
367 SOURCES="$SOURCES $srcdir/src/audio/alsa/*.c" 370 SOURCES="$SOURCES $srcdir/src/audio/alsa/*.c"
454 if test x$have_esd = xyes; then 457 if test x$have_esd = xyes; then
455 AC_ARG_ENABLE(esd-shared, 458 AC_ARG_ENABLE(esd-shared,
456 AC_HELP_STRING([--enable-esd-shared], [dynamically load ESD audio support [[default=yes]]]), 459 AC_HELP_STRING([--enable-esd-shared], [dynamically load ESD audio support [[default=yes]]]),
457 , enable_esd_shared=yes) 460 , enable_esd_shared=yes)
458 esd_lib_spec=`echo $ESD_LIBS | sed 's/.*-L\([[^ ]]*\).*/\1\/libesd.so.*/'` 461 esd_lib_spec=`echo $ESD_LIBS | sed 's/.*-L\([[^ ]]*\).*/\1\/libesd.so.*/'`
462 if [ x$esd_lib_spec = x ]; then
463 esd_lib_spec="/usr/$base_libdir/libesd.so.*"
464 fi
459 esd_lib=`ls -- $esd_lib_spec | sed 's/.*\/\(.*\)/\1/; q'` 465 esd_lib=`ls -- $esd_lib_spec | sed 's/.*\/\(.*\)/\1/; q'`
460 echo "-- $esd_lib_spec -> $esd_lib" 466 echo "-- $esd_lib_spec -> $esd_lib"
461 467
462 AC_DEFINE(SDL_AUDIO_DRIVER_ESD) 468 AC_DEFINE(SDL_AUDIO_DRIVER_ESD)
463 SOURCES="$SOURCES $srcdir/src/audio/esd/*.c" 469 SOURCES="$SOURCES $srcdir/src/audio/esd/*.c"
511 elif test "x`ls /usr/local/$base_libdir/libpulse-simple.so.* 2> /dev/null`" != "x"; then 517 elif test "x`ls /usr/local/$base_libdir/libpulse-simple.so.* 2> /dev/null`" != "x"; then
512 PULSE_LIBS="-L/usr/local/$base_libdir $PULSE_LIBS" 518 PULSE_LIBS="-L/usr/local/$base_libdir $PULSE_LIBS"
513 fi 519 fi
514 fi 520 fi
515 pulse_lib_spec=`echo $PULSE_LIBS | sed 's/.*-L\([[^ ]]*\).*/\1\/libpulse-simple.so.*/'` 521 pulse_lib_spec=`echo $PULSE_LIBS | sed 's/.*-L\([[^ ]]*\).*/\1\/libpulse-simple.so.*/'`
522 if [ x$pulse_lib_spec = x ]; then
523 pulse_lib_spec="/usr/$base_libdir/libpulse-simple.so.*"
524 fi
516 pulse_lib=`ls -- $pulse_lib_spec | sed 's/.*\/\(.*\)/\1/; q'` 525 pulse_lib=`ls -- $pulse_lib_spec | sed 's/.*\/\(.*\)/\1/; q'`
517 echo "-- $pulse_lib_spec -> $pulse_lib" 526 echo "-- $pulse_lib_spec -> $pulse_lib"
518 527
519 AC_DEFINE(SDL_AUDIO_DRIVER_PULSE) 528 AC_DEFINE(SDL_AUDIO_DRIVER_PULSE)
520 SOURCES="$SOURCES $srcdir/src/audio/pulse/*.c" 529 SOURCES="$SOURCES $srcdir/src/audio/pulse/*.c"
631 elif test "x`ls /usr/local/lib/libaudio.so.* 2> /dev/null`" != "x"; then 640 elif test "x`ls /usr/local/lib/libaudio.so.* 2> /dev/null`" != "x"; then
632 NAS_LIBS="-L/usr/local/lib $NAS_LIBS" 641 NAS_LIBS="-L/usr/local/lib $NAS_LIBS"
633 fi 642 fi
634 fi 643 fi
635 nas_lib_spec=`echo $NAS_LIBS | sed 's/.*-L\([[^ ]]*\).*/\1\/libaudio.so.*/'` 644 nas_lib_spec=`echo $NAS_LIBS | sed 's/.*-L\([[^ ]]*\).*/\1\/libaudio.so.*/'`
645 if [ x$nas_lib_spec = x ]; then
646 nas_lib_spec="/usr/$base_libdir/libaudio.so.*"
647 fi
636 nas_lib=`ls -- $nas_lib_spec | sed 's/.*\/\(.*\)/\1/; q'` 648 nas_lib=`ls -- $nas_lib_spec | sed 's/.*\/\(.*\)/\1/; q'`
637 echo "-- $nas_lib_spec -> $nas_lib" 649 echo "-- $nas_lib_spec -> $nas_lib"
638 650
639 if test x$have_loadso != xyes && \ 651 if test x$have_loadso != xyes && \
640 test x$enable_nas_shared = xyes; then 652 test x$enable_nas_shared = xyes; then