--- src/Makefile.in.orig 2006-02-28 23:33:12.000000000 +0100 +++ src/Makefile.in 2006-02-28 23:33:25.000000000 +0100 @@ -103,7 +103,7 @@ date >.protos librxvt.la: $(LIBOBJS) - $(LIBTOOL) --mode=link $(LINK) -rpath $(libdir) -version-info $(LIBVERSION) $(LIBOBJS) $(LIBS) -o $@ + $(LIBTOOL) --mode=link $(LINK) -version-info $(LIBVERSION) $(LIBOBJS) $(LIBS) -o $@ #------------------------------------------------------------------------- tags: $(SRCS) $(HDRS) $(EXTRAHDRS) ctags $(SRCS) $(HDRS) $(EXTRAHDRS) --- configure.orig 2006-02-28 23:54:05.000000000 +0100 +++ configure 2006-02-28 23:56:31.000000000 +0100 @@ -9753,12 +9753,11 @@ else LDARG="" fi -R_TRANSLATE='s/-L\([^ ]*\)/-L\1 '$LDARG'-rpath '$LDARG'\1/g' ac_save_CFLAGS=$CFLAGS ac_save_LIBS=$LIBS CFLAGS="$CFLAGS $X_CFLAGS" -LIBS=`echo "$LIBS $X_LIBS $X_EXTRA_LIBS -lX11" | sed "$R_TRANSLATE"` +LIBS="$LIBS $X_LIBS $X_EXTRA_LIBS -lX11" echo "$as_me:$LINENO: checking for -rpath dynamic library path recording" >&5 echo $ECHO_N "checking for -rpath dynamic library path recording... $ECHO_C" >&6 if test "${rxvt_cv_rpath+set}" = set; then @@ -9808,8 +9807,7 @@ echo "$as_me:$LINENO: result: $rxvt_cv_rpath" >&5 echo "${ECHO_T}$rxvt_cv_rpath" >&6 if test x$rxvt_cv_rpath != xyes; then - R_TRANSLATE='s/-L\([^ ]*\)/-L\1 '$LDARG'-R\1/g' - LIBS=`echo "$ac_save_LIBS $X_LIBS $X_EXTRA_LIBS -lX11" | sed "$R_TRANSLATE"` + LIBS="$ac_save_LIBS $X_LIBS $X_EXTRA_LIBS -lX11" echo "$as_me:$LINENO: checking for -R dynamic library path recording" >&5 echo $ECHO_N "checking for -R dynamic library path recording... $ECHO_C" >&6 if test "${rxvt_cv_R+set}" = set; then @@ -14214,9 +14212,6 @@ ac_save_CFLAGS=$CFLAGS CFLAGS="$CFLAGS $X_CFLAGS" LIBS="$LIBS $X_LIBS $X_EXTRA_LIBS -lX11" -if test x$rxvt_cv_rpath = xyes -o x$rxvt_cv_R = xyes; then - LIBS=`echo $LIBS | sed "$R_TRANSLATE"` -fi echo "$as_me:$LINENO: checking for working Xlocale" >&5 echo $ECHO_N "checking for working Xlocale... $ECHO_C" >&6 if test "${rxvt_cv_func_xlocale+set}" = set; then @@ -14822,18 +14817,6 @@ -if test x$rxvt_cv_rpath = xyes -o x$rxvt_cv_R = xyes; then - DLIB=`echo $DLIB | sed "$R_TRANSLATE"` - LIBS=`echo $LIBS | sed "$R_TRANSLATE"` - X_LIBS=`echo $X_LIBS | sed "$R_TRANSLATE"` - X_EXTRA_LIBS=`echo $X_EXTRA_LIBS | sed "$R_TRANSLATE"` - XPM_LIBS=`echo $XPM_LIBS | sed "$R_TRANSLATE"` -fi - - - - - if test x$support_addstrings = xyes; then OBJSTRINGS="strings.o" else