| 1 |
diff -Naur SDL-1.2.13/configure.in SDL-1.2.13.tpg/configure.in |
| 2 |
--- SDL-1.2.13/configure.in 2007-12-31 04:48:39.000000000 +0000 |
| 3 |
+++ SDL-1.2.13.tpg/configure.in 2008-01-11 18:54:04.000000000 +0000 |
| 4 |
@@ -348,8 +348,8 @@ |
| 5 |
AC_HELP_STRING([--enable-alsa-shared], [dynamically load ALSA audio support [[default=yes]]]), |
| 6 |
, enable_alsa_shared=yes) |
| 7 |
if test "x`echo $ALSA_LIBS | grep -- -L`" = "x"; then |
| 8 |
- if test "x`ls /lib/libasound.so.* 2> /dev/null`" != "x"; then |
| 9 |
- ALSA_LIBS="-L/lib $ALSA_LIBS" |
| 10 |
+ if test "x`ls ${libdir}/libasound.so.* 2> /dev/null`" != "x"; then |
| 11 |
+ ALSA_LIBS="-L${libdir} $ALSA_LIBS" |
| 12 |
elif test "x`ls /usr/lib/libasound.so.* 2> /dev/null`" != "x"; then |
| 13 |
ALSA_LIBS="-L/usr/lib $ALSA_LIBS" |
| 14 |
elif test "x`ls /usr/local/lib/libasound.so.* 2> /dev/null`" != "x"; then |
| 15 |
@@ -452,7 +452,7 @@ |
| 16 |
AC_ARG_ENABLE(esd-shared, |
| 17 |
AC_HELP_STRING([--enable-esd-shared], [dynamically load ESD audio support [[default=yes]]]), |
| 18 |
, enable_esd_shared=yes) |
| 19 |
- esd_lib_spec=`echo $ESD_LIBS | sed 's/.*-L\([[^ ]]*\).*/\1\/libesd.so.*/'` |
| 20 |
+ esd_lib_spec="${libdir}/libesd.so.*" |
| 21 |
esd_lib=`ls -- $esd_lib_spec | sed 's/.*\/\(.*\)/\1/; q'` |
| 22 |
echo "-- $esd_lib_spec -> $esd_lib" |
| 23 |
|
| 24 |
@@ -501,8 +501,8 @@ |
| 25 |
AC_HELP_STRING([--enable-pulseaudio-shared], [dynamically load PulseAudio support [[default=yes]]]), |
| 26 |
, enable_pulse_shared=yes) |
| 27 |
if test "x`echo $PULSE_LIBS | grep -- -L`" = "x"; then |
| 28 |
- if test "x`ls /lib/libpulse-simple.so.* 2> /dev/null`" != "x"; then |
| 29 |
- PULSE_LIBS="-L/lib $PULSE_LIBS" |
| 30 |
+ if test "x`ls ${libdir}/libpulse-simple.so.* 2> /dev/null`" != "x"; then |
| 31 |
+ PULSE_LIBS="-L${libdir} $PULSE_LIBS" |
| 32 |
elif test "x`ls /usr/lib/libpulse-simple.so.* 2> /dev/null`" != "x"; then |
| 33 |
PULSE_LIBS="-L/usr/lib $PULSE_LIBS" |
| 34 |
elif test "x`ls /usr/local/lib/libpulse-simple.so.* 2> /dev/null`" != "x"; then |
| 35 |
@@ -561,7 +561,7 @@ |
| 36 |
AC_ARG_ENABLE(arts-shared, |
| 37 |
AC_HELP_STRING([--enable-arts-shared], [dynamically load aRts audio support [[default=yes]]]), |
| 38 |
, enable_arts_shared=yes) |
| 39 |
- arts_lib_spec="$ARTS_PREFIX/lib/libartsc.so.*" |
| 40 |
+ arts_lib_spec="${libdir}/libartsc.so.*" |
| 41 |
arts_lib=`ls -- $arts_lib_spec | sed 's/.*\/\(.*\)/\1/; q'` |
| 42 |
echo "-- $arts_lib_spec -> $arts_lib" |
| 43 |
|
| 44 |
@@ -603,10 +603,10 @@ |
| 45 |
have_nas=no |
| 46 |
if test x$have_audio_hdr = xyes -a x$have_audio_lib = xyes; then |
| 47 |
have_nas=yes |
| 48 |
- NAS_LIBS="-laudio -lXt" |
| 49 |
+ NAS_LIBS="-L${libdir} -laudio -lXt" |
| 50 |
elif test x$have_nas_hdr = xyes -a x$have_nas_lib = xyes; then |
| 51 |
have_nas=yes |
| 52 |
- NAS_LIBS="-lnas -lXt" |
| 53 |
+ NAS_LIBS="-L${libdir} -lnas -lXt" |
| 54 |
fi |
| 55 |
AC_MSG_RESULT($have_nas) |
| 56 |
|
| 57 |
@@ -912,8 +912,8 @@ |
| 58 |
*-*-darwin*) |
| 59 |
# This isn't necessary for X11, but fixes GLX detection |
| 60 |
if test "x$x_includes" = xNONE && test "x$x_libraries" = xNONE; then |
| 61 |
- x_includes="/usr/X11R6/include" |
| 62 |
- x_libraries="/usr/X11R6/lib" |
| 63 |
+ x_includes="/usr/include" |
| 64 |
+ x_libraries="${libdir}" |
| 65 |
fi |
| 66 |
;; |
| 67 |
esac |
| 68 |
@@ -947,7 +947,7 @@ |
| 69 |
;; |
| 70 |
*) |
| 71 |
x11_lib_path=[`echo $X_LIBS | sed 's/.*-L\([^ ]*\).*/\1/'`] |
| 72 |
- for path in $x11_lib_path /usr/lib /usr/X11/lib /usr/X11R6/lib; do |
| 73 |
+ for path in $x11_lib_path ${libdir} /usr/X11/lib /usr/X11R6/lib; do |
| 74 |
if test "x$x11_lib" = "x"; then |
| 75 |
x11_lib=[`ls -- $path/libX11.so.[0-9] 2>/dev/null | sort -r | sed 's/.*\/\(.*\)/\1/; q'`] |
| 76 |
if test "x$x11_lib" = "x"; then |
Parent Directory
| 
Revision Log