configure.in
branchSDL-1.2
changeset 4212 0794718a428c
parent 4208 453587d6dc87
child 4221 c56391324e59
     1.1 --- a/configure.in	Mon Sep 21 08:03:00 2009 +0000
     1.2 +++ b/configure.in	Mon Sep 21 08:31:15 2009 +0000
     1.3 @@ -287,6 +287,9 @@
     1.4      AC_DEFINE(SDL_ASSEMBLY_ROUTINES)
     1.5  fi
     1.6  
     1.7 +dnl set this to use on systems that use lib64 instead of lib
     1.8 +base_libdir=`echo \${libdir} | sed 's/.*\/\(.*\)/\1/; q'`
     1.9 +
    1.10  dnl See if the OSS audio interface is supported
    1.11  CheckOSS()
    1.12  {
    1.13 @@ -348,12 +351,12 @@
    1.14  AC_HELP_STRING([--enable-alsa-shared], [dynamically load ALSA audio support [[default=yes]]]),
    1.15                            , enable_alsa_shared=yes)
    1.16              if test "x`echo $ALSA_LIBS | grep -- -L`" = "x"; then
    1.17 -                if test "x`ls /lib/libasound.so.* 2> /dev/null`" != "x"; then
    1.18 -                    ALSA_LIBS="-L/lib $ALSA_LIBS"
    1.19 -                elif test "x`ls /usr/lib/libasound.so.* 2> /dev/null`" != "x"; then
    1.20 -                    ALSA_LIBS="-L/usr/lib $ALSA_LIBS"
    1.21 -                elif test "x`ls /usr/local/lib/libasound.so.* 2> /dev/null`" != "x"; then
    1.22 -                    ALSA_LIBS="-L/usr/local/lib $ALSA_LIBS"
    1.23 +                if test "x`ls /$base_libdir/libasound.so.* 2> /dev/null`" != "x"; then
    1.24 +                    ALSA_LIBS="-L/$base_libdir $ALSA_LIBS"
    1.25 +                elif test "x`ls /usr/$base_libdir/libasound.so.* 2> /dev/null`" != "x"; then
    1.26 +                    ALSA_LIBS="-L/usr/$base_libdir $ALSA_LIBS"
    1.27 +                elif test "x`ls /usr/local/$base_libdir/libasound.so.* 2> /dev/null`" != "x"; then
    1.28 +                    ALSA_LIBS="-L/usr/local/$base_libdir $ALSA_LIBS"
    1.29                  fi
    1.30              fi
    1.31              alsa_lib_spec=`echo $ALSA_LIBS | sed 's/.*-L\([[^ ]]*\).*/\1\/libasound.so.*/'`
    1.32 @@ -501,12 +504,12 @@
    1.33  AC_HELP_STRING([--enable-pulseaudio-shared], [dynamically load PulseAudio support [[default=yes]]]),
    1.34                            , enable_pulse_shared=yes)
    1.35              if test "x`echo $PULSE_LIBS | grep -- -L`" = "x"; then
    1.36 -                if test "x`ls /lib/libpulse-simple.so.* 2> /dev/null`" != "x"; then
    1.37 -                    PULSE_LIBS="-L/lib $PULSE_LIBS"
    1.38 -                elif test "x`ls /usr/lib/libpulse-simple.so.* 2> /dev/null`" != "x"; then
    1.39 -                    PULSE_LIBS="-L/usr/lib $PULSE_LIBS"
    1.40 -                elif test "x`ls /usr/local/lib/libpulse-simple.so.* 2> /dev/null`" != "x"; then
    1.41 -                    PULSE_LIBS="-L/usr/local/lib $PULSE_LIBS"
    1.42 +                if test "x`ls /$base_libdir/libpulse-simple.so.* 2> /dev/null`" != "x"; then
    1.43 +                    PULSE_LIBS="-L/$base_libdir $PULSE_LIBS"
    1.44 +                elif test "x`ls /usr/$base_libdir/libpulse-simple.so.* 2> /dev/null`" != "x"; then
    1.45 +                    PULSE_LIBS="-L/usr/$base_libdir $PULSE_LIBS"
    1.46 +                elif test "x`ls /usr/local/$base_libdir/libpulse-simple.so.* 2> /dev/null`" != "x"; then
    1.47 +                    PULSE_LIBS="-L/usr/local/$base_libdir $PULSE_LIBS"
    1.48                  fi
    1.49              fi
    1.50              pulse_lib_spec=`echo $PULSE_LIBS | sed 's/.*-L\([[^ ]]*\).*/\1\/libpulse-simple.so.*/'`
    1.51 @@ -561,7 +564,7 @@
    1.52                  AC_ARG_ENABLE(arts-shared,
    1.53  AC_HELP_STRING([--enable-arts-shared], [dynamically load aRts audio support [[default=yes]]]),
    1.54                                , enable_arts_shared=yes)
    1.55 -                arts_lib_spec="$ARTS_PREFIX/lib/libartsc.so.*"
    1.56 +                arts_lib_spec="$ARTS_PREFIX/$base_libdir/libartsc.so.*"
    1.57                  arts_lib=`ls -- $arts_lib_spec | sed 's/.*\/\(.*\)/\1/; q'`
    1.58                  echo "-- $arts_lib_spec -> $arts_lib"
    1.59  
    1.60 @@ -987,7 +990,7 @@
    1.61                      ;;
    1.62                  *)
    1.63                      x11_lib_path=[`echo $X_LIBS | sed 's/.*-L\([^ ]*\).*/\1/'`]
    1.64 -                    for path in $x11_lib_path /usr/lib /usr/X11/lib /usr/X11R6/lib; do
    1.65 +                    for path in $x11_lib_path /usr/$base_libdir /usr/X11/$base_libdir /usr/X11R6/$base_libdir; do
    1.66                          if test "x$x11_lib" = "x"; then
    1.67                              x11_lib=[`ls -- $path/libX11.so.[0-9] 2>/dev/null | sort -r | sed 's/.*\/\(.*\)/\1/; q'`]
    1.68                              if test "x$x11_lib" = "x"; then