   ## Compiler switch to embed a runtime search path
   LD_RPATH=	-R
   LD_RPATH_PRE=	
-  
++ 
 + ## Force RPATH=$ORIGIN to locate own dependencies w/o need for LD_LIBRARY_PATH
 + ENABLE_RPATH=YES
 + RPATHLDFLAGS=${LD_RPATH}'$$ORIGIN'
 + 
 + #SH#  ENABLE_RPATH=YES
 + #SH#  RPATHLDFLAGS="${LD_RPATH}'$$ORIGIN'"
-+ 
+  
   #LIBRARY_PATH_PREFIX=/usr/lib/lwp:
   
-  ## Compiler switch to embed a library name
 *** misc/icu/source/data/Makefile.in	Sat Aug 12 00:22:24 2006
---- misc/build/icu/source/data/Makefile.in	Wed Jan  3 09:40:21 2007
+--- misc/build/icu/source/data/Makefile.in	Mon Apr 30 17:32:58 2007
 ***************
 *** 344,350 ****
   ifneq ($(ICUDATA_SOURCE_IS_NATIVE_TARGET),YES)

  THREADSCPPFLAGS = -D_REENTRANT -D_PTHREADS
  LIBCPPFLAGS =
*** misc/icu/source/config/mh-linux	Thu Mar 23 19:51:52 2006
--- misc/build/icu/source/config/mh-linux	Wed Jan  3 09:40:21 2007
***************
*** 20,25 ****
--- 20,32 ----

  #define _XOPEN_SOURCE_EXTENDED 1
  #endif
  
*** misc/icu/source/common/unicode/pwin32.h	Tue Aug 29 23:34:38 2006
--- misc/build/icu/source/common/unicode/pwin32.h	Mon Apr 30 17:32:58 2007
***************
*** 266,273 ****
--- 266,278 ----
  #else
  #define U_EXPORT __declspec(dllexport)
  #endif
+ #ifdef __MINGW32__
+ #define U_EXPORT2
+ #define U_IMPORT
+ #else
  #define U_EXPORT2 __cdecl
  #define U_IMPORT __declspec(dllimport)
+ #endif
  
  /*===========================================================================*/
  /* Code alignment and C function inlining                                    */
*** misc/icu/source/common/unicode/umachine.h	Tue Feb  7 02:54:16 2006
--- misc/build/icu/source/common/unicode/umachine.h	Mon Apr 30 17:32:58 2007
***************
*** 322,328 ****
   */
  
  /* Define UChar to be compatible with wchar_t if possible. */
! #if U_SIZEOF_WCHAR_T==2
      typedef wchar_t UChar;
  #else
      typedef uint16_t UChar;
--- 322,328 ----
   */
  
  /* Define UChar to be compatible with wchar_t if possible. */
! #if U_SIZEOF_WCHAR_T==2 && !defined(__MINGW32__)
      typedef wchar_t UChar;
  #else
      typedef uint16_t UChar;
*** misc/icu/source/common/unicode/ustring.h	Tue Aug 29 23:52:50 2006
--- misc/build/icu/source/common/unicode/ustring.h	Mon Apr 30 17:32:58 2007
***************
*** 918,924 ****
   * </pre>
   * @stable ICU 2.0
   */
! #if U_SIZEOF_WCHAR_T==U_SIZEOF_UCHAR && (U_CHARSET_FAMILY==U_ASCII_FAMILY || (U_SIZEOF_UCHAR == 2 && defined(U_WCHAR_IS_UTF16)))
  #   define U_STRING_DECL(var, cs, length) static const wchar_t var[(length)+1]={ L ## cs }
      /**@stable ICU 2.0 */
  #   define U_STRING_INIT(var, cs, length)
--- 918,924 ----
   * </pre>
   * @stable ICU 2.0
   */
! #if U_SIZEOF_WCHAR_T==U_SIZEOF_UCHAR && (U_CHARSET_FAMILY==U_ASCII_FAMILY || (U_SIZEOF_UCHAR == 2 && defined(U_WCHAR_IS_UTF16))) && !defined(__MINGW32__)
  #   define U_STRING_DECL(var, cs, length) static const wchar_t var[(length)+1]={ L ## cs }
      /**@stable ICU 2.0 */
  #   define U_STRING_INIT(var, cs, length)
*** misc/icu/source/config/mh-darwin	Wed Feb  1 08:52:42 2006
--- misc/build/icu/source/config/mh-darwin	Mon Apr 30 17:32:58 2007
***************
*** 25,31 ****
  SHLIB.cc=	$(CXX) -dynamiclib -dynamic $(CXXFLAGS) $(LDFLAGS)
