Do not use empty -R option when linking with --enable-rpath.
This commit is contained in:
parent
6625d0be12
commit
143ed91af3
4
configure
vendored
4
configure
vendored
@ -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
|
||||||
|
|
||||||
|
@ -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
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user