Skip to content

Commit 90a2ceb

Browse files
author
Artur Zakirov
committed
Merge branch 'PGPRO9_5' into PGPRO_pg_trgm
2 parents e7f412c + 1362e7f commit 90a2ceb

File tree

114 files changed

+18673
-3131
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

114 files changed

+18673
-3131
lines changed

‎configure

Lines changed: 226 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#! /bin/sh
22
# Guess values for system-dependent variables and create Makefiles.
3-
# Generated by GNU Autoconf 2.69 for PostgresPro 9.5.0.1.
3+
# Generated by GNU Autoconf 2.69 for PostgresPro 9.5.1.1.
44
#
55
# Report bugs to <pgsql-bugs@postgrespro.com>.
66
#
@@ -582,8 +582,8 @@ MAKEFLAGS=
582582
# Identity of this package.
583583
PACKAGE_NAME='PostgresPro'
584584
PACKAGE_TARNAME='postgrespro'
585-
PACKAGE_VERSION='9.5.0.1'
586-
PACKAGE_STRING='PostgresPro 9.5.0.1'
585+
PACKAGE_VERSION='9.5.1.1'
586+
PACKAGE_STRING='PostgresPro 9.5.1.1'
587587
PACKAGE_BUGREPORT='pgsql-bugs@postgrespro.com'
588588
PACKAGE_URL=''
589589

@@ -1397,7 +1397,7 @@ if test "$ac_init_help" = "long"; then
13971397
# Omit some internal or obsolete options to make the list less imposing.
13981398
# This message is too long to be a string in the A/UX 3.1 sh.
13991399
cat <<_ACEOF
1400-
\`configure' configures PostgresPro 9.5.0.1 to adapt to many kinds of systems.
1400+
\`configure' configures PostgresPro 9.5.1.1 to adapt to many kinds of systems.
14011401
14021402
Usage: $0 [OPTION]... [VAR=VALUE]...
14031403
@@ -1462,7 +1462,7 @@ fi
14621462

14631463
if test -n "$ac_init_help"; then
14641464
case $ac_init_help in
1465-
short | recursive ) echo "Configuration of PostgresPro 9.5.0.1:";;
1465+
short | recursive ) echo "Configuration of PostgresPro 9.5.1.1:";;
14661466
esac
14671467
cat <<\_ACEOF
14681468
@@ -1613,7 +1613,7 @@ fi
16131613
test -n "$ac_init_help" && exit $ac_status
16141614
if $ac_init_version; then
16151615
cat <<\_ACEOF
1616-
PostgresPro configure 9.5.0.1
1616+
PostgresPro configure 9.5.1.1
16171617
generated by GNU Autoconf 2.69
16181618
16191619
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2324,7 +2324,7 @@ cat >config.log <<_ACEOF
23242324
This file contains any messages produced by compilers while
23252325
running configure, to aid debugging if configure makes a mistake.
23262326
2327-
It was created by PostgresPro $as_me 9.5.0.1, which was
2327+
It was created by PostgresPro $as_me 9.5.1.1, which was
23282328
generated by GNU Autoconf 2.69. Invocation command line was
23292329
23302330
$ $0 $@
@@ -9426,7 +9426,7 @@ if test "$ac_res" != no; then :
94269426

94279427
else
94289428

9429-
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing ucol_open_44" >&5
9429+
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing ucol_open_44" >&5
94309430
$as_echo_n "checking for library containing ucol_open_44... " >&6; }
94319431
if ${ac_cv_search_ucol_open_44+:} false; then :
94329432
$as_echo_n "(cached) " >&6
@@ -9482,7 +9482,7 @@ if test "$ac_res" != no; then :
94829482

94839483
else
94849484

9485-
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing ucol_open_43" >&5
9485+
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing ucol_open_43" >&5
94869486
$as_echo_n "checking for library containing ucol_open_43... " >&6; }
94879487
if ${ac_cv_search_ucol_open_43+:} false; then :
94889488
$as_echo_n "(cached) " >&6
@@ -9538,7 +9538,7 @@ if test "$ac_res" != no; then :
95389538

95399539
else
95409540

9541-
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing ucol_open_4_2" >&5
9541+
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing ucol_open_4_2" >&5
95429542
$as_echo_n "checking for library containing ucol_open_4_2... " >&6; }
95439543
if ${ac_cv_search_ucol_open_4_2+:} false; then :
95449544
$as_echo_n "(cached) " >&6
@@ -9592,6 +9592,118 @@ ac_res=$ac_cv_search_ucol_open_4_2
95929592
if test "$ac_res" != no; then :
95939593
test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
95949594

9595+
else
9596+
9597+
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing ucol_open_4_1" >&5
9598+
$as_echo_n "checking for library containing ucol_open_4_1... " >&6; }
9599+
if ${ac_cv_search_ucol_open_4_1+:} false; then :
9600+
$as_echo_n "(cached) " >&6
9601+
else
9602+
ac_func_search_save_LIBS=$LIBS
9603+
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
9604+
/* end confdefs.h. */
9605+
9606+
/* Override any GCC internal prototype to avoid an error.
9607+
Use char because int might match the return type of a GCC
9608+
builtin and then its argument prototype would still apply. */
9609+
#ifdef __cplusplus
9610+
extern "C"
9611+
#endif
9612+
char ucol_open_4_1 ();
9613+
int
9614+
main ()
9615+
{
9616+
return ucol_open_4_1 ();
9617+
;
9618+
return 0;
9619+
}
9620+
_ACEOF
9621+
for ac_lib in '' icui18n icuin; do
9622+
if test -z "$ac_lib"; then
9623+
ac_res="none required"
9624+
else
9625+
ac_res=-l$ac_lib
9626+
LIBS="-l$ac_lib $ac_func_search_save_LIBS"
9627+
fi
9628+
if ac_fn_c_try_link "$LINENO"; then :
9629+
ac_cv_search_ucol_open_4_1=$ac_res
9630+
fi
9631+
rm -f core conftest.err conftest.$ac_objext \
9632+
conftest$ac_exeext
9633+
if ${ac_cv_search_ucol_open_4_1+:} false; then :
9634+
break
9635+
fi
9636+
done
9637+
if ${ac_cv_search_ucol_open_4_1+:} false; then :
9638+
9639+
else
9640+
ac_cv_search_ucol_open_4_1=no
9641+
fi
9642+
rm conftest.$ac_ext
9643+
LIBS=$ac_func_search_save_LIBS
9644+
fi
9645+
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_ucol_open_4_1" >&5
9646+
$as_echo "$ac_cv_search_ucol_open_4_1" >&6; }
9647+
ac_res=$ac_cv_search_ucol_open_4_1
9648+
if test "$ac_res" != no; then :
9649+
test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
9650+
9651+
else
9652+
9653+
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing ucol_open_4_0" >&5
9654+
$as_echo_n "checking for library containing ucol_open_4_0... " >&6; }
9655+
if ${ac_cv_search_ucol_open_4_0+:} false; then :
9656+
$as_echo_n "(cached) " >&6
9657+
else
9658+
ac_func_search_save_LIBS=$LIBS
9659+
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
9660+
/* end confdefs.h. */
9661+
9662+
/* Override any GCC internal prototype to avoid an error.
9663+
Use char because int might match the return type of a GCC
9664+
builtin and then its argument prototype would still apply. */
9665+
#ifdef __cplusplus
9666+
extern "C"
9667+
#endif
9668+
char ucol_open_4_0 ();
9669+
int
9670+
main ()
9671+
{
9672+
return ucol_open_4_0 ();
9673+
;
9674+
return 0;
9675+
}
9676+
_ACEOF
9677+
for ac_lib in '' icui18n icuin; do
9678+
if test -z "$ac_lib"; then
9679+
ac_res="none required"
9680+
else
9681+
ac_res=-l$ac_lib
9682+
LIBS="-l$ac_lib $ac_func_search_save_LIBS"
9683+
fi
9684+
if ac_fn_c_try_link "$LINENO"; then :
9685+
ac_cv_search_ucol_open_4_0=$ac_res
9686+
fi
9687+
rm -f core conftest.err conftest.$ac_objext \
9688+
conftest$ac_exeext
9689+
if ${ac_cv_search_ucol_open_4_0+:} false; then :
9690+
break
9691+
fi
9692+
done
9693+
if ${ac_cv_search_ucol_open_4_0+:} false; then :
9694+
9695+
else
9696+
ac_cv_search_ucol_open_4_0=no
9697+
fi
9698+
rm conftest.$ac_ext
9699+
LIBS=$ac_func_search_save_LIBS
9700+
fi
9701+
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_ucol_open_4_0" >&5
9702+
$as_echo "$ac_cv_search_ucol_open_4_0" >&6; }
9703+
ac_res=$ac_cv_search_ucol_open_4_0
9704+
if test "$ac_res" != no; then :
9705+
test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
9706+
95959707
else
95969708

95979709
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing ucol_open_3_8" >&5
@@ -9804,6 +9916,12 @@ fi
98049916
fi
98059917

98069918

9919+
fi
9920+
9921+
9922+
fi
9923+
9924+
98079925
fi
98089926

98099927
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ucnv_fromUChars_57 in -licuuc" >&5
@@ -10344,6 +10462,96 @@ _ACEOF
1034410462

1034510463
LIBS="-licuuc $LIBS"
1034610464

10465+
else
10466+
10467+
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ucnv_fromUChars_4_1 in -licuuc" >&5
10468+
$as_echo_n "checking for ucnv_fromUChars_4_1 in -licuuc... " >&6; }
10469+
if ${ac_cv_lib_icuuc_ucnv_fromUChars_4_1+:} false; then :
10470+
$as_echo_n "(cached) " >&6
10471+
else
10472+
ac_check_lib_save_LIBS=$LIBS
10473+
LIBS="-licuuc $LIBS"
10474+
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
10475+
/* end confdefs.h. */
10476+
10477+
/* Override any GCC internal prototype to avoid an error.
10478+
Use char because int might match the return type of a GCC
10479+
builtin and then its argument prototype would still apply. */
10480+
#ifdef __cplusplus
10481+
extern "C"
10482+
#endif
10483+
char ucnv_fromUChars_4_1 ();
10484+
int
10485+
main ()
10486+
{
10487+
return ucnv_fromUChars_4_1 ();
10488+
;
10489+
return 0;
10490+
}
10491+
_ACEOF
10492+
if ac_fn_c_try_link "$LINENO"; then :
10493+
ac_cv_lib_icuuc_ucnv_fromUChars_4_1=yes
10494+
else
10495+
ac_cv_lib_icuuc_ucnv_fromUChars_4_1=no
10496+
fi
10497+
rm -f core conftest.err conftest.$ac_objext \
10498+
conftest$ac_exeext conftest.$ac_ext
10499+
LIBS=$ac_check_lib_save_LIBS
10500+
fi
10501+
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_icuuc_ucnv_fromUChars_4_1" >&5
10502+
$as_echo "$ac_cv_lib_icuuc_ucnv_fromUChars_4_1" >&6; }
10503+
if test "x$ac_cv_lib_icuuc_ucnv_fromUChars_4_1" = xyes; then :
10504+
cat >>confdefs.h <<_ACEOF
10505+
#define HAVE_LIBICUUC 1
10506+
_ACEOF
10507+
10508+
LIBS="-licuuc $LIBS"
10509+
10510+
else
10511+
10512+
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ucnv_fromUChars_4_0 in -licuuc" >&5
10513+
$as_echo_n "checking for ucnv_fromUChars_4_0 in -licuuc... " >&6; }
10514+
if ${ac_cv_lib_icuuc_ucnv_fromUChars_4_0+:} false; then :
10515+
$as_echo_n "(cached) " >&6
10516+
else
10517+
ac_check_lib_save_LIBS=$LIBS
10518+
LIBS="-licuuc $LIBS"
10519+
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
10520+
/* end confdefs.h. */
10521+
10522+
/* Override any GCC internal prototype to avoid an error.
10523+
Use char because int might match the return type of a GCC
10524+
builtin and then its argument prototype would still apply. */
10525+
#ifdef __cplusplus
10526+
extern "C"
10527+
#endif
10528+
char ucnv_fromUChars_4_0 ();
10529+
int
10530+
main ()
10531+
{
10532+
return ucnv_fromUChars_4_0 ();
10533+
;
10534+
return 0;
10535+
}
10536+
_ACEOF
10537+
if ac_fn_c_try_link "$LINENO"; then :
10538+
ac_cv_lib_icuuc_ucnv_fromUChars_4_0=yes
10539+
else
10540+
ac_cv_lib_icuuc_ucnv_fromUChars_4_0=no
10541+
fi
10542+
rm -f core conftest.err conftest.$ac_objext \
10543+
conftest$ac_exeext conftest.$ac_ext
10544+
LIBS=$ac_check_lib_save_LIBS
10545+
fi
10546+
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_icuuc_ucnv_fromUChars_4_0" >&5
10547+
$as_echo "$ac_cv_lib_icuuc_ucnv_fromUChars_4_0" >&6; }
10548+
if test "x$ac_cv_lib_icuuc_ucnv_fromUChars_4_0" = xyes; then :
10549+
cat >>confdefs.h <<_ACEOF
10550+
#define HAVE_LIBICUUC 1
10551+
_ACEOF
10552+
10553+
LIBS="-licuuc $LIBS"
10554+
1034710555
else
1034810556

1034910557
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ucnv_fromUChars_3_8 in -licuuc" >&5
@@ -10523,6 +10731,12 @@ fi
1052310731
fi
1052410732

1052510733

10734+
fi
10735+
10736+
10737+
fi
10738+
10739+
1052610740
fi
1052710741

1052810742
fi
@@ -17798,7 +18012,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
1779818012
# report actual input values of CONFIG_FILES etc. instead of their
1779918013
# values after options handling.
1780018014
ac_log="
17801-
This file was extended by PostgresPro $as_me 9.5.0.1, which was
18015+
This file was extended by PostgresPro $as_me 9.5.1.1, which was
1780218016
generated by GNU Autoconf 2.69. Invocation command line was
1780318017
1780418018
CONFIG_FILES = $CONFIG_FILES
@@ -17868,7 +18082,7 @@ _ACEOF
1786818082
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
1786918083
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
1787018084
ac_cs_version="\\
17871-
PostgresPro config.status 9.5.0.1
18085+
PostgresPro config.status 9.5.1.1
1787218086
configured by $0, generated by GNU Autoconf 2.69,
1787318087
with options \\"\$ac_cs_config\\"
1787418088

‎configure.in

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ dnl Read the Autoconf manual for details.
1717
dnl
1818
m4_pattern_forbid(^PGAC_)dnl to catch undefined macros
1919

20-
AC_INIT([PostgresPro], [9.5.0.1], [pgsql-bugs@postgrespro.com])
20+
AC_INIT([PostgresPro], [9.5.1.1], [pgsql-bugs@postgrespro.com])
2121

2222
m4_if(m4_defn([m4_PACKAGE_VERSION]), [2.69], [], [m4_fatal([Autoconf version 2.69 is required.
2323
Untested combinations of 'autoconf' and PostgreSQL versions are not
@@ -1056,15 +1056,19 @@ if test "$with_icu" = yes ; then
10561056
AC_SEARCH_LIBS(ucol_open_50, [icui18n icuin], [], [
10571057
AC_SEARCH_LIBS(ucol_open_48, [icui18n icuin], [], [
10581058
AC_SEARCH_LIBS(ucol_open_46, [icui18n icuin], [], [
1059-
AC_SEARCH_LIBS(ucol_open_44, [icui18n icuin], [], [
1060-
AC_SEARCH_LIBS(ucol_open_43, [icui18n icuin], [], [
1061-
AC_SEARCH_LIBS(ucol_open_4_2, [icui18n icuin], [], [
1059+
AC_SEARCH_LIBS(ucol_open_44, [icui18n icuin], [], [
1060+
AC_SEARCH_LIBS(ucol_open_43, [icui18n icuin], [], [
1061+
AC_SEARCH_LIBS(ucol_open_4_2, [icui18n icuin], [], [
1062+
AC_SEARCH_LIBS(ucol_open_4_1, [icui18n icuin], [], [
1063+
AC_SEARCH_LIBS(ucol_open_4_0, [icui18n icuin], [], [
10621064
AC_SEARCH_LIBS(ucol_open_3_8, [icui18n icuin], [], [
10631065
AC_SEARCH_LIBS(ucol_open_3_6, [icui18n icuin], [], [
10641066
AC_SEARCH_LIBS(ucol_open_3_4, [icui18n icuin], [], [AC_MSG_ERROR([library 'icui18n' is required for ICU])])
10651067
])
10661068
])
10671069
])
1070+
])
1071+
])
10681072
])
10691073
])
10701074
])
@@ -1088,11 +1092,15 @@ if test "$with_icu" = yes ; then
10881092
AC_CHECK_LIB(icuuc, ucnv_fromUChars_44, [], [
10891093
AC_CHECK_LIB(icuuc, ucnv_fromUChars_43, [], [
10901094
AC_CHECK_LIB(icuuc, ucnv_fromUChars_4_2, [], [
1095+
AC_CHECK_LIB(icuuc, ucnv_fromUChars_4_1, [], [
1096+
AC_CHECK_LIB(icuuc, ucnv_fromUChars_4_0, [], [
10911097
AC_CHECK_LIB(icuuc, ucnv_fromUChars_3_8, [], [
10921098
AC_CHECK_LIB(icuuc, ucnv_fromUChars_3_6, [], [
10931099
AC_CHECK_LIB(icuuc, ucnv_fromUChars_3_4, [], [AC_MSG_ERROR([library 'icuuc' is required for ICU])])
10941100
])
10951101
])
1102+
])
1103+
])
10961104
])
10971105
])
10981106
])

0 commit comments

Comments
 (0)