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

Modified Files:
	acx_libpq.m4 
Log Message:
Change to libpq detection code...

- This version of Slony-I no longer needs to support versions earlier than
  8.3, so we alter rules that related to earlier versions, either:

   - Drop irrelevant tests
   - Report that they are irrelevant


Index: acx_libpq.m4
===================================================================
RCS file: /home/cvsd/slony1/slony1-engine/config/acx_libpq.m4,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** acx_libpq.m4	29 Nov 2006 18:44:36 -0000	1.27
--- acx_libpq.m4	29 Nov 2007 15:57:56 -0000	1.28
***************
*** 143,168 ****
      PG_VERSION_MINOR=`echo $PG_VERSION | cut -d. -f2`
      if test "$PG_VERSION_MAJOR" = "7"; then
! 	if test $PG_VERSION_MINOR -gt 3; then
  	    AC_MSG_RESULT($PG_VERSION)
! 	    AC_DEFINE(PG_VERSION_OK,1,[PostgreSQL 7.4 or later])
  	else
  	    AC_MSG_RESULT("error")
  	    AC_MSG_ERROR(Your version of PostgreSQL ($PG_VERSION) is lower 
! 	    than the required 7.4.  Slony-I needs functions included in
  	    a newer version.)
  	fi
-     fi
-     if test "$PG_VERSION_MAJOR" = "8"; then
        AC_MSG_RESULT($PG_VERSION)
!       AC_DEFINE(PG_VERSION_OK,1,[PostgreSQL 7.4 or later])
      fi
  
!     if test "$PG_VERSION_MAJOR" = "8"; then
! 	if test $PG_VERSION_MINOR -gt 0; then
!             if test "$PG_SHAREDIR" = ""; then
!                 PG_SHAREDIR=`$PG_CONFIG_LOCATION --sharedir`/ 2>/dev/null
!                 echo "pg_config says pg_sharedir is $PG_SHAREDIR"
!             fi
! 	fi
      fi
  
--- 143,169 ----
      PG_VERSION_MINOR=`echo $PG_VERSION | cut -d. -f2`
      if test "$PG_VERSION_MAJOR" = "7"; then
! 	    AC_MSG_RESULT("error")
! 	    AC_MSG_ERROR(Your version of PostgreSQL ($PG_VERSION) is lower 
! 	    than the required 8.3.  Slony-I needs functionality included in
! 	    a newer version.)
!     fi
!     if test "$PG_VERSION_MAJOR" = "8"; then
! 	if test $PG_VERSION_MINOR -gt 2; then
  	    AC_MSG_RESULT($PG_VERSION)
! 	    AC_DEFINE(PG_VERSION_OK,1,[PostgreSQL 8.3 or later])
  	else
  	    AC_MSG_RESULT("error")
  	    AC_MSG_ERROR(Your version of PostgreSQL ($PG_VERSION) is lower 
! 	    than the required 8.3.  Slony-I needs functionality included in
  	    a newer version.)
  	fi
        AC_MSG_RESULT($PG_VERSION)
!       AC_DEFINE(PG_VERSION_OK,1,[PostgreSQL 8.3 or later])
      fi
  
!     
!     if test "$PG_SHAREDIR" = ""; then
!        PG_SHAREDIR=`$PG_CONFIG_LOCATION --sharedir`/ 2>/dev/null
!        echo "pg_config says pg_sharedir is $PG_SHAREDIR"
      fi
  
***************
*** 231,236 ****
  else
      AC_MSG_ERROR(Your version of libpq doesn't have PQunescapeBytea
!      this means that your version of PostgreSQL is lower than 7.3 
!      and thus not supported by Slony-I.)
  fi
  
--- 232,238 ----
  else
      AC_MSG_ERROR(Your version of libpq doesn't have PQunescapeBytea
!      which means that your version of PostgreSQL is lower than 7.3
!      and thus not even remotely supported by Slony-I version 2, 
!      which requires 8.3+)
  fi