[patch] evolution-data-server-rpath.patch

evolution-data-server-rpath.patch (text/plain), 5.34 KB, created by Gergan Penkov on 2005-08-14 06:58:09 UTC

--- configure.orig	2005-06-04 09:36:18.000000000 +0000
+++ configure	2005-08-14 00:42:06.000000000 +0000
@@ -8137,7 +8137,7 @@
 echo "${ECHO_T}$moz_nspr_libs" >&6
 			if test "x$moz_nspr_libs" != "xno"; then
 				have_nspr_libs="yes"
-				MANUAL_NSPR_LIBS="-L$with_nspr_libs $nsprlibs"
+				MANUAL_NSPR_LIBS="-L$with_nspr_libs $nsprlibs -Wl,-R$with_nspr_libs"
 			else
 				MANUAL_NSPR_CLFAGS=""
 			fi
@@ -8504,7 +8504,7 @@
 
 					msg_smime="yes (Mozilla NSS)"
 				fi
-				MANUAL_NSS_LIBS="-L$with_nss_libs $nsslibs"
+				MANUAL_NSS_LIBS="-L$with_nss_libs $nsslibs -Wl,-R$with_nss_libs"
 			else
 				MANUAL_NSS_CFLAGS=""
 				MANUAL_NSPR_CFLAGS=""
--- configure.in.orig	2005-06-04 09:36:18.000000000 +0000
+++ configure.in	2005-08-13 03:09:11.000000000 +0000
@@ -8137,7 +8137,7 @@
 echo "${ECHO_T}$moz_nspr_libs" >&6
 			if test "x$moz_nspr_libs" != "xno"; then
 				have_nspr_libs="yes"
-				MANUAL_NSPR_LIBS="-L$with_nspr_libs $nsprlibs"
+				MANUAL_NSPR_LIBS="-L$with_nspr_libs $nsprlibs -Wl,-R$with_nspr_libs"
 			else
 				MANUAL_NSPR_CLFAGS=""
 			fi
@@ -8504,7 +8504,7 @@
 
 					msg_smime="yes (Mozilla NSS)"
 				fi
-				MANUAL_NSS_LIBS="-L$with_nss_libs $nsslibs"
+				MANUAL_NSS_LIBS="-L$with_nss_libs $nsslibs -Wl,-R$with_nss_libs"
 			else
 				MANUAL_NSS_CFLAGS=""
 				MANUAL_NSPR_CFLAGS=""
--- docs/reference/libedataserver/Makefile.in.orig	2005-06-04 09:36:26.000000000 +0000
+++ docs/reference/libedataserver/Makefile.in	2005-08-13 23:40:39.000000000 +0000
@@ -333,7 +333,7 @@
 ####################################
 @GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_CC = $(LIBTOOL) --mode=compile $(CC) $(INCLUDES) $(AM_CFLAGS) $(CFLAGS)
 @GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_LD = $(CC) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS)
-@GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_LD = $(LIBTOOL) --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS)
+@GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_LD = $(LIBTOOL) --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) $(MANUAL_NSS_LIBS) $(MANUAL_NSPR_LIBS)
 
 # We set GPATH here; this gives us semantics for GNU make
 # which are more like other make's VPATH, when it comes to
--- docs/reference/libedataserver/Makefile.am.orig	2005-03-24 18:24:57.000000000 +0000
+++ docs/reference/libedataserver/Makefile.am	2005-08-13 23:39:42.000000000 +0000
@@ -33,7 +33,7 @@
 
 if GTK_DOC_USE_LIBTOOL
 GTKDOC_CC = $(LIBTOOL) --mode=compile $(CC) $(INCLUDES) $(AM_CFLAGS) $(CFLAGS)
-GTKDOC_LD = $(LIBTOOL) --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS)
+GTKDOC_LD = $(LIBTOOL) --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) $(MANUAL_NSS_LIBS) $(MANUAL_NSPR_LIBS)
 else
 GTKDOC_CC = $(CC) $(INCLUDES) $(AM_CFLAGS) $(CFLAGS)
 GTKDOC_LD = $(CC) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS)
--- docs/reference/calendar/libecal/Makefile.am.orig	2004-09-23 16:45:29.000000000 +0000
+++ docs/reference/calendar/libecal/Makefile.am	2005-08-13 23:43:16.000000000 +0000
@@ -32,7 +32,7 @@
 
 if GTK_DOC_USE_LIBTOOL
 GTKDOC_CC = $(LIBTOOL) --mode=compile $(CC) $(INCLUDES) $(AM_CFLAGS) $(CFLAGS)
-GTKDOC_LD = $(LIBTOOL) --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS)
+GTKDOC_LD = $(LIBTOOL) --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) $(MANUAL_NSS_LIBS) $(MANUAL_NSPR_LIBS)
 else
 GTKDOC_CC = $(CC) $(INCLUDES) $(AM_CFLAGS) $(CFLAGS)
 GTKDOC_LD = $(CC) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS)
--- docs/reference/calendar/libecal/Makefile.in.orig	2005-06-04 09:36:26.000000000 +0000
+++ docs/reference/calendar/libecal/Makefile.in	2005-08-13 23:43:46.000000000 +0000
@@ -333,7 +333,7 @@
 ####################################
 @GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_CC = $(LIBTOOL) --mode=compile $(CC) $(INCLUDES) $(AM_CFLAGS) $(CFLAGS)
 @GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_LD = $(CC) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS)
-@GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_LD = $(LIBTOOL) --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS)
+@GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_LD = $(LIBTOOL) --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) $(MANUAL_NSS_LIBS) $(MANUAL_NSPR_LIBS)
 
 # We set GPATH here; this gives us semantics for GNU make
 # which are more like other make's VPATH, when it comes to
--- docs/reference/addressbook/libebook/Makefile.in.orig	2005-06-04 09:36:26.000000000 +0000
+++ docs/reference/addressbook/libebook/Makefile.in	2005-08-13 23:45:07.000000000 +0000
@@ -333,7 +333,7 @@
 ####################################
 @GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_CC = $(LIBTOOL) --mode=compile $(CC) $(INCLUDES) $(AM_CFLAGS) $(CFLAGS)
 @GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_LD = $(CC) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS)
-@GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_LD = $(LIBTOOL) --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS)
+@GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_LD = $(LIBTOOL) --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) $(MANUAL_NSS_LIBS) $(MANUAL_NSPR_LIBS)
 
 # We set GPATH here; this gives us semantics for GNU make
 # which are more like other make's VPATH, when it comes to
--- docs/reference/addressbook/libebook/Makefile.am.orig	2004-09-23 16:45:29.000000000 +0000
+++ docs/reference/addressbook/libebook/Makefile.am	2005-08-13 23:44:33.000000000 +0000
@@ -32,7 +32,7 @@
 
 if GTK_DOC_USE_LIBTOOL
 GTKDOC_CC = $(LIBTOOL) --mode=compile $(CC) $(INCLUDES) $(AM_CFLAGS) $(CFLAGS)
-GTKDOC_LD = $(LIBTOOL) --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS)
+GTKDOC_LD = $(LIBTOOL) --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) $(MANUAL_NSS_LIBS) $(MANUAL_NSPR_LIBS)
 else
 GTKDOC_CC = $(CC) $(INCLUDES) $(AM_CFLAGS) $(CFLAGS)
 GTKDOC_LD = $(CC) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS)