From 143ed91af38a6f95acaa554282c42c833951dccd Mon Sep 17 00:00:00 2001
From: Andrey Kiselev <dron@ak4719.spb.edu>
Date: Mon, 4 Jul 2005 12:39:54 +0000
Subject: [PATCH] Do not use empty -R option when linking with --enable-rpath.

---
 configure    | 4 ++--
 configure.ac | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/configure b/configure
index 9b5763d9..8facf372 100755
--- a/configure
+++ b/configure
@@ -23538,7 +23538,7 @@ _ACEOF
 
   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"
   fi
 
@@ -23832,7 +23832,7 @@ _ACEOF
 
   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"
   fi
 
diff --git a/configure.ac b/configure.ac
index 674da4ce..c5e33565 100644
--- a/configure.ac
+++ b/configure.ac
@@ -293,7 +293,7 @@ if test "$HAVE_ZLIB" = "yes" ; then
   AC_DEFINE(ZIP_SUPPORT,1,[Support Deflate compression])
   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"
   fi
 
@@ -361,7 +361,7 @@ if test "$HAVE_JPEG" = "yes" ; then
   AC_DEFINE(JPEG_SUPPORT,1,[Support JPEG compression (requires IJG JPEG library)])
   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"
   fi