From 64c8635a4de921fcf60068f746936ecdf24b27be Mon Sep 17 00:00:00 2001
From: Bruce Momjian <bruce@momjian.us>
Date: Thu, 5 May 2005 19:15:54 +0000
Subject: [PATCH] On Win32, libintl replaces snprintf() with its own version
 that understands arg control, so we don't need our own.  In fact, it also
 uses macros that conflict with ours, so we _can't_ use our own.

---
 configure    |  8 +++++++-
 configure.in | 10 ++++++++--
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/configure b/configure
index ba97253d47..b4f300d6a6 100755
--- a/configure
+++ b/configure
@@ -14706,7 +14706,13 @@ fi
 
 # Force use of our snprintf if system's doesn't do arg control
 # This feature is used by NLS
-if test "$enable_nls" = yes && test $pgac_need_repl_snprintf = no; then
+if test "$enable_nls" = yes &&
+   test $pgac_need_repl_snprintf = no &&
+# On Win32, libintl replaces snprintf() with its own version that
+# understands arg control, so we don't need our own.  In fact, it
+# also uses macros that conflict with ours, so we _can't_ use
+# our own.
+   test "$PORTNAME" != "win32"; then
   echo "$as_me:$LINENO: checking whether printf supports argument control" >&5
 echo $ECHO_N "checking whether printf supports argument control... $ECHO_C" >&6
 if test "${pgac_cv_printf_arg_control+set}" = set; then
diff --git a/configure.in b/configure.in
index 39ed00a1ab..f8bbf10618 100644
--- a/configure.in
+++ b/configure.in
@@ -1,5 +1,5 @@
 dnl Process this file with autoconf to produce a configure script.
-dnl $PostgreSQL: pgsql/configure.in,v 1.408 2005/05/05 11:50:18 neilc Exp $
+dnl $PostgreSQL: pgsql/configure.in,v 1.409 2005/05/05 19:15:54 momjian Exp $
 dnl
 dnl Developers, please strive to achieve this order:
 dnl
@@ -1095,7 +1095,13 @@ AC_MSG_ERROR([[
 
 # Force use of our snprintf if system's doesn't do arg control
 # This feature is used by NLS
-if test "$enable_nls" = yes && test $pgac_need_repl_snprintf = no; then
+if test "$enable_nls" = yes &&
+   test $pgac_need_repl_snprintf = no &&
+# On Win32, libintl replaces snprintf() with its own version that 
+# understands arg control, so we don't need our own.  In fact, it 
+# also uses macros that conflict with ours, so we _can't_ use
+# our own.
+   test "$PORTNAME" != "win32"; then
   PGAC_FUNC_PRINTF_ARG_CONTROL
   if test $pgac_cv_printf_arg_control != yes ; then
     pgac_need_repl_snprintf=yes