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

Modified Files:
      Tag: REL_1_2_STABLE
	acx_libpq.m4 
Log Message:
ScanKeywordLookup requires 3 args in PG 8.5...  Change autoconf to 
recognize this.


Index: acx_libpq.m4
===================================================================
RCS file: /home/cvsd/slony1/slony1-engine/config/acx_libpq.m4,v
retrieving revision 1.24.2.5
retrieving revision 1.24.2.6
diff -C2 -d -r1.24.2.5 -r1.24.2.6
*** acx_libpq.m4	23 Jul 2009 18:30:04 -0000	1.24.2.5
--- acx_libpq.m4	27 Nov 2009 20:31:00 -0000	1.24.2.6
***************
*** 352,355 ****
--- 352,372 ----
  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
***************
*** 397,400 ****
--- 414,429 ----
  
  
+ 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