Commit 8c7dddc1 authored by Sam Lantinga's avatar Sam Lantinga

Fixed bug #732

If no -L is present in the library spec, try /usr/lib

--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%403889
parent 46669bc4
...@@ -581,6 +581,9 @@ AC_HELP_STRING([--enable-alsa-shared], [dynamically load ALSA audio support [[de ...@@ -581,6 +581,9 @@ AC_HELP_STRING([--enable-alsa-shared], [dynamically load ALSA audio support [[de
fi fi
fi fi
alsa_lib_spec=`echo $ALSA_LIBS | sed 's/.*-L\([[^ ]]*\).*/\1\/libasound.so.*/'` alsa_lib_spec=`echo $ALSA_LIBS | sed 's/.*-L\([[^ ]]*\).*/\1\/libasound.so.*/'`
if [ x$alsa_lib_spec = x ]; then
alsa_lib_spec="/usr/$base_libdir/libasound.so.*"
fi
alsa_lib=`ls -- $alsa_lib_spec | sed 's/.*\/\(.*\)/\1/; q'` alsa_lib=`ls -- $alsa_lib_spec | sed 's/.*\/\(.*\)/\1/; q'`
echo "-- $alsa_lib_spec -> $alsa_lib" echo "-- $alsa_lib_spec -> $alsa_lib"
...@@ -677,6 +680,9 @@ AC_HELP_STRING([--enable-esd], [support the Enlightened Sound Daemon [[default=y ...@@ -677,6 +680,9 @@ AC_HELP_STRING([--enable-esd], [support the Enlightened Sound Daemon [[default=y
AC_HELP_STRING([--enable-esd-shared], [dynamically load ESD audio support [[default=yes]]]), AC_HELP_STRING([--enable-esd-shared], [dynamically load ESD audio support [[default=yes]]]),
, enable_esd_shared=yes) , enable_esd_shared=yes)
esd_lib_spec=`echo $ESD_LIBS | sed 's/.*-L\([[^ ]]*\).*/\1\/libesd.so.*/'` esd_lib_spec=`echo $ESD_LIBS | sed 's/.*-L\([[^ ]]*\).*/\1\/libesd.so.*/'`
if [ x$esd_lib_spec = x ]; then
esd_lib_spec="/usr/$base_libdir/libesd.so.*"
fi
esd_lib=`ls -- $esd_lib_spec | sed 's/.*\/\(.*\)/\1/; q'` esd_lib=`ls -- $esd_lib_spec | sed 's/.*\/\(.*\)/\1/; q'`
echo "-- $esd_lib_spec -> $esd_lib" echo "-- $esd_lib_spec -> $esd_lib"
...@@ -734,6 +740,9 @@ AC_HELP_STRING([--enable-pulseaudio-shared], [dynamically load PulseAudio suppor ...@@ -734,6 +740,9 @@ AC_HELP_STRING([--enable-pulseaudio-shared], [dynamically load PulseAudio suppor
fi fi
fi fi
pulseaudio_lib_spec=`echo $PULSEAUDIO_LIBS | sed 's/.*-L\([[^ ]]*\).*/\1\/libpulse-simple.so.*/'` pulseaudio_lib_spec=`echo $PULSEAUDIO_LIBS | sed 's/.*-L\([[^ ]]*\).*/\1\/libpulse-simple.so.*/'`
if [ x$pulse_lib_spec = x ]; then
pulse_lib_spec="/usr/$base_libdir/libpulse-simple.so.*"
fi
pulseaudio_lib=`ls -- $pulseaudio_lib_spec | sed 's/.*\/\(.*\)/\1/; q'` pulseaudio_lib=`ls -- $pulseaudio_lib_spec | sed 's/.*\/\(.*\)/\1/; q'`
echo "-- $pulseaudio_lib_spec -> $pulseaudio_lib" echo "-- $pulseaudio_lib_spec -> $pulseaudio_lib"
...@@ -854,6 +863,9 @@ AC_HELP_STRING([--enable-nas-shared], [dynamically load NAS audio support [[defa ...@@ -854,6 +863,9 @@ AC_HELP_STRING([--enable-nas-shared], [dynamically load NAS audio support [[defa
fi fi
fi fi
nas_lib_spec=`echo $NAS_LIBS | sed 's/.*-L\([[^ ]]*\).*/\1\/libaudio.so.*/'` nas_lib_spec=`echo $NAS_LIBS | sed 's/.*-L\([[^ ]]*\).*/\1\/libaudio.so.*/'`
if [ x$nas_lib_spec = x ]; then
nas_lib_spec="/usr/$base_libdir/libaudio.so.*"
fi
nas_lib=`ls -- $nas_lib_spec | sed 's/.*\/\(.*\)/\1/; q'` nas_lib=`ls -- $nas_lib_spec | sed 's/.*\/\(.*\)/\1/; q'`
echo "-- $nas_lib_spec -> $nas_lib" echo "-- $nas_lib_spec -> $nas_lib"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment