Do not use empty -R option when linking with --enable-rpath.

This commit is contained in:
Andrey Kiselev 2005-07-04 12:39:54 +00:00
parent 6625d0be12
commit 143ed91af3
2 changed files with 4 additions and 4 deletions

4
configure vendored
View File

@ -23538,7 +23538,7 @@ _ACEOF
LIBS="-lz $LIBS" LIBS="-lz $LIBS"
if test "$HAVE_RPATH" = "yes"; then if test "$HAVE_RPATH" = "yes" -a "x$with_zlib_lib_dir" != "x" ; then
LIBDIR="-R $with_zlib_lib_dir $LIBDIR" LIBDIR="-R $with_zlib_lib_dir $LIBDIR"
fi fi
@ -23832,7 +23832,7 @@ _ACEOF
LIBS="-ljpeg $LIBS" LIBS="-ljpeg $LIBS"
if test "$HAVE_RPATH" = "yes"; then if test "$HAVE_RPATH" = "yes" -a "x$with_jpeg_lib_dir" != "x" ; then
LIBDIR="-R $with_jpeg_lib_dir $LIBDIR" LIBDIR="-R $with_jpeg_lib_dir $LIBDIR"
fi fi

View File

@ -293,7 +293,7 @@ if test "$HAVE_ZLIB" = "yes" ; then
AC_DEFINE(ZIP_SUPPORT,1,[Support Deflate compression]) AC_DEFINE(ZIP_SUPPORT,1,[Support Deflate compression])
LIBS="-lz $LIBS" LIBS="-lz $LIBS"
if test "$HAVE_RPATH" = "yes"; then if test "$HAVE_RPATH" = "yes" -a "x$with_zlib_lib_dir" != "x" ; then
LIBDIR="-R $with_zlib_lib_dir $LIBDIR" LIBDIR="-R $with_zlib_lib_dir $LIBDIR"
fi fi
@ -361,7 +361,7 @@ if test "$HAVE_JPEG" = "yes" ; then
AC_DEFINE(JPEG_SUPPORT,1,[Support JPEG compression (requires IJG JPEG library)]) AC_DEFINE(JPEG_SUPPORT,1,[Support JPEG compression (requires IJG JPEG library)])
LIBS="-ljpeg $LIBS" LIBS="-ljpeg $LIBS"
if test "$HAVE_RPATH" = "yes"; then if test "$HAVE_RPATH" = "yes" -a "x$with_jpeg_lib_dir" != "x" ; then
LIBDIR="-R $with_jpeg_lib_dir $LIBDIR" LIBDIR="-R $with_jpeg_lib_dir $LIBDIR"
fi fi