svn commit: r1147000 - in /couchdb/trunk: INSTALL.Windows src/couchdb/priv/Makefile.am

[ra...@apache.org]

Author: randall
Date: Fri Jul 15 07:54:32 2011
New Revision: 1147000

URL: http://svn.apache.org/viewvc?rev=1147000&view=rev
Log:
Bump Windows ICU requirement to v4.4.*

Modified:
    couchdb/trunk/INSTALL.Windows
    couchdb/trunk/src/couchdb/priv/Makefile.am

Modified: couchdb/trunk/INSTALL.Windows
URL: http://svn.apache.org/viewvc/couchdb/trunk/INSTALL.Windows?rev=1147000&r1=1146999&r2=1147000&view=diff
==============================================================================
--- couchdb/trunk/INSTALL.Windows (original)
+++ couchdb/trunk/INSTALL.Windows Fri Jul 15 07:54:32 2011
@@ -9,7 +9,7 @@ Dependencies
 You will need the following installed:
 
  * Erlang OTP (=14B01)        (http://erlang.org/)
- * ICU                        (http://icu.sourceforge.net/)
+ * ICU        (=4.4.*)         (http://icu.sourceforge.net/)
  * OpenSSL                    (http://www.openssl.org/)
  * Mozilla SpiderMonkey (1.8) (http://www.mozilla.org/js/spidermonkey/)
  * libcurl                    (http://curl.haxx.se/libcurl/)
@@ -21,7 +21,7 @@ General Notes
 
  * When installing Erlang, you must build it from source.
 
-   The CouchDB build makes use of a number of the Erlang build scripts.
+   The CouchDB build requires a number of the Erlang build scripts.
 
  * When installing ICU, select the binaries built with Visual Studio 2008.
 

Modified: couchdb/trunk/src/couchdb/priv/Makefile.am
URL: http://svn.apache.org/viewvc/couchdb/trunk/src/couchdb/priv/Makefile.am?rev=1147000&r1=1146999&r2=1147000&view=diff
==============================================================================
--- couchdb/trunk/src/couchdb/priv/Makefile.am (original)
+++ couchdb/trunk/src/couchdb/priv/Makefile.am Fri Jul 15 07:54:32 2011
@@ -88,9 +88,9 @@ install-data-hook:
 	        $(LN_S) couch_ejson_compare_nif couch_ejson_compare_nif.so; \
 	fi
 if WINDOWS
-	$(INSTALL) $(ICU_BIN)/icuuc42.dll $(bindir)
-	$(INSTALL) $(ICU_BIN)/icudt42.dll $(bindir)
-	$(INSTALL) $(ICU_BIN)/icuin42.dll $(bindir)
+	$(INSTALL) $(ICU_BIN)/icuuc44.dll $(bindir)
+	$(INSTALL) $(ICU_BIN)/icudt44.dll $(bindir)
+	$(INSTALL) $(ICU_BIN)/icuin44.dll $(bindir)
 	$(INSTALL) $(JS_LIB_BINARY) $(bindir)
 	$(INSTALL) .libs/couchspawnkillable.exe \
 		"$(DESTDIR)$(couchprivdir)/couchspawnkillable.exe"