*** acx_libpq.m4	2006-12-13 00:16:38.000000000 +0100
--- acx_libpq.m4.new	2007-11-07 18:19:34.000000000 +0100
***************
*** 9,21 ****
  dnl Get commandline options first
  dnl -----------------------------------------
  
- 
  if test -n "${with_pgbindir}" ; then
  _pwd=`pwd`
! cd ${with_pgbindir}
! with_pgbindir=`pwd`
  cd ${_pwd}
! echo "overriding pgbindir with" ${with_pgbindir}
  PG_BINDIR=${with_pgbindir}
  fi
  
--- 9,25 ----
  dnl Get commandline options first
  dnl -----------------------------------------
  
  if test -n "${with_pgbindir}" ; then
  _pwd=`pwd`
! cd ${with_pgbindir} 2> /dev/null
! _pgbindir=`pwd`
  cd ${_pwd}
!         if test ${_pwd} = ${_pgbindir}; then
!                 echo "overriding pgbindir with" ${with_pgbindir} "even though it wasn't found :)"
!         else
!                 echo "overriding pgbindir with" ${with_pgbindir}
!                 with_pgbindir=${_pgbindir}
!         fi
  PG_BINDIR=${with_pgbindir}
  fi
  
***************
*** 39,48 ****
  
  if test -n "${with_pgpkglibdir}"; then
  _pwd=`pwd`
! cd ${with_pgpkglibdir}
! with_pgpkglibdir=`pwd`
  cd ${_pwd}
! echo "overriding pgpkglibdir with" ${with_pgpkglibdir}
  PG_PKGLIBDIR=${with_pgpkglibdir}
  fi
  
--- 43,57 ----
  
  if test -n "${with_pgpkglibdir}"; then
  _pwd=`pwd`
! cd ${with_pgpkglibdir} 2> /dev/null
! _pgpkglibdir=`pwd`
  cd ${_pwd}
!         if test ${_pwd} = ${_pgpkglibdir}; then
!                 echo "overriding pgpkglibdir with" ${with_pgpkglibdir} "even though it wasn't found :)"
!         else
!                 echo "overriding pgpkglibdir with" ${with_pgpkglibdir}
!                 with_pgpkglibdir=${_pgpkglibdir}
!         fi
  PG_PKGLIBDIR=${with_pgpkglibdir}
  fi
  
***************
*** 58,65 ****
  if test -n "${with_toolsdir}"; then
  _pwd=`pwd`
  cd ${with_toolsdir}
! with_toolsdir=`pwd`
  cd ${_pwd}
  echo "overriding toolsdir with" ${with_toolsdir}
  TOOLSBINDIR=${with_toolsdir}
  fi
--- 67,80 ----
  if test -n "${with_toolsdir}"; then
  _pwd=`pwd`
  cd ${with_toolsdir}
! _toolsdir=`pwd`
  cd ${_pwd}
+ 	if test ${_pwd} = ${_toolsdir}; then
+ 		echo "overriding toolsdir with" ${with_toolsdir} "even though it wasn't found :)"
+ 	else
+ 		echo "overriding toolsdir with" ${with_toolsdir}
+ 		with_toolsdir=${_toolsdir}
+ 	fi
  echo "overriding toolsdir with" ${with_toolsdir}
  TOOLSBINDIR=${with_toolsdir}
  fi