Index: configure
===================================================================
RCS file: /cvsroot/pgsql/configure,v
retrieving revision 1.532
diff -c -c -r1.532 configure
*** configure	28 Jan 2007 03:50:33 -0000	1.532
--- configure	3 Feb 2007 02:37:15 -0000
***************
*** 17609,17615 ****
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    ac_check_lib_save_LIBS=$LIBS
! LIBS="-lldap_r $PTHREAD_LIBS $EXTRA_LDAP_LIBS $LIBS"
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
--- 17609,17615 ----
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    ac_check_lib_save_LIBS=$LIBS
! LIBS="-lldap_r $PTHREAD_CFLAGS $PTHREAD_LIBS $EXTRA_LDAP_LIBS $LIBS"
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
Index: configure.in
===================================================================
RCS file: /cvsroot/pgsql/configure.in,v
retrieving revision 1.499
diff -c -c -r1.499 configure.in
*** configure.in	28 Jan 2007 03:50:33 -0000	1.499
--- configure.in	3 Feb 2007 02:37:17 -0000
***************
*** 1152,1158 ****
        # on some platforms ldap_r fails to link without PTHREAD_LIBS
        AC_CHECK_LIB(ldap_r, ldap_simple_bind, [],
  		   [AC_MSG_ERROR([library 'ldap_r' is required for LDAP])],
! 		   [$PTHREAD_LIBS $EXTRA_LDAP_LIBS])
        LDAP_LIBS_FE="-lldap_r $EXTRA_LDAP_LIBS"
      else
        LDAP_LIBS_FE="-lldap $EXTRA_LDAP_LIBS"
--- 1152,1158 ----
        # on some platforms ldap_r fails to link without PTHREAD_LIBS
        AC_CHECK_LIB(ldap_r, ldap_simple_bind, [],
  		   [AC_MSG_ERROR([library 'ldap_r' is required for LDAP])],
! 		   [$PTHREAD_CFLAGS $PTHREAD_LIBS $EXTRA_LDAP_LIBS])
        LDAP_LIBS_FE="-lldap_r $EXTRA_LDAP_LIBS"
      else
        LDAP_LIBS_FE="-lldap $EXTRA_LDAP_LIBS"
