--- configure.orig 2009-06-19 18:44:21.000000000 +0400
+++ configure 2009-07-29 16:01:13.000000000 +0400
@@ -4183,7 +4183,7 @@
"SunOS 5"*)
echo "$as_me:$LINENO: checking whether -R must be followed by a space" >&5
echo $ECHO_N "checking whether -R must be followed by a space... $ECHO_C" >&6
- ac_xsave_LIBS=$LIBS; LIBS="$LIBS -R$x_libraries"
+ ac_xsave_LIBS=$LIBS; LIBS="$LIBS"
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -4233,9 +4233,9 @@
if test $ac_R_nospace = yes; then
echo "$as_me:$LINENO: result: no" >&5
echo "${ECHO_T}no" >&6
- X_LIBS="$X_LIBS -R$x_libraries"
+ X_LIBS="$X_LIBS"
else
- LIBS="$ac_xsave_LIBS -R $x_libraries"
+ LIBS="$ac_xsave_LIBS"
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -4285,7 +4285,7 @@
if test $ac_R_space = yes; then
echo "$as_me:$LINENO: result: yes" >&5
echo "${ECHO_T}yes" >&6
- X_LIBS="$X_LIBS -R $x_libraries"
+ X_LIBS="$X_LIBS"
else
echo "$as_me:$LINENO: result: neither works" >&5
echo "${ECHO_T}neither works" >&6
@@ -6705,7 +6705,7 @@
if test ! -z "$HAVE_LIBXFIXES" -o ! -z "$HAVE_LIBXDAMAGE"; then
# need /usr/sfw/lib in RPATH for Solaris 10 and later
case `(uname -sr) 2>/dev/null` in
- "SunOS 5"*) X_EXTRA_LIBS="$X_EXTRA_LIBS -R/usr/sfw/lib" ;;
+ "SunOS 5"*) X_EXTRA_LIBS="$X_EXTRA_LIBS" ;;
esac
fi
if test ! -z "$HAVE_LIBXRANDR"; then
@@ -7026,9 +7026,9 @@
if test "x$ld_minus_R" = "xno"; then
:
elif test "x$GCC" = "xyes"; then
- LDFLAGS="$LDFLAGS -Xlinker -R$with_ssl/lib"
+ LDFLAGS="$LDFLAGS -Xlinker"
else
- LDFLAGS="$LDFLAGS -R$with_ssl/lib"
+ LDFLAGS="$LDFLAGS"
fi
fi
echo "$as_me:$LINENO: checking for RAND_file_name in -lcrypto" >&5
@@ -7910,13 +7910,6 @@
fi
if test "x$with_system_libvncserver" != "xyes"; then
rflag=""
- if test "x$ld_minus_R" = "xno"; then
- :
- elif test "x$GCC" = "xyes"; then
- rflag="-Xlinker -R$with_system_libvncserver/lib"
- else
- rflag="-R$with_system_libvncserver/lib"
- fi
cmd="$with_system_libvncserver/bin/libvncserver-config"
if $cmd --version 1>/dev/null 2>&1; then
cvers=`$cmd --version 2>/dev/null`
@@ -7958,9 +7951,9 @@
if test "x$ld_minus_R" = "xno"; then
:
elif test "x$GCC" = "xyes"; then
- rflag=" -Xlinker -R$rprefix/lib "
+ rflag=" -Xlinker "
else
- rflag=" -R$rprefix/lib "
+ rflag=" "
fi
cvers=`libvncserver-config --version 2>/dev/null`
cscore=`echo "$cvers" | tr '.' ' ' | awk '{print 10000 * $1 + 100 * $2 + $3}'`
@@ -8039,9 +8032,9 @@
:
elif test "x$GCC" = "xyes"; then
# this is not complete... in general a rat's nest.
- LDFLAGS="$LDFLAGS -Xlinker -R$with_jpeg/lib"
+ LDFLAGS="$LDFLAGS -Xlinker"
else
- LDFLAGS="$LDFLAGS -R$with_jpeg/lib"
+ LDFLAGS="$LDFLAGS"
fi
fi
if test "${ac_cv_header_jpeglib_h+set}" = set; then
@@ -8320,9 +8313,9 @@
if test "x$ld_minus_R" = "xno"; then
:
elif test "x$GCC" = "xyes"; then
- LDFLAGS="$LDFLAGS -Xlinker -R$with_zlib/lib"
+ LDFLAGS="$LDFLAGS -Xlinker"
else
- LDFLAGS="$LDFLAGS -R$with_zlib/lib"
+ LDFLAGS="$LDFLAGS"
fi
fi
if test "${ac_cv_header_zlib_h+set}" = set; then