diff -Naur SDL-1.2.13/configure.in SDL-1.2.13.tpg/configure.in --- SDL-1.2.13/configure.in 2007-12-31 04:48:39.000000000 +0000 +++ SDL-1.2.13.tpg/configure.in 2008-01-11 18:54:04.000000000 +0000 @@ -348,8 +348,8 @@ 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" + if test "x`ls ${libdir}/libasound.so.* 2> /dev/null`" != "x"; then + ALSA_LIBS="-L${libdir} $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 @@ -452,7 +452,7 @@ AC_ARG_ENABLE(esd-shared, AC_HELP_STRING([--enable-esd-shared], [dynamically load ESD audio support [[default=yes]]]), , enable_esd_shared=yes) - esd_lib_spec=`echo $ESD_LIBS | sed 's/.*-L\([[^ ]]*\).*/\1\/libesd.so.*/'` + esd_lib_spec="${libdir}/libesd.so.*" esd_lib=`ls -- $esd_lib_spec | sed 's/.*\/\(.*\)/\1/; q'` echo "-- $esd_lib_spec -> $esd_lib" @@ -501,8 +501,8 @@ AC_HELP_STRING([--enable-pulseaudio-shared], [dynamically load PulseAudio support [[default=yes]]]), , enable_pulse_shared=yes) if test "x`echo $PULSE_LIBS | grep -- -L`" = "x"; then - if test "x`ls /lib/libpulse-simple.so.* 2> /dev/null`" != "x"; then - PULSE_LIBS="-L/lib $PULSE_LIBS" + if test "x`ls ${libdir}/libpulse-simple.so.* 2> /dev/null`" != "x"; then + PULSE_LIBS="-L${libdir} $PULSE_LIBS" elif test "x`ls /usr/lib/libpulse-simple.so.* 2> /dev/null`" != "x"; then PULSE_LIBS="-L/usr/lib $PULSE_LIBS" elif test "x`ls /usr/local/lib/libpulse-simple.so.* 2> /dev/null`" != "x"; then @@ -561,7 +561,7 @@ 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.*" + arts_lib_spec="${libdir}/libartsc.so.*" arts_lib=`ls -- $arts_lib_spec | sed 's/.*\/\(.*\)/\1/; q'` echo "-- $arts_lib_spec -> $arts_lib" @@ -603,10 +603,10 @@ have_nas=no if test x$have_audio_hdr = xyes -a x$have_audio_lib = xyes; then have_nas=yes - NAS_LIBS="-laudio -lXt" + NAS_LIBS="-L${libdir} -laudio -lXt" elif test x$have_nas_hdr = xyes -a x$have_nas_lib = xyes; then have_nas=yes - NAS_LIBS="-lnas -lXt" + NAS_LIBS="-L${libdir} -lnas -lXt" fi AC_MSG_RESULT($have_nas) @@ -912,8 +912,8 @@ *-*-darwin*) # This isn't necessary for X11, but fixes GLX detection if test "x$x_includes" = xNONE && test "x$x_libraries" = xNONE; then - x_includes="/usr/X11R6/include" - x_libraries="/usr/X11R6/lib" + x_includes="/usr/include" + x_libraries="${libdir}" fi ;; esac @@ -947,7 +947,7 @@ ;; *) x11_lib_path=[`echo $X_LIBS | sed 's/.*-L\([^ ]*\).*/\1/'`] - for path in $x11_lib_path /usr/lib /usr/X11/lib /usr/X11R6/lib; do + for path in $x11_lib_path ${libdir} /usr/X11/lib /usr/X11R6/lib; do if test "x$x11_lib" = "x"; then x11_lib=[`ls -- $path/libX11.so.[0-9] 2>/dev/null | sort -r | sed 's/.*\/\(.*\)/\1/; q'`] if test "x$x11_lib" = "x"; then