--- pg-840-icu-2009-09-15_fix_icu43.diff	2010-02-12 15:06:22.290914000 +0200
+++ pg-840-icu-2009-09-15.diff	2009-11-07 08:31:35.000000000 +0200
@@ -3,7 +3,7 @@
 +++ postgresql-8.4.0.build/configure.in	2009-09-15 22:43:37.985313000 +0200
 @@ -19,7 +19,7 @@
  
- AC_INIT([PostgreSQL], [8.4.2], [pgsql-bugs@postgresql.org])
+ AC_INIT([PostgreSQL], [8.4.0], [pgsql-bugs@postgresql.org])
  
 -m4_if(m4_defn([m4_PACKAGE_VERSION]), [2.61], [], [m4_fatal([Autoconf version 2.61 is required.
 +m4_if(m4_defn([m4_PACKAGE_VERSION]), [2.62], [], [m4_fatal([Autoconf version 2.62 is required.
@@ -27,31 +27,27 @@
  # Readline
  #
  PGAC_ARG_BOOL(with, readline, yes,
-@@ -934,6 +944,23 @@
+@@ -934,6 +944,19 @@
    fi
  fi
  
 +if test "$with_icu" = yes ; then
-+ AC_CHECK_LIB(icui18n, ucol_open_43, [], [
 +  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_CHECK_LIB(icuuc, ucnv_fromUChars_43, [], [
 +  AC_CHECK_LIB(icuuc, ucnv_fromUChars_3_8, [], [
 +     AC_CHECK_LIB(icuuc, ucnv_fromUChars_3_6, [], [
 +        AC_CHECK_LIB(icuuc, ucnv_fromUChars_3_4, [], [AC_MSG_ERROR([library 'icuuc' is required for ICU])])
 +   ])
 +  ])
-+ ])
 +fi
 +
  if test "$with_pam" = yes ; then
    AC_CHECK_LIB(pam,    pam_start, [], [AC_MSG_ERROR([library 'pam' is required for PAM])])
  fi
-@@ -1031,6 +1058,10 @@
+@@ -1031,6 +1054,10 @@
    AC_CHECK_FUNCS([ERR_set_mark])
  fi