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

Modified Files:
      Tag: REL_1_2_STABLE
	RELEASE config.h.in configure 
Log Message:
Bug #16 - Change in function typenameTypeId() in PG 8.3 to have 3 args
http://www.slony.info/bugzilla/show_bug.cgi?id=16

Patch provided by Dave Page - thanks!



Index: RELEASE
===================================================================
RCS file: /home/cvsd/slony1/slony1-engine/RELEASE,v
retrieving revision 1.1.2.21
retrieving revision 1.1.2.22
diff -C2 -d -r1.1.2.21 -r1.1.2.22
*** RELEASE	30 Oct 2007 19:30:05 -0000	1.1.2.21
--- RELEASE	22 Nov 2007 22:51:04 -0000	1.1.2.22
***************
*** 1,4 ****
--- 1,9 ----
  $Id$
  
+ RELEASE 1.2.13
+ - Fixed problem with compatibility with PostgreSQL 8.3; function
+   typenameTypeId() has 3 arguments as of 8.3.
+ 
+ 
  RELEASE 1.2.12
  - Fixed problem with DDL SCRIPT parser where C-style comments were

Index: config.h.in
===================================================================
RCS file: /home/cvsd/slony1/slony1-engine/config.h.in,v
retrieving revision 1.17.2.9
retrieving revision 1.17.2.10
diff -C2 -d -r1.17.2.9 -r1.17.2.10
*** config.h.in	4 Sep 2007 20:42:14 -0000	1.17.2.9
--- config.h.in	22 Nov 2007 22:51:04 -0000	1.17.2.10
***************
*** 88,91 ****
--- 88,94 ----
  #undef HAVE_TYPENAMETYPEID_2
  
+ /* Set to 1 if typenameTypeId() takes 3 args */
+ #undef HAVE_TYPENAMETYPEID_3
+ 
  /* Set to 1 if standard_conforming_strings available */
  #undef HAVE_STANDARDCONFORMINGSTRINGS

Index: configure
===================================================================
RCS file: /home/cvsd/slony1/slony1-engine/configure,v
retrieving revision 1.70.2.8
retrieving revision 1.70.2.9
diff -C2 -d -r1.70.2.8 -r1.70.2.9
*** configure	4 Oct 2007 15:27:59 -0000	1.70.2.8
--- configure	22 Nov 2007 22:51:04 -0000	1.70.2.9
***************
*** 7652,7656 ****
--- 7652,7701 ----
  fi
  
+ { echo "$as_me:$LINENO: checking for typenameTypeId" >&5
+ echo $ECHO_N "checking for typenameTypeId... $ECHO_C" >&6; }
+ if test -z "$ac_cv_typenameTypeId_args"; then
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ #include "postgres.h"
+      #include "parser/parse_type.h"
+ int
+ main ()
+ {
+ typenameTypeId(NULL, NULL, NULL);
+   ;
+   return 0;
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+ if { (ac_try="$ac_compile"
+ case "(($ac_try" in
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+   ac_cv_typenameTypeId_args=3
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 
+ fi
  
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
  { echo "$as_me:$LINENO: checking for typenameTypeId" >&5
  echo $ECHO_N "checking for typenameTypeId... $ECHO_C" >&6; }
***************
*** 7747,7751 ****
  echo "${ECHO_T}no" >&6; }
  else
!   if test "$ac_cv_typenameTypeId_args" = 2; then
      cat >>confdefs.h <<\_ACEOF
  #define HAVE_TYPENAMETYPEID_2 1
--- 7792,7801 ----
  echo "${ECHO_T}no" >&6; }
  else
!   if test "$ac_cv_typenameTypeId_args" = 3; then
!     cat >>confdefs.h <<\_ACEOF
! #define HAVE_TYPENAMETYPEID_3 1
! _ACEOF
! 
!   elif test "$ac_cv_typenameTypeId_args" = 2; then
      cat >>confdefs.h <<\_ACEOF
  #define HAVE_TYPENAMETYPEID_2 1