- locale?

[packages/R.git] / R-libicuuc.patch

--- R-2.8.1/configure.ac~	2008-09-22 00:05:30.000000000 +0200
+++ R-2.8.1/configure.ac	2009-01-04 02:58:40.000000000 +0100
@@ -1956,9 +1956,9 @@
   AC_CHECK_LIB(icui18n, ucol_open_3_8, [], [
     AC_CHECK_LIB(icui18n, ucol_open_3_6, [], [
       AC_CHECK_LIB(icui18n, ucol_open_3_4, [], 
-        [AC_MSG_ERROR([library 'icui18n' is required for ICU])])
-    ])
-  ])
+        [AC_MSG_ERROR([library 'icui18n' is required for ICU])], -licuuc)
+    ], -licuuc)
+  ], -licuuc)
   AC_CHECK_LIB(icuuc, ucnv_fromUChars_3_8, [], [
     AC_CHECK_LIB(icuuc, ucnv_fromUChars_3_6, [], [
       AC_CHECK_LIB(icuuc, ucnv_fromUChars_3_4, [], 
--- R-2.8.1/src/scripts/R.sh.in~	2008-11-12 10:23:38.000000000 +0100
+++ R-2.8.1/src/scripts/R.sh.in	2009-01-04 13:59:24.000000000 +0100
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/sh -x
 # Shell wrapper for R executable.
 
 R_HOME_DIR=
--- R-2.8.1/tests/Examples/Makefile.in~	2008-03-25 13:26:46.000000000 +0100
+++ R-2.8.1/tests/Examples/Makefile.in	2009-01-04 13:59:57.000000000 +0100
@@ -66,7 +66,7 @@
 .R.Rout:
 	@if test -f $@; then mv $@ $@.prev; fi
 	@$(ECHO) $(ECHO_N) "running code in '$<' ...$(ECHO_C)"
-	@$(R) < $< > $@ 2>&1 || (mv $@ $@.fail && exit 1)
+	$(R) < $< > $@ 2>&1 || (cat $@ ; mv $@ $@.fail && exit 1)
 	@$(ECHO) "$(ECHO_T) OK"
 	@if test -f $@.prev; then \
 	  mv $@ $@.fail; \