SDL/SDL-1.2.10-libdir.patch

   1 --- SDL-1.2.10/configure.in.libdir      2006-05-17 05:16:07.000000000 +0200
   2 +++ SDL-1.2.10/configure.in     2006-05-19 11:05:42.000000000 +0200
   3 @@ -324,12 +324,13 @@
   4  AC_HELP_STRING([--enable-alsa-shared], [dynamically load ALSA audio support [[default=yes]]]),
   5                            , enable_alsa_shared=yes)
   6              if test "x`echo $ALSA_LIBS | grep -- -L`" = "x"; then
   7 -                if test "x`ls /lib/libasound.so.* 2> /dev/null`" != "x"; then
   8 -                    ALSA_LIBS="-L/lib $ALSA_LIBS"
   9 -                elif test "x`ls /usr/lib/libasound.so.* 2> /dev/null`" != "x"; then
  10 -                    ALSA_LIBS="-L/usr/lib $ALSA_LIBS"
  11 -                elif test "x`ls /usr/local/lib/libasound.so.* 2> /dev/null`" != "x"; then
  12 -                    ALSA_LIBS="-L/usr/local/lib $ALSA_LIBS"
  13 +               pfx=${libdir##*/}
  14 +                if test "x`ls /${pfx}/libasound.so.* 2> /dev/null`" != "x"; then
  15 +                    ALSA_LIBS="-L/${pfx} $ALSA_LIBS"
  16 +                elif test "x`ls /usr/${pfx}/libasound.so.* 2> /dev/null`" != "x"; then
  17 +                    ALSA_LIBS="-L/usr/${pfx} $ALSA_LIBS"
  18 +                elif test "x`ls /usr/local/${pfx}/libasound.so.* 2> /dev/null`" != "x"; then
  19 +                    ALSA_LIBS="-L/usr/local/${pfx} $ALSA_LIBS"
  20                  fi
  21              fi
  22              alsa_lib_spec=`echo $ALSA_LIBS | sed 's/.*-L\([[^ ]]*\).*/\1\/libasound.so.*/'`
  23 @@ -480,7 +481,8 @@
  24                  AC_ARG_ENABLE(arts-shared,
  25  AC_HELP_STRING([--enable-arts-shared], [dynamically load aRts audio support [[default=yes]]]),
  26                                , enable_arts_shared=yes)
  27 -                arts_lib_spec="$ARTS_PREFIX/lib/libartsc.so.*"
  28 +                pfx=${libdir##*/}
  29 +                arts_lib_spec="$ARTS_PREFIX/${pfx}/libartsc.so.*"
  30                  arts_lib=`ls -- $arts_lib_spec | sed 's/.*\/\(.*\)/\1/; q'`
  31                  echo "-- $arts_lib_spec -> $arts_lib"
  32
  33 --- SDL-1.2.10/configure.libdir 2006-05-17 08:53:45.000000000 +0200
  34 +++ SDL-1.2.10/configure        2006-05-19 11:06:08.000000000 +0200
  35 @@ -24063,12 +24063,13 @@
  36    enable_alsa_shared=yes
  37  fi;
  38              if test "x`echo $ALSA_LIBS | grep -- -L`" = "x"; then
  39 -                if test "x`ls /lib/libasound.so.* 2> /dev/null`" != "x"; then
  40 -                    ALSA_LIBS="-L/lib $ALSA_LIBS"
  41 -                elif test "x`ls /usr/lib/libasound.so.* 2> /dev/null`" != "x"; then
  42 -                    ALSA_LIBS="-L/usr/lib $ALSA_LIBS"
  43 -                elif test "x`ls /usr/local/lib/libasound.so.* 2> /dev/null`" != "x"; then
  44 -                    ALSA_LIBS="-L/usr/local/lib $ALSA_LIBS"
  45 +               pfx=${libdir##*/}
  46 +                if test "x`ls /${pfx}/libasound.so.* 2> /dev/null`" != "x"; then
  47 +                    ALSA_LIBS="-L/${pfx} $ALSA_LIBS"
  48 +                elif test "x`ls /usr/${pfx}/libasound.so.* 2> /dev/null`" != "x"; then
  49 +                    ALSA_LIBS="-L/usr/${pfx} $ALSA_LIBS"
  50 +                elif test "x`ls /usr/local/${pfx}/libasound.so.* 2> /dev/null`" != "x"; then
  51 +                    ALSA_LIBS="-L/usr/local/${pfx} $ALSA_LIBS"
  52                  fi
  53              fi
  54              alsa_lib_spec=`echo $ALSA_LIBS | sed 's/.*-L\([^ ]*\).*/\1\/libasound.so.*/'`
  55 @@ -24704,7 +24705,8 @@
  56  else
  57    enable_arts_shared=yes
  58  fi;
  59 -                arts_lib_spec="$ARTS_PREFIX/lib/libartsc.so.*"
  60 +                pfx=${libdir##*/}
  61 +                arts_lib_spec="$ARTS_PREFIX/${pfx}/libartsc.so.*"
  62                  arts_lib=`ls -- $arts_lib_spec | sed 's/.*\/\(.*\)/\1/; q'`
  63                  echo "-- $arts_lib_spec -> $arts_lib"
  64