Log Message:
-----------
On Windows we need to link against libintl *after* libpgport if the server was configured with --enable-nls.

Modified Files:
--------------
    slony1-engine:
        Makefile.global.in (r1.29 -> r1.30)
        configure (r1.61 -> r1.62)
    slony1-engine/config:
        acx_libpq.m4 (r1.15 -> r1.16)
    slony1-engine/makefiles:
        Makefile.win32 (r1.4 -> r1.5)

-------------- next part --------------
Index: Makefile.global.in
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/Makefile.global.in,v
retrieving revision 1.29
retrieving revision 1.30
diff -LMakefile.global.in -LMakefile.global.in -u -w -r1.29 -r1.30
--- Makefile.global.in
+++ Makefile.global.in
@@ -73,7 +73,7 @@
 subdir=$(slony_subdir)
 
 override CPPFLAGS := -I${pgincludedir} -I${pgincludeserverdir} $(CPPFLAGS)
-LDFLAGS =   -L${pglibdir} -L${pgpkglibdir} -lpq
+LDFLAGS =   -L${pglibdir} -L${pgpkglibdir} -lpq @NLSLIB@
 
 ifeq ($(GCC), yes)
 	CFLAGS += -Wall -Wmissing-prototypes -Wmissing-declarations
Index: configure
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/configure,v
retrieving revision 1.61
retrieving revision 1.62
diff -Lconfigure -Lconfigure -u -w -r1.61 -r1.62
--- configure
+++ configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59 for postgresql-slony1-engine HEAD_20050812.
+# Generated by GNU Autoconf 2.59 for postgresql-slony1-engine HEAD_20050917.
 #
 # Copyright (C) 2003 Free Software Foundation, Inc.
 # This configure script is free software; the Free Software Foundation
@@ -267,8 +267,8 @@
 # Identity of this package.
 PACKAGE_NAME='postgresql-slony1-engine'
 PACKAGE_TARNAME='postgresql-slony1-engine'
-PACKAGE_VERSION='HEAD_20050812'
-PACKAGE_STRING='postgresql-slony1-engine HEAD_20050812'
+PACKAGE_VERSION='HEAD_20050917'
+PACKAGE_STRING='postgresql-slony1-engine HEAD_20050917'
 PACKAGE_BUGREPORT=''
 
 ac_unique_file="src"
@@ -309,7 +309,7 @@
 # include <unistd.h>
 #endif"
 
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os enable_debug CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT PERL TAR LEX YACC SED LD YFLAGS LEXFLAGS HEAD_20050812 with_gnu_ld acx_pthread_config PTHREAD_CC PTHREAD_LIBS PTHREAD_CFLAGS CPP EGREP HAVE_POSIX_SIGNALS PGINCLUDEDIR PGINCLUDESERVERDIR PGLIBDIR PGPKGLIBDIR PGSHAREDIR PGBINDIR HAVE_NETSNMP NETSNMP_CFLAGS NETSNMP_AGENTLIBS TOOLSBIN DOCDIR with_docs SLONYPATH HOST_OS PORTNAME SLONBINDIR GROFF PS2PDF DJPEG PNMTOPS CONVERT PGAUTODOC NSGMLS JADE have_docbook DOCBOOKSTYLE COLLATEINDEX SGMLSPL LIBOBJS LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os enable_debug CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT PERL TAR LEX YACC SED LD YFLAGS LEXFLAGS HEAD_20050917 with_gnu_ld acx_pthread_config PTHREAD_CC PTHREAD_LIBS PTHREAD_CFLAGS CPP EGREP HAVE_POSIX_SIGNALS NLSLIB PGINCLUDEDIR PGINCLUDESERVERDIR PGLIBDIR PGPKGLIBDIR PGSHAREDIR PGBINDIR HAVE_NETSNMP NETSNMP_CFLAGS NETSNMP_AGENTLIBS TOOLSBIN DOCDIR with_docs SLONYPATH HOST_OS PORTNAME SLONBINDIR GROFF PS2PDF DJPEG PNMTOPS CONVERT PGAUTODOC NSGMLS JADE have_docbook DOCBOOKSTYLE COLLATEINDEX SGMLSPL LIBOBJS LTLIBOBJS'
 ac_subst_files=''
 
 # Initialize some variables set by options.
@@ -782,7 +782,7 @@
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures postgresql-slony1-engine HEAD_20050812 to adapt to many kinds of systems.
+\`configure' configures postgresql-slony1-engine HEAD_20050917 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -843,7 +843,7 @@
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of postgresql-slony1-engine HEAD_20050812:";;
+     short | recursive ) echo "Configuration of postgresql-slony1-engine HEAD_20050917:";;
    esac
   cat <<\_ACEOF
 
@@ -977,7 +977,7 @@
 test -n "$ac_init_help" && exit 0
 if $ac_init_version; then
   cat <<\_ACEOF
-postgresql-slony1-engine configure HEAD_20050812
+postgresql-slony1-engine configure HEAD_20050917
 generated by GNU Autoconf 2.59
 
 Copyright (C) 2003 Free Software Foundation, Inc.
@@ -991,7 +991,7 @@
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by postgresql-slony1-engine $as_me HEAD_20050812, which was
+It was created by postgresql-slony1-engine $as_me HEAD_20050917, which was
 generated by GNU Autoconf 2.59.  Invocation command line was
 
   $ $0 $@
@@ -6817,6 +6817,17 @@
 
 LDFLAGS="$TEMP_FLAGS -L$PG_LIBDIR"
 
+
+case "${host_os}" in
+    *mingw32*)
+        NLSOPT=`echo $PG_CONFIGURE | grep -c enable-nls`
+        if test "$NLSOPT" -ne 0; then
+            NLSLIB="-lintl"
+        fi
+        ;;
+esac
+
+
 have_pqputcopydata=no
 echo "$as_me:$LINENO: checking for PQputCopyData in -lpq" >&5
 echo $ECHO_N "checking for PQputCopyData in -lpq... $ECHO_C" >&6
@@ -7125,6 +7136,8 @@
 
 
 
+
+
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -10341,7 +10354,7 @@
 } >&5
 cat >&5 <<_CSEOF
 
-This file was extended by postgresql-slony1-engine $as_me HEAD_20050812, which was
+This file was extended by postgresql-slony1-engine $as_me HEAD_20050917, which was
 generated by GNU Autoconf 2.59.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -10401,7 +10414,7 @@
 
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
-postgresql-slony1-engine config.status HEAD_20050812
+postgresql-slony1-engine config.status HEAD_20050917
 configured by $0, generated by GNU Autoconf 2.59,
   with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
 
@@ -10616,7 +10629,7 @@
 s, at LD@,$LD,;t t
 s, at YFLAGS@,$YFLAGS,;t t
 s, at LEXFLAGS@,$LEXFLAGS,;t t
-s, at HEAD_20050812@,$HEAD_20050812,;t t
+s, at HEAD_20050917@,$HEAD_20050917,;t t
 s, at with_gnu_ld@,$with_gnu_ld,;t t
 s, at acx_pthread_config@,$acx_pthread_config,;t t
 s, at PTHREAD_CC@,$PTHREAD_CC,;t t
@@ -10625,6 +10638,7 @@
 s, at CPP@,$CPP,;t t
 s, at EGREP@,$EGREP,;t t
 s, at HAVE_POSIX_SIGNALS@,$HAVE_POSIX_SIGNALS,;t t
+s, at NLSLIB@,$NLSLIB,;t t
 s, at PGINCLUDEDIR@,$PGINCLUDEDIR,;t t
 s, at PGINCLUDESERVERDIR@,$PGINCLUDESERVERDIR,;t t
 s, at PGLIBDIR@,$PGLIBDIR,;t t
Index: acx_libpq.m4
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/config/acx_libpq.m4,v
retrieving revision 1.15
retrieving revision 1.16
diff -Lconfig/acx_libpq.m4 -Lconfig/acx_libpq.m4 -u -w -r1.15 -r1.16
--- config/acx_libpq.m4
+++ config/acx_libpq.m4
@@ -257,6 +257,19 @@
 
 LDFLAGS="$TEMP_FLAGS -L$PG_LIBDIR"
 
+dnl On Windows (and other OSs?) we need to link against libintl if the server
+dnl was built with --enable-nls
+
+case "${host_os}" in
+    *mingw32*)
+        NLSOPT=`echo $PG_CONFIGURE | grep -c enable-nls`
+        if test "$NLSOPT" -ne 0; then
+            NLSLIB="-lintl"
+        fi
+        ;;
+esac
+
+
 have_pqputcopydata=no
 AC_CHECK_LIB(pq, [PQputCopyData], [have_pqputcopydata=yes])
 if test $have_pqputcopydata = yes ; then
@@ -280,5 +293,7 @@
 #include "access/xact.h"
 ])
 
+AC_SUBST(NLSLIB)
+
 AC_LANG_RESTORE
 ])dnl ACX_LIBPQ
Index: Makefile.win32
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/makefiles/Makefile.win32,v
retrieving revision 1.4
retrieving revision 1.5
diff -Lmakefiles/Makefile.win32 -Lmakefiles/Makefile.win32 -u -w -r1.4 -r1.5
--- makefiles/Makefile.win32
+++ makefiles/Makefile.win32
@@ -2,7 +2,7 @@
 
 # Use replacement include files for those missing on Win32
 override CPPFLAGS+=-I${pgincludeserverdir}/port/win32
-override LDFLAGS+=-lpgport
+override LDFLAGS:=-lpgport $(LDFLAGS)
 
 DLLTOOL= dlltool
 DLLWRAP= dllwrap