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