SDL/SDL-1.2.13-libdir.patch

   1 diff -up SDL-1.2.13/configure.in.libdir SDL-1.2.13/configure.in
   2 --- SDL-1.2.13/configure.in.libdir      2007-12-31 05:48:39.000000000 +0100
   3 +++ SDL-1.2.13/configure.in     2008-01-07 11:56:10.000000000 +0100
   4 @@ -348,12 +348,13 @@ AC_HELP_STRING([--enable-alsa], [support
   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 -                elif test "x`ls /usr/lib/libasound.so.* 2> /dev/null`" != "x"; then
  11 -                    ALSA_LIBS="-L/usr/lib $ALSA_LIBS"
  12 -                elif test "x`ls /usr/local/lib/libasound.so.* 2> /dev/null`" != "x"; then
  13 -                    ALSA_LIBS="-L/usr/local/lib $ALSA_LIBS"
  14 +               pfx=${libdir##*/}
  15 +                if test "x`ls /${pfx}/libasound.so.* 2> /dev/null`" != "x"; then
  16 +                    ALSA_LIBS="-L/${pfx} $ALSA_LIBS"
  17 +                elif test "x`ls /usr/${pfx}/libasound.so.* 2> /dev/null`" != "x"; then
  18 +                    ALSA_LIBS="-L/usr/${pfx} $ALSA_LIBS"
  19 +                elif test "x`ls /usr/local/${pfx}/libasound.so.* 2> /dev/null`" != "x"; then
  20 +                    ALSA_LIBS="-L/usr/local/${pfx} $ALSA_LIBS"
  21                  fi
  22              fi
  23              alsa_lib_spec=`echo $ALSA_LIBS | sed 's/.*-L\([[^ ]]*\).*/\1\/libasound.so.*/'`
  24 @@ -561,7 +572,8 @@ AC_HELP_STRING([--enable-arts], [support
  25                  AC_ARG_ENABLE(arts-shared,
  26  AC_HELP_STRING([--enable-arts-shared], [dynamically load aRts audio support [[default=yes]]]),
  27                                , enable_arts_shared=yes)
  28 -                arts_lib_spec="$ARTS_PREFIX/lib/libartsc.so.*"
  29 +                pfx=${libdir##*/}
  30 +                arts_lib_spec="$ARTS_PREFIX/${pfx}/libartsc.so.*"
  31                  arts_lib=`ls -- $arts_lib_spec | sed 's/.*\/\(.*\)/\1/; q'`
  32                  echo "-- $arts_lib_spec -> $arts_lib"
  33
  34 diff -up SDL-1.2.13/configure.libdir SDL-1.2.13/configure
  35 --- SDL-1.2.13/configure.libdir 2007-12-31 06:09:39.000000000 +0100
  36 +++ SDL-1.2.13/configure        2008-01-07 12:01:32.000000000 +0100
  37 @@ -24888,12 +24888,13 @@ else
  38  fi
  39
  40              if test "x`echo $ALSA_LIBS | grep -- -L`" = "x"; then
  41 -                if test "x`ls /lib/libasound.so.* 2> /dev/null`" != "x"; then
  42 -                    ALSA_LIBS="-L/lib $ALSA_LIBS"
  43 -                elif test "x`ls /usr/lib/libasound.so.* 2> /dev/null`" != "x"; then
  44 -                    ALSA_LIBS="-L/usr/lib $ALSA_LIBS"
  45 -                elif test "x`ls /usr/local/lib/libasound.so.* 2> /dev/null`" != "x"; then
  46 -                    ALSA_LIBS="-L/usr/local/lib $ALSA_LIBS"
  47 +               pfx=${libdir##*/}
  48 +                if test "x`ls /${pfx}/libasound.so.* 2> /dev/null`" != "x"; then
  49 +                    ALSA_LIBS="-L/${pfx} $ALSA_LIBS"
  50 +                elif test "x`ls /usr/${pfx}/libasound.so.* 2> /dev/null`" != "x"; then
  51 +                    ALSA_LIBS="-L/usr/${pfx} $ALSA_LIBS"
  52 +                elif test "x`ls /usr/local/${pfx}/libasound.so.* 2> /dev/null`" != "x"; then
  53 +                    ALSA_LIBS="-L/usr/local/${pfx} $ALSA_LIBS"
  54                  fi
  55              fi
  56              alsa_lib_spec=`echo $ALSA_LIBS | sed 's/.*-L\([^ ]*\).*/\1\/libasound.so.*/'`
  57 @@ -25643,7 +25634,8 @@ else
  58    enable_arts_shared=yes
  59  fi
  60
  61 -                arts_lib_spec="$ARTS_PREFIX/lib/libartsc.so.*"
  62 +               pfx=${libdir##*/}
  63 +                arts_lib_spec="$ARTS_PREFIX/${pfx}/libartsc.so.*"
  64                  arts_lib=`ls -- $arts_lib_spec | sed 's/.*\/\(.*\)/\1/; q'`
  65                  echo "-- $arts_lib_spec -> $arts_lib"
  66