Update of /home/cvsd/slony1/slony1-engine/config
In directory main.slony.info:/tmp/cvs-serv18069/config

Modified Files:
      Tag: REL_2_0_STABLE
	acx_libpq.m4 
Log Message:
Add an 8.5-ism...

ScanKeywordLookup now expects 3 arguments.

Added an autoconf test to check to see if there's 1 or 3 arguments

Changed src/backend/slony1_funcs.c to use 1/3 arguments, as appropriate


Index: acx_libpq.m4
===================================================================
RCS file: /home/cvsd/slony1/slony1-engine/config/acx_libpq.m4,v
retrieving revision 1.30
retrieving revision 1.30.2.1
diff -C2 -d -r1.30 -r1.30.2.1
*** acx_libpq.m4	24 Sep 2008 19:54:09 -0000	1.30
--- acx_libpq.m4	27 Nov 2009 20:19:49 -0000	1.30.2.1
***************
*** 354,357 ****
--- 354,374 ----
  fi
  
+ AC_MSG_CHECKING(for ScanKeywordLookup)
+ if test -z "$ac_cv_ScanKeywordLookup_args"; then
+   AC_TRY_COMPILE(
+     [#include "postgres.h"
+      #include "parser/keywords.h"],
+     [ScanKeywordLookup(NULL, NULL, NULL);],
+      ac_cv_ScanKeywordLookup_args=3)
+   AC_MSG_RESULT([yes, and it takes $ac_cv_ScanKeywordLookup_args arguments])
+ else
+   AC_TRY_COMPILE(
+     [#include "postgres.h"
+      #include "parser/keywords.h"],
+     [ScanKeywordLookup(NULL);],
+      ac_cv_ScanKeywordLookup_args=1)
+   AC_MSG_RESULT([yes, and it takes $ac_cv_ScanKeywordLookup_args arguments])
+ fi
+ 
  AC_MSG_CHECKING(for typenameTypeId)
  if test -z "$ac_cv_typenameTypeId_args"; then
***************
*** 398,401 ****
--- 415,430 ----
  )
  
+ AC_MSG_CHECKING(for ScanKeywordLookup)
+ if test -z "$ac_cv_ScanKeywordLookup_args"; then
+   AC_MSG_RESULT(no)
+ else
+   if test "$ac_cv_ScanKeywordLookup_args" = 1; then
+ 	AC_DEFINE(SCANKEYWORDLOOKUP_1)
+   elif test "$ac_cv_ScanKeywordLookup_args" = 3; then
+ 	AC_DEFINE(SCANKEYWORDLOOKUP_3)
+   fi
+   AC_MSG_RESULT([yes, and it takes $ac_cv_ScanKeywordLookup_args arguments])
+ fi
+ 
  AC_MSG_CHECKING(for standard_conforming_strings)
  if test -z "$ac_cv_standard_conforming_strings"; then