Skip to content
Permalink
Browse files
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
  • Loading branch information
slouken committed Sep 24, 2006
1 parent 4342de5 commit 82562367d5825fdd94b0625e4b8e38e654b2f836
Showing with 3 additions and 3 deletions.
  1. +3 −3 configure.in
@@ -2612,10 +2612,10 @@ SDLMAIN_OBJECTS=`echo $SDLMAIN_OBJECTS | sed 's,[[^ ]]*/\([[^ ]]*\)\.c,$(objects

if test "x$enable_rpath" = "xyes"; then
if test $ARCH = bsdi -o $ARCH = freebsd -o $ARCH = irix -o $ARCH = linux -o $ARCH = netbsd; then
SDL_RLD_FLAGS="-Wl,-rpath,\${exec_prefix}/lib"
SDL_RLD_FLAGS="-Wl,-rpath,\${libdir}"
fi
if test $ARCH = solaris; then
SDL_RLD_FLAGS="-R\${exec_prefix}/lib"
SDL_RLD_FLAGS="-R\${libdir}"
fi
else
SDL_RLD_FLAGS=""
@@ -2630,7 +2630,7 @@ case "$ARCH" in
SDL_LIBS="$SDL_LIBS -Wl,-framework,Carbon"
fi
# Evil hack to allow static linking on Mac OS X
SDL_STATIC_LIBS="\${exec_prefix}/lib/libSDLmain.a \${exec_prefix}/lib/libSDL.a $EXTRA_LDFLAGS"
SDL_STATIC_LIBS="\${libdir}/libSDLmain.a \${libdir}/libSDL.a $EXTRA_LDFLAGS"
;;
*)
SDL_STATIC_LIBS="$SDL_LIBS"

0 comments on commit 8256236

Please sign in to comment.