1 --- a/configure.orig 2009-06-19 18:44:21.000000000 +0400
2 +++ b/configure 2009-07-29 16:01:13.000000000 +0400
5 echo "$as_me:$LINENO: checking whether -R must be followed by a space" >&5
6 echo $ECHO_N "checking whether -R must be followed by a space... $ECHO_C" >&6
7 - ac_xsave_LIBS=$LIBS; LIBS="$LIBS -R$x_libraries"
8 + ac_xsave_LIBS=$LIBS; LIBS="$LIBS"
9 cat >conftest.$ac_ext <<_ACEOF
13 if test $ac_R_nospace = yes; then
14 echo "$as_me:$LINENO: result: no" >&5
15 echo "${ECHO_T}no" >&6
16 - X_LIBS="$X_LIBS -R$x_libraries"
19 - LIBS="$ac_xsave_LIBS -R $x_libraries"
20 + LIBS="$ac_xsave_LIBS"
21 cat >conftest.$ac_ext <<_ACEOF
25 if test $ac_R_space = yes; then
26 echo "$as_me:$LINENO: result: yes" >&5
27 echo "${ECHO_T}yes" >&6
28 - X_LIBS="$X_LIBS -R $x_libraries"
31 echo "$as_me:$LINENO: result: neither works" >&5
32 echo "${ECHO_T}neither works" >&6
34 if test ! -z "$HAVE_LIBXFIXES" -o ! -z "$HAVE_LIBXDAMAGE"; then
35 # need /usr/sfw/lib in RPATH for Solaris 10 and later
36 case `(uname -sr) 2>/dev/null` in
37 - "SunOS 5"*) X_EXTRA_LIBS="$X_EXTRA_LIBS -R/usr/sfw/lib" ;;
38 + "SunOS 5"*) X_EXTRA_LIBS="$X_EXTRA_LIBS" ;;
41 if test ! -z "$HAVE_LIBXRANDR"; then
43 if test "x$ld_minus_R" = "xno"; then
45 elif test "x$GCC" = "xyes"; then
46 - LDFLAGS="$LDFLAGS -Xlinker -R$with_ssl/lib"
47 + LDFLAGS="$LDFLAGS -Xlinker"
49 - LDFLAGS="$LDFLAGS -R$with_ssl/lib"
53 echo "$as_me:$LINENO: checking for RAND_file_name in -lcrypto" >&5
54 @@ -7910,13 +7910,6 @@
56 if test "x$with_system_libvncserver" != "xyes"; then
58 - if test "x$ld_minus_R" = "xno"; then
60 - elif test "x$GCC" = "xyes"; then
61 - rflag="-Xlinker -R$with_system_libvncserver/lib"
63 - rflag="-R$with_system_libvncserver/lib"
65 cmd="$with_system_libvncserver/bin/libvncserver-config"
66 if $cmd --version 1>/dev/null 2>&1; then
67 cvers=`$cmd --version 2>/dev/null`
69 if test "x$ld_minus_R" = "xno"; then
71 elif test "x$GCC" = "xyes"; then
72 - rflag=" -Xlinker -R$rprefix/lib "
75 - rflag=" -R$rprefix/lib "
78 cvers=`libvncserver-config --version 2>/dev/null`
79 cscore=`echo "$cvers" | tr '.' ' ' | awk '{print 10000 * $1 + 100 * $2 + $3}'`
82 elif test "x$GCC" = "xyes"; then
83 # this is not complete... in general a rat's nest.
84 - LDFLAGS="$LDFLAGS -Xlinker -R$with_jpeg/lib"
85 + LDFLAGS="$LDFLAGS -Xlinker"
87 - LDFLAGS="$LDFLAGS -R$with_jpeg/lib"
91 if test "${ac_cv_header_jpeglib_h+set}" = set; then
93 if test "x$ld_minus_R" = "xno"; then
95 elif test "x$GCC" = "xyes"; then
96 - LDFLAGS="$LDFLAGS -Xlinker -R$with_zlib/lib"
97 + LDFLAGS="$LDFLAGS -Xlinker"
99 - LDFLAGS="$LDFLAGS -R$with_zlib/lib"
103 if test "${ac_cv_header_zlib_h+set}" = set; then