comparison configure.in @ 3875:fbde7ed1a835 SDL-1.2

Fixed bug #321 Hi, if "configure" is given an explicit --libdir, the sdl-config still contains the default "${exec_prefix}/lib" for runtime linker path. That should be changed to $libdir, as this is where the library goes to... Regards, Juergen
author Sam Lantinga <slouken@libsdl.org>
date Sun, 24 Sep 2006 00:43:36 +0000
parents cef30206da53
children 636320238bc8
comparison
equal deleted inserted replaced
3874:c1c562a797a7 3875:fbde7ed1a835
2610 2610
2611 # Set runtime shared library paths as needed 2611 # Set runtime shared library paths as needed
2612 2612
2613 if test "x$enable_rpath" = "xyes"; then 2613 if test "x$enable_rpath" = "xyes"; then
2614 if test $ARCH = bsdi -o $ARCH = freebsd -o $ARCH = irix -o $ARCH = linux -o $ARCH = netbsd; then 2614 if test $ARCH = bsdi -o $ARCH = freebsd -o $ARCH = irix -o $ARCH = linux -o $ARCH = netbsd; then
2615 SDL_RLD_FLAGS="-Wl,-rpath,\${exec_prefix}/lib" 2615 SDL_RLD_FLAGS="-Wl,-rpath,\${libdir}"
2616 fi 2616 fi
2617 if test $ARCH = solaris; then 2617 if test $ARCH = solaris; then
2618 SDL_RLD_FLAGS="-R\${exec_prefix}/lib" 2618 SDL_RLD_FLAGS="-R\${libdir}"
2619 fi 2619 fi
2620 else 2620 else
2621 SDL_RLD_FLAGS="" 2621 SDL_RLD_FLAGS=""
2622 fi 2622 fi
2623 2623
2628 fi 2628 fi
2629 if test x$enable_video = xyes -a x$enable_video_carbon = xyes; then 2629 if test x$enable_video = xyes -a x$enable_video_carbon = xyes; then
2630 SDL_LIBS="$SDL_LIBS -Wl,-framework,Carbon" 2630 SDL_LIBS="$SDL_LIBS -Wl,-framework,Carbon"
2631 fi 2631 fi
2632 # Evil hack to allow static linking on Mac OS X 2632 # Evil hack to allow static linking on Mac OS X
2633 SDL_STATIC_LIBS="\${exec_prefix}/lib/libSDLmain.a \${exec_prefix}/lib/libSDL.a $EXTRA_LDFLAGS" 2633 SDL_STATIC_LIBS="\${libdir}/libSDLmain.a \${libdir}/libSDL.a $EXTRA_LDFLAGS"
2634 ;; 2634 ;;
2635 *) 2635 *)
2636 SDL_STATIC_LIBS="$SDL_LIBS" 2636 SDL_STATIC_LIBS="$SDL_LIBS"
2637 ;; 2637 ;;
2638 esac 2638 esac