View | Details | Raw Unified | Return to bug 143841 | Differences between
and this patch

Collapse All | Expand All

(-)pg-840-icu-2009-09-15.diff (-7 / +3 lines)
Lines 3-9 Link Here
3
+++ postgresql-8.4.0.build/configure.in	2009-09-15 22:43:37.985313000 +0200
3
+++ postgresql-8.4.0.build/configure.in	2009-09-15 22:43:37.985313000 +0200
4
@@ -19,7 +19,7 @@
4
@@ -19,7 +19,7 @@
5
 
5
 
6
 AC_INIT([PostgreSQL], [8.4.2], [pgsql-bugs@postgresql.org])
6
 AC_INIT([PostgreSQL], [8.4.0], [pgsql-bugs@postgresql.org])
7
 
7
 
8
-m4_if(m4_defn([m4_PACKAGE_VERSION]), [2.61], [], [m4_fatal([Autoconf version 2.61 is required.
8
-m4_if(m4_defn([m4_PACKAGE_VERSION]), [2.61], [], [m4_fatal([Autoconf version 2.61 is required.
9
+m4_if(m4_defn([m4_PACKAGE_VERSION]), [2.62], [], [m4_fatal([Autoconf version 2.62 is required.
9
+m4_if(m4_defn([m4_PACKAGE_VERSION]), [2.62], [], [m4_fatal([Autoconf version 2.62 is required.
Lines 27-57 Link Here
27
 # Readline
27
 # Readline
28
 #
28
 #
29
 PGAC_ARG_BOOL(with, readline, yes,
29
 PGAC_ARG_BOOL(with, readline, yes,
30
@@ -934,6 +944,23 @@
30
@@ -934,6 +944,19 @@
31
   fi
31
   fi
32
 fi
32
 fi
33
 
33
 
34
+if test "$with_icu" = yes ; then
34
+if test "$with_icu" = yes ; then
35
+ AC_CHECK_LIB(icui18n, ucol_open_43, [], [
36
+  AC_CHECK_LIB(icui18n, ucol_open_3_8, [], [
35
+  AC_CHECK_LIB(icui18n, ucol_open_3_8, [], [
37
+     AC_CHECK_LIB(icui18n, ucol_open_3_6, [], [
36
+     AC_CHECK_LIB(icui18n, ucol_open_3_6, [], [
38
+        AC_CHECK_LIB(icui18n, ucol_open_3_4, [], [AC_MSG_ERROR([library 'icui18n' is required for ICU])])
37
+        AC_CHECK_LIB(icui18n, ucol_open_3_4, [], [AC_MSG_ERROR([library 'icui18n' is required for ICU])])
39
+   ])
38
+   ])
40
+  ])
39
+  ])
41
+ ])
42
+ AC_CHECK_LIB(icuuc, ucnv_fromUChars_43, [], [
43
+  AC_CHECK_LIB(icuuc, ucnv_fromUChars_3_8, [], [
40
+  AC_CHECK_LIB(icuuc, ucnv_fromUChars_3_8, [], [
44
+     AC_CHECK_LIB(icuuc, ucnv_fromUChars_3_6, [], [
41
+     AC_CHECK_LIB(icuuc, ucnv_fromUChars_3_6, [], [
45
+        AC_CHECK_LIB(icuuc, ucnv_fromUChars_3_4, [], [AC_MSG_ERROR([library 'icuuc' is required for ICU])])
42
+        AC_CHECK_LIB(icuuc, ucnv_fromUChars_3_4, [], [AC_MSG_ERROR([library 'icuuc' is required for ICU])])
46
+   ])
43
+   ])
47
+  ])
44
+  ])
48
+ ])
49
+fi
45
+fi
50
+
46
+
51
 if test "$with_pam" = yes ; then
47
 if test "$with_pam" = yes ; then
52
   AC_CHECK_LIB(pam,    pam_start, [], [AC_MSG_ERROR([library 'pam' is required for PAM])])
48
   AC_CHECK_LIB(pam,    pam_start, [], [AC_MSG_ERROR([library 'pam' is required for PAM])])
53
 fi
49
 fi
54
@@ -1031,6 +1058,10 @@
50
@@ -1031,6 +1054,10 @@
55
   AC_CHECK_FUNCS([ERR_set_mark])
51
   AC_CHECK_FUNCS([ERR_set_mark])
56
 fi
52
 fi
57
 
53
 

Return to bug 143841