Skip to content

Commit a0f3d3b

Browse files
kelvichkelvich
committed
Merge branch 'pg-master'
2 parents 7ff623d + a6897ef commit a0f3d3b

File tree

1,695 files changed

+26178
-13462
lines changed

Some content is hidden

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

1,695 files changed

+26178
-13462
lines changed

‎COPYRIGHT

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
PostgreSQL Database Management System
22
(formerly known as Postgres, then as Postgres95)
33

4-
Portions Copyright (c) 1996-2015, PostgreSQL Global Development Group
4+
Portions Copyright (c) 1996-2016, PostgreSQL Global Development Group
55

66
Portions Copyright (c) 1994, The Regents of the University of California
77

‎configure

Lines changed: 58 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
# This configure script is free software; the Free Software Foundation
1212
# gives unlimited permission to copy, distribute and modify it.
1313
#
14-
# Copyright (c) 1996-2015, PostgreSQL Global Development Group
14+
# Copyright (c) 1996-2016, PostgreSQL Global Development Group
1515
## -------------------- ##
1616
## M4sh Initialization. ##
1717
## -------------------- ##
@@ -709,6 +709,7 @@ with_libxml
709709
XML2_CONFIG
710710
UUID_EXTRA_OBJS
711711
with_uuid
712+
with_systemd
712713
with_selinux
713714
with_openssl
714715
krb_srvtab
@@ -830,6 +831,7 @@ with_ldap
830831
with_bonjour
831832
with_openssl
832833
with_selinux
834+
with_systemd
833835
with_readline
834836
with_libedit_preferred
835837
with_uuid
@@ -1518,6 +1520,7 @@ Optional Packages:
15181520
--with-bonjour build with Bonjour support
15191521
--with-openssl build with OpenSSL support
15201522
--with-selinux build with SELinux support
1523+
--with-systemd build with systemd support
15211524
--without-readline do not use GNU Readline nor BSD Libedit for editing
15221525
--with-libedit-preferred
15231526
prefer BSD Libedit over GNU Readline
@@ -1617,7 +1620,7 @@ Copyright (C) 2012 Free Software Foundation, Inc.
16171620
This configure script is free software; the Free Software Foundation
16181621
gives unlimited permission to copy, distribute and modify it.
16191622
1620-
Copyright (c) 1996-2015, PostgreSQL Global Development Group
1623+
Copyright (c) 1996-2016, PostgreSQL Global Development Group
16211624
_ACEOF
16221625
exit
16231626
fi
@@ -5694,6 +5697,41 @@ fi
56945697
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_selinux" >&5
56955698
$as_echo "$with_selinux" >&6; }
56965699

5700+
#
5701+
# Systemd
5702+
#
5703+
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build with systemd support" >&5
5704+
$as_echo_n "checking whether to build with systemd support... " >&6; }
5705+
5706+
5707+
5708+
# Check whether --with-systemd was given.
5709+
if test "${with_systemd+set}" = set; then :
5710+
withval=$with_systemd;
5711+
case $withval in
5712+
yes)
5713+
5714+
$as_echo "#define USE_SYSTEMD 1" >>confdefs.h
5715+
5716+
;;
5717+
no)
5718+
:
5719+
;;
5720+
*)
5721+
as_fn_error $? "no argument expected for --with-systemd option" "$LINENO" 5
5722+
;;
5723+
esac
5724+
5725+
else
5726+
with_systemd=no
5727+
5728+
fi
5729+
5730+
5731+
5732+
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_systemd" >&5
5733+
$as_echo "$with_systemd" >&6; }
5734+
56975735
#
56985736
# Readline
56995737
#
@@ -10473,6 +10511,17 @@ fi
1047310511

1047410512
done
1047510513

10514+
fi
10515+
10516+
if test "$with_systemd" = yes ; then
10517+
ac_fn_c_check_header_mongrel "$LINENO" "systemd/sd-daemon.h" "ac_cv_header_systemd_sd_daemon_h" "$ac_includes_default"
10518+
if test "x$ac_cv_header_systemd_sd_daemon_h" = xyes; then :
10519+
10520+
else
10521+
as_fn_error $? "header file <systemd/sd-daemon.h> is required for systemd support" "$LINENO" 5
10522+
fi
10523+
10524+
1047610525
fi
1047710526

1047810527
if test "$with_libxml" = yes ; then
@@ -13026,6 +13075,12 @@ esac
1302613075
;;
1302713076
esac
1302813077

13078+
case " $LIBOBJS " in
13079+
*" win32security.$ac_objext "* ) ;;
13080+
*) LIBOBJS="$LIBOBJS win32security.$ac_objext"
13081+
;;
13082+
esac
13083+
1302913084
case " $LIBOBJS " in
1303013085
*" win32setlocale.$ac_objext "* ) ;;
1303113086
*) LIBOBJS="$LIBOBJS win32setlocale.$ac_objext"
@@ -13232,7 +13287,7 @@ if test x"$pgac_cv_var_rl_completion_append_character" = x"yes"; then
1323213287
$as_echo "#define HAVE_RL_COMPLETION_APPEND_CHARACTER 1" >>confdefs.h
1323313288

1323413289
fi
13235-
for ac_func in rl_completion_matches rl_filename_completion_function
13290+
for ac_func in rl_completion_matches rl_filename_completion_function rl_reset_screen_size
1323613291
do :
1323713292
as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
1323813293
ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"

‎configure.in

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ m4_if(m4_defn([m4_PACKAGE_VERSION]), [2.69], [], [m4_fatal([Autoconf version 2.6
2323
Untested combinations of 'autoconf' and PostgreSQL versions are not
2424
recommended. You can remove the check from 'configure.in' but it is then
2525
your responsibility whether the result works or not.])])
26-
AC_COPYRIGHT([Copyright (c) 1996-2015, PostgreSQL Global Development Group])
26+
AC_COPYRIGHT([Copyright (c) 1996-2016, PostgreSQL Global Development Group])
2727
AC_CONFIG_SRCDIR([src/backend/access/common/heaptuple.c])
2828
AC_CONFIG_AUX_DIR(config)
2929
AC_PREFIX_DEFAULT(/usr/local/pgsql)
@@ -699,6 +699,15 @@ PGAC_ARG_BOOL(with, selinux, no, [build with SELinux support])
699699
AC_SUBST(with_selinux)
700700
AC_MSG_RESULT([$with_selinux])
701701

702+
#
703+
# Systemd
704+
#
705+
AC_MSG_CHECKING([whether to build with systemd support])
706+
PGAC_ARG_BOOL(with, systemd, no, [build with systemd support],
707+
[AC_DEFINE([USE_SYSTEMD], 1, [Define to build with systemd support. (--with-systemd)])])
708+
AC_SUBST(with_systemd)
709+
AC_MSG_RESULT([$with_systemd])
710+
702711
#
703712
# Readline
704713
#
@@ -1249,6 +1258,10 @@ if test "$with_pam" = yes ; then
12491258
[AC_MSG_ERROR([header file <security/pam_appl.h> or <pam/pam_appl.h> is required for PAM.])])])
12501259
fi
12511260

1261+
if test "$with_systemd" = yes ; then
1262+
AC_CHECK_HEADER(systemd/sd-daemon.h, [], [AC_MSG_ERROR([header file <systemd/sd-daemon.h> is required for systemd support])])
1263+
fi
1264+
12521265
if test "$with_libxml" = yes ; then
12531266
AC_CHECK_HEADER(libxml/parser.h, [], [AC_MSG_ERROR([header file <libxml/parser.h> is required for XML support])])
12541267
fi
@@ -1577,6 +1590,7 @@ if test "$PORTNAME" = "win32"; then
15771590
AC_LIBOBJ(system)
15781591
AC_LIBOBJ(win32env)
15791592
AC_LIBOBJ(win32error)
1593+
AC_LIBOBJ(win32security)
15801594
AC_LIBOBJ(win32setlocale)
15811595
AC_DEFINE([HAVE_SYMLINK], 1,
15821596
[Define to 1 if you have the `symlink' function.])
@@ -1635,7 +1649,7 @@ LIBS="$LIBS_including_readline"
16351649

16361650
if test "$with_readline" = yes; then
16371651
PGAC_VAR_RL_COMPLETION_APPEND_CHARACTER
1638-
AC_CHECK_FUNCS([rl_completion_matches rl_filename_completion_function])
1652+
AC_CHECK_FUNCS([rl_completion_matches rl_filename_completion_function rl_reset_screen_size])
16391653
AC_CHECK_FUNCS([append_history history_truncate_file])
16401654
fi
16411655

‎contrib/adminpack/adminpack.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* adminpack.c
44
*
55
*
6-
* Copyright (c) 2002-2015, PostgreSQL Global Development Group
6+
* Copyright (c) 2002-2016, PostgreSQL Global Development Group
77
*
88
* Author: Andreas Pflug <pgadmin@pse-consulting.de>
99
*

‎contrib/auth_delay/auth_delay.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
*
33
* auth_delay.c
44
*
5-
* Copyright (C) 2010-2011, PostgreSQL Global Development Group
5+
* Copyright (c) 2010-2016, PostgreSQL Global Development Group
66
*
77
* IDENTIFICATION
88
* contrib/auth_delay/auth_delay.c

‎contrib/auto_explain/auto_explain.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* auto_explain.c
44
*
55
*
6-
* Copyright (c) 2008-2015, PostgreSQL Global Development Group
6+
* Copyright (c) 2008-2016, PostgreSQL Global Development Group
77
*
88
* IDENTIFICATION
99
* contrib/auto_explain/auto_explain.c

0 commit comments

Comments
 (0)