Chris Browne cbbrowne at lists.slony.info
Fri Nov 27 12:21:24 PST 2009
Update of /home/cvsd/slony1/slony1-engine/config
In directory main.slony.info:/tmp/cvs-serv18494/config

Modified Files:
	acx_libpq.m4 
Log Message:
As in 2.0 branch, needed to change autoconf + slony1_funcs.c to reflect that
in PG 8.5, ScanKeywordLookup has 3 parms, not 1


Index: acx_libpq.m4
===================================================================
RCS file: /home/cvsd/slony1/slony1-engine/config/acx_libpq.m4,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -d -r1.30 -r1.31
*** acx_libpq.m4	24 Sep 2008 19:54:09 -0000	1.30
--- acx_libpq.m4	27 Nov 2009 20:21:22 -0000	1.31
***************
*** 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



More information about the Slony1-commit mailing list