configure.in
changeset 1384 6fd39b50dd91
parent 1383 1736c5e2173f
child 1389 ce65f014190a
     1.1 --- a/configure.in	Mon Feb 20 03:57:03 2006 +0000
     1.2 +++ b/configure.in	Mon Feb 20 08:49:00 2006 +0000
     1.3 @@ -737,20 +737,24 @@
     1.4                            , enable_x11_shared=yes)
     1.5  
     1.6              case "$target" in
     1.7 -                *-*-darwin* )
     1.8 +                *-*-darwin*)
     1.9                      x11_lib='/usr/X11R6/lib/libX11.6.dylib'
    1.10                      x11ext_lib='/usr/X11R6/lib/libXext.6.dylib'
    1.11                      ;;
    1.12 -                *-*-osf* )
    1.13 +                *-*-osf*)
    1.14 +                    x11_lib='libX11.so'
    1.15 +                    x11ext_lib='libXext.so'
    1.16 +                    ;;
    1.17 +                *-*-irix*) # IRIX 6.5 requires that we use /usr/lib32
    1.18                      x11_lib='libX11.so'
    1.19                      x11ext_lib='libXext.so'
    1.20                      ;;
    1.21                  *)
    1.22                      if test x$X_LIBS = x; then X_LIBS="-L/usr/lib"; fi
    1.23 -                    x11_lib_spec=`echo $X_LIBS | sed 's/.*-L\([[^ ]]*\).*/\1\/libX11.so.*/'`
    1.24 -                    x11_lib=`ls $x11_lib_spec | sed 's/.*\/\(.*\)/\1/; q'`
    1.25 -                    x11ext_lib_spec=`echo $X_LIBS | sed 's/.*-L\([[^ ]]*\).*/\1\/libXext.so.*/'`
    1.26 -                    x11ext_lib=`ls $x11ext_lib_spec | sed 's/.*\/\(.*\)/\1/; q'`
    1.27 +                    x11_lib_spec=`echo $X_LIBS | sed 's/.*-L\([[^ ]]*\).*/\1\/libX11.so*/'`
    1.28 +                    x11_lib=`ls $x11_lib_spec 2>/dev/null | sort -r | sed 's/.*\/\(.*\)/\1/; q'`
    1.29 +                    x11ext_lib_spec=`echo $X_LIBS | sed 's/.*-L\([[^ ]]*\).*/\1\/libXext.so*/'`
    1.30 +                    x11ext_lib=`ls $x11ext_lib_spec 2>/dev/null | sort -r | sed 's/.*\/\(.*\)/\1/; q'`
    1.31                      ;;
    1.32              esac
    1.33  
    1.34 @@ -2352,7 +2356,7 @@
    1.35  # Set runtime shared library paths as needed
    1.36  
    1.37  if test "x$enable_rpath" = "xyes"; then
    1.38 -  if test $ARCH = linux -o $ARCH = freebsd -o $ARCH = bsdi; then
    1.39 +  if test $ARCH = linux -o $ARCH = freebsd -o $ARCH = bsdi -o $ARCH = irix; then
    1.40      SDL_RLD_FLAGS="-Wl,-rpath,\${exec_prefix}/lib"
    1.41    fi
    1.42    if test $ARCH = solaris; then