|
|
a8d2ab6 |
--- SDL-1.2.10/configure.in.libdir 2006-05-17 05:16:07.000000000 +0200
|
|
|
a8d2ab6 |
+++ SDL-1.2.10/configure.in 2006-05-19 11:05:42.000000000 +0200
|
|
|
a8d2ab6 |
@@ -324,12 +324,13 @@
|
|
|
a8d2ab6 |
AC_HELP_STRING([--enable-alsa-shared], [dynamically load ALSA audio support [[default=yes]]]),
|
|
|
a8d2ab6 |
, enable_alsa_shared=yes)
|
|
|
a8d2ab6 |
if test "x`echo $ALSA_LIBS | grep -- -L`" = "x"; then
|
|
|
a8d2ab6 |
- if test "x`ls /lib/libasound.so.* 2> /dev/null`" != "x"; then
|
|
|
a8d2ab6 |
- ALSA_LIBS="-L/lib $ALSA_LIBS"
|
|
|
a8d2ab6 |
- elif test "x`ls /usr/lib/libasound.so.* 2> /dev/null`" != "x"; then
|
|
|
a8d2ab6 |
- ALSA_LIBS="-L/usr/lib $ALSA_LIBS"
|
|
|
a8d2ab6 |
- elif test "x`ls /usr/local/lib/libasound.so.* 2> /dev/null`" != "x"; then
|
|
|
a8d2ab6 |
- ALSA_LIBS="-L/usr/local/lib $ALSA_LIBS"
|
|
|
a8d2ab6 |
+ pfx=${libdir##*/}
|
|
|
a8d2ab6 |
+ if test "x`ls /${pfx}/libasound.so.* 2> /dev/null`" != "x"; then
|
|
|
a8d2ab6 |
+ ALSA_LIBS="-L/${pfx} $ALSA_LIBS"
|
|
|
a8d2ab6 |
+ elif test "x`ls /usr/${pfx}/libasound.so.* 2> /dev/null`" != "x"; then
|
|
|
a8d2ab6 |
+ ALSA_LIBS="-L/usr/${pfx} $ALSA_LIBS"
|
|
|
a8d2ab6 |
+ elif test "x`ls /usr/local/${pfx}/libasound.so.* 2> /dev/null`" != "x"; then
|
|
|
a8d2ab6 |
+ ALSA_LIBS="-L/usr/local/${pfx} $ALSA_LIBS"
|
|
|
a8d2ab6 |
fi
|
|
|
a8d2ab6 |
fi
|
|
|
a8d2ab6 |
alsa_lib_spec=`echo $ALSA_LIBS | sed 's/.*-L\([[^ ]]*\).*/\1\/libasound.so.*/'`
|
|
|
a8d2ab6 |
@@ -480,7 +481,8 @@
|
|
|
a8d2ab6 |
AC_ARG_ENABLE(arts-shared,
|
|
|
a8d2ab6 |
AC_HELP_STRING([--enable-arts-shared], [dynamically load aRts audio support [[default=yes]]]),
|
|
|
a8d2ab6 |
, enable_arts_shared=yes)
|
|
|
a8d2ab6 |
- arts_lib_spec="$ARTS_PREFIX/lib/libartsc.so.*"
|
|
|
a8d2ab6 |
+ pfx=${libdir##*/}
|
|
|
a8d2ab6 |
+ arts_lib_spec="$ARTS_PREFIX/${pfx}/libartsc.so.*"
|
|
|
a8d2ab6 |
arts_lib=`ls -- $arts_lib_spec | sed 's/.*\/\(.*\)/\1/; q'`
|
|
|
a8d2ab6 |
echo "-- $arts_lib_spec -> $arts_lib"
|
|
|
a8d2ab6 |
|
|
|
a8d2ab6 |
--- SDL-1.2.10/configure.libdir 2006-05-17 08:53:45.000000000 +0200
|
|
|
a8d2ab6 |
+++ SDL-1.2.10/configure 2006-05-19 11:06:08.000000000 +0200
|
|
|
a8d2ab6 |
@@ -24063,12 +24063,13 @@
|
|
|
a8d2ab6 |
enable_alsa_shared=yes
|
|
|
a8d2ab6 |
fi;
|
|
|
a8d2ab6 |
if test "x`echo $ALSA_LIBS | grep -- -L`" = "x"; then
|
|
|
a8d2ab6 |
- if test "x`ls /lib/libasound.so.* 2> /dev/null`" != "x"; then
|
|
|
a8d2ab6 |
- ALSA_LIBS="-L/lib $ALSA_LIBS"
|
|
|
a8d2ab6 |
- elif test "x`ls /usr/lib/libasound.so.* 2> /dev/null`" != "x"; then
|
|
|
a8d2ab6 |
- ALSA_LIBS="-L/usr/lib $ALSA_LIBS"
|
|
|
a8d2ab6 |
- elif test "x`ls /usr/local/lib/libasound.so.* 2> /dev/null`" != "x"; then
|
|
|
a8d2ab6 |
- ALSA_LIBS="-L/usr/local/lib $ALSA_LIBS"
|
|
|
a8d2ab6 |
+ pfx=${libdir##*/}
|
|
|
a8d2ab6 |
+ if test "x`ls /${pfx}/libasound.so.* 2> /dev/null`" != "x"; then
|
|
|
a8d2ab6 |
+ ALSA_LIBS="-L/${pfx} $ALSA_LIBS"
|
|
|
a8d2ab6 |
+ elif test "x`ls /usr/${pfx}/libasound.so.* 2> /dev/null`" != "x"; then
|
|
|
a8d2ab6 |
+ ALSA_LIBS="-L/usr/${pfx} $ALSA_LIBS"
|
|
|
a8d2ab6 |
+ elif test "x`ls /usr/local/${pfx}/libasound.so.* 2> /dev/null`" != "x"; then
|
|
|
a8d2ab6 |
+ ALSA_LIBS="-L/usr/local/${pfx} $ALSA_LIBS"
|
|
|
a8d2ab6 |
fi
|
|
|
a8d2ab6 |
fi
|
|
|
a8d2ab6 |
alsa_lib_spec=`echo $ALSA_LIBS | sed 's/.*-L\([^ ]*\).*/\1\/libasound.so.*/'`
|
|
|
a8d2ab6 |
@@ -24704,7 +24705,8 @@
|
|
|
a8d2ab6 |
else
|
|
|
a8d2ab6 |
enable_arts_shared=yes
|
|
|
a8d2ab6 |
fi;
|
|
|
a8d2ab6 |
- arts_lib_spec="$ARTS_PREFIX/lib/libartsc.so.*"
|
|
|
a8d2ab6 |
+ pfx=${libdir##*/}
|
|
|
a8d2ab6 |
+ arts_lib_spec="$ARTS_PREFIX/${pfx}/libartsc.so.*"
|
|
|
a8d2ab6 |
arts_lib=`ls -- $arts_lib_spec | sed 's/.*\/\(.*\)/\1/; q'`
|
|
|
a8d2ab6 |
echo "-- $arts_lib_spec -> $arts_lib"
|
|
|
a8d2ab6 |
|