[people/ms/ipfire-3.x.git] / X11vnc / patches / x11vnc-0.9.8-disableRpath.patch

--- a/configure.orig	2009-06-19 18:44:21.000000000 +0400
+++ b/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
Commit	Line	Data
7610cae8 SS	1	--- a/configure.orig 2009-06-19 18:44:21.000000000 +0400
	2	+++ b/configure 2009-07-29 16:01:13.000000000 +0400
	3	@@ -4183,7 +4183,7 @@
	4	"SunOS 5"*)
	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
	10	/* confdefs.h. */
	11	_ACEOF
	12	@@ -4233,9 +4233,9 @@
	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"
	17	+ X_LIBS="$X_LIBS"
	18	else
	19	- LIBS="$ac_xsave_LIBS -R $x_libraries"
	20	+ LIBS="$ac_xsave_LIBS"
	21	cat >conftest.$ac_ext <<_ACEOF
	22	/* confdefs.h. */
	23	_ACEOF
	24	@@ -4285,7 +4285,7 @@
	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"
	29	+ X_LIBS="$X_LIBS"
	30	else
	31	echo "$as_me:$LINENO: result: neither works" >&5
	32	echo "${ECHO_T}neither works" >&6
	33	@@ -6705,7 +6705,7 @@
	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" ;;
	39	esac
	40	fi
	41	if test ! -z "$HAVE_LIBXRANDR"; then
	42	@@ -7026,9 +7026,9 @@
	43	if test "x$ld_minus_R" = "xno"; then
	44	:
	45	elif test "x$GCC" = "xyes"; then
	46	- LDFLAGS="$LDFLAGS -Xlinker -R$with_ssl/lib"
	47	+ LDFLAGS="$LDFLAGS -Xlinker"
	48	else
	49	- LDFLAGS="$LDFLAGS -R$with_ssl/lib"
	50	+ LDFLAGS="$LDFLAGS"
	51	fi
	52	fi
	53	echo "$as_me:$LINENO: checking for RAND_file_name in -lcrypto" >&5
	54	@@ -7910,13 +7910,6 @@
	55	fi
	56	if test "x$with_system_libvncserver" != "xyes"; then
	57	rflag=""
	58	- if test "x$ld_minus_R" = "xno"; then
	59	- :
	60	- elif test "x$GCC" = "xyes"; then
	61	- rflag="-Xlinker -R$with_system_libvncserver/lib"
	62	- else
	63	- rflag="-R$with_system_libvncserver/lib"
	64	- fi
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`
68	@@ -7958,9 +7951,9 @@
69	if test "x$ld_minus_R" = "xno"; then
70	:
71	elif test "x$GCC" = "xyes"; then
72	- rflag=" -Xlinker -R$rprefix/lib "
73	+ rflag=" -Xlinker "
74	else
75	- rflag=" -R$rprefix/lib "
76	+ rflag=" "
77	fi
78	cvers=`libvncserver-config --version 2>/dev/null`
79	cscore=`echo "$cvers" \| tr '.' ' ' \| awk '{print 10000 * $1 + 100 * $2 + $3}'`
80	@@ -8039,9 +8032,9 @@
81	:
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"
86	else
87	- LDFLAGS="$LDFLAGS -R$with_jpeg/lib"
88	+ LDFLAGS="$LDFLAGS"
89	fi
90	fi
91	if test "${ac_cv_header_jpeglib_h+set}" = set; then
92	@@ -8320,9 +8313,9 @@
93	if test "x$ld_minus_R" = "xno"; then
94	:
95	elif test "x$GCC" = "xyes"; then
96	- LDFLAGS="$LDFLAGS -Xlinker -R$with_zlib/lib"
97	+ LDFLAGS="$LDFLAGS -Xlinker"
98	else
99	- LDFLAGS="$LDFLAGS -R$with_zlib/lib"
100	+ LDFLAGS="$LDFLAGS"
101	fi
102	fi
103	if test "${ac_cv_header_zlib_h+set}" = set; then