Mercurial > sdl-ios-xcode

comparison configure.in @ 3301:047c8dcf0eb0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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:10:45 +0000
parents 94f22808d19e
children 6fb7f38d20b6
comparison
equal deleted inserted replaced
3300:34a4a01da79c 3301:047c8dcf0eb0
579 elif test "x`ls /usr/local/$base_libdir/libasound.so.* 2> /dev/null`" != "x"; then 579 elif test "x`ls /usr/local/$base_libdir/libasound.so.* 2> /dev/null`" != "x"; then
580 ALSA_LIBS="-L/usr/local/$base_libdir $ALSA_LIBS" 580 ALSA_LIBS="-L/usr/local/$base_libdir $ALSA_LIBS"
581 fi 581 fi
582 fi 582 fi
583 alsa_lib_spec=`echo $ALSA_LIBS | sed 's/.*-L\([[^ ]]*\).*/\1\/libasound.so.*/'` 583 alsa_lib_spec=`echo $ALSA_LIBS | sed 's/.*-L\([[^ ]]*\).*/\1\/libasound.so.*/'`
584 if [ x$alsa_lib_spec = x ]; then
585 alsa_lib_spec="/usr/$base_libdir/libasound.so.*"
586 fi
584 alsa_lib=`ls -- $alsa_lib_spec | sed 's/.*\/\(.*\)/\1/; q'` 587 alsa_lib=`ls -- $alsa_lib_spec | sed 's/.*\/\(.*\)/\1/; q'`
585 echo "-- $alsa_lib_spec -> $alsa_lib" 588 echo "-- $alsa_lib_spec -> $alsa_lib"
586 589
587 AC_DEFINE(SDL_AUDIO_DRIVER_ALSA) 590 AC_DEFINE(SDL_AUDIO_DRIVER_ALSA)
588 SOURCES="$SOURCES $srcdir/src/audio/alsa/*.c" 591 SOURCES="$SOURCES $srcdir/src/audio/alsa/*.c"
675 if test x$have_esd = xyes; then 678 if test x$have_esd = xyes; then
676 AC_ARG_ENABLE(esd-shared, 679 AC_ARG_ENABLE(esd-shared,
677 AC_HELP_STRING([--enable-esd-shared], [dynamically load ESD audio support [[default=yes]]]), 680 AC_HELP_STRING([--enable-esd-shared], [dynamically load ESD audio support [[default=yes]]]),
678 , enable_esd_shared=yes) 681 , enable_esd_shared=yes)
679 esd_lib_spec=`echo $ESD_LIBS | sed 's/.*-L\([[^ ]]*\).*/\1\/libesd.so.*/'` 682 esd_lib_spec=`echo $ESD_LIBS | sed 's/.*-L\([[^ ]]*\).*/\1\/libesd.so.*/'`
683 if [ x$esd_lib_spec = x ]; then
684 esd_lib_spec="/usr/$base_libdir/libesd.so.*"
685 fi
680 esd_lib=`ls -- $esd_lib_spec | sed 's/.*\/\(.*\)/\1/; q'` 686 esd_lib=`ls -- $esd_lib_spec | sed 's/.*\/\(.*\)/\1/; q'`
681 echo "-- $esd_lib_spec -> $esd_lib" 687 echo "-- $esd_lib_spec -> $esd_lib"
682 688
683 AC_DEFINE(SDL_AUDIO_DRIVER_ESD) 689 AC_DEFINE(SDL_AUDIO_DRIVER_ESD)
684 SOURCES="$SOURCES $srcdir/src/audio/esd/*.c" 690 SOURCES="$SOURCES $srcdir/src/audio/esd/*.c"
732 elif test "x`ls /usr/local/$base_libdir/libpulse-simple.so.* 2> /dev/null`" != "x"; then 738 elif test "x`ls /usr/local/$base_libdir/libpulse-simple.so.* 2> /dev/null`" != "x"; then
733 PULSE_LIBS="-L/usr/local/$base_libdir $PULSE_LIBS" 739 PULSE_LIBS="-L/usr/local/$base_libdir $PULSE_LIBS"
734 fi 740 fi
735 fi 741 fi
736 pulseaudio_lib_spec=`echo $PULSEAUDIO_LIBS | sed 's/.*-L\([[^ ]]*\).*/\1\/libpulse-simple.so.*/'` 742 pulseaudio_lib_spec=`echo $PULSEAUDIO_LIBS | sed 's/.*-L\([[^ ]]*\).*/\1\/libpulse-simple.so.*/'`
743 if [ x$pulse_lib_spec = x ]; then
744 pulse_lib_spec="/usr/$base_libdir/libpulse-simple.so.*"
745 fi
737 pulseaudio_lib=`ls -- $pulseaudio_lib_spec | sed 's/.*\/\(.*\)/\1/; q'` 746 pulseaudio_lib=`ls -- $pulseaudio_lib_spec | sed 's/.*\/\(.*\)/\1/; q'`
738 echo "-- $pulseaudio_lib_spec -> $pulseaudio_lib" 747 echo "-- $pulseaudio_lib_spec -> $pulseaudio_lib"
739 748
740 AC_DEFINE(SDL_AUDIO_DRIVER_PULSEAUDIO) 749 AC_DEFINE(SDL_AUDIO_DRIVER_PULSEAUDIO)
741 SOURCES="$SOURCES $srcdir/src/audio/pulseaudio/*.c" 750 SOURCES="$SOURCES $srcdir/src/audio/pulseaudio/*.c"
852 elif test "x`ls /usr/local/lib/libaudio.so.* 2> /dev/null`" != "x"; then 861 elif test "x`ls /usr/local/lib/libaudio.so.* 2> /dev/null`" != "x"; then
853 NAS_LIBS="-L/usr/local/lib $NAS_LIBS" 862 NAS_LIBS="-L/usr/local/lib $NAS_LIBS"
854 fi 863 fi
855 fi 864 fi
856 nas_lib_spec=`echo $NAS_LIBS | sed 's/.*-L\([[^ ]]*\).*/\1\/libaudio.so.*/'` 865 nas_lib_spec=`echo $NAS_LIBS | sed 's/.*-L\([[^ ]]*\).*/\1\/libaudio.so.*/'`
866 if [ x$nas_lib_spec = x ]; then
867 nas_lib_spec="/usr/$base_libdir/libaudio.so.*"
868 fi
857 nas_lib=`ls -- $nas_lib_spec | sed 's/.*\/\(.*\)/\1/; q'` 869 nas_lib=`ls -- $nas_lib_spec | sed 's/.*\/\(.*\)/\1/; q'`
858 echo "-- $nas_lib_spec -> $nas_lib" 870 echo "-- $nas_lib_spec -> $nas_lib"
859 871
860 if test x$have_loadso != xyes && \ 872 if test x$have_loadso != xyes && \
861 test x$enable_nas_shared = xyes; then 873 test x$enable_nas_shared = xyes; then