Squashed commit of the following:

commit 0d1c7738dc21f2c9e398b790d101f0024dab0a54
Author: Steve Singer <ssinger at ca.afilias.info>
Date:   Thu Jun 6 10:45:34 2013 -0400

    win32 makefile fixes for the PGVER variable

commit 9f2eed91d129304a0e67534c977394cce04492cf
Merge: c9a4687 86eac22
Author: Steve Singer <ssinger at ca.afilias.info>
Date:   Thu Jun 6 09:42:31 2013 -0400

    Merge remote-tracking branch 'origin/master' into pgcommon_22

commit c9a4687f8fa28cf93a417c0b0597b8c6bf65cea7
Author: Steve Singer <ssinger at ca.afilias.info>
Date:   Sun Jun 2 21:39:23 2013 -0400

    Link with pgcommon on win32 when building with PG 9.3+

commit abd5addee71a2fa55a634673730c2d1d18dfe8e9
Author: Steve Singer <ssinger at ca.afilias.info>
Date:   Sun Jun 2 21:31:37 2013 -0400

    expose HAVE_PGCOMMON to the slonik makefile so it can link in pgcommon if required

    Conflicts:
    	configure.ac

commit 9217d72cdf740e7cb9ca7b540c3a7df334f81e0e
Author: Steve Singer <ssinger at ca.afilias.info>
Date:   Tue May 28 10:55:40 2013 -0400

    link with pgcommon in addition to pgport on PG 9.3+

    PG 9.3 introduces a new library called libpgcommon we need to link
    with this when we link with pgport.

Branch
------
master

Details
-------
http://git.postgresql.org/gitweb?p=slony1-engine.git;a=commitdiff;h=dadccd8115e0bf1935c21c9c9a91db4d7e9acba1

Modified Files
--------------
Makefile.global.in   |    4 ++++
config/acx_libpq.m4  |   14 +++++++++++++-
configure.ac         |    1 +
src/slonik/Makefile  |    3 +++
src/slonik/win32.mak |   17 ++++++++++++++++-
5 files changed, 37 insertions(+), 2 deletions(-)