Index: src/Makefile.global.in
===================================================================
RCS file: /cvsroot/pgsql/src/Makefile.global.in,v
retrieving revision 1.209
diff -c -c -r1.209 Makefile.global.in
*** src/Makefile.global.in	26 Jan 2005 19:23:59 -0000	1.209
--- src/Makefile.global.in	11 Mar 2005 21:21:15 -0000
***************
*** 306,312 ****
  libpq_builddir = $(top_builddir)/src/interfaces/libpq
  endif
  
! libpq = -L$(libpq_builddir) -lpq
  
  # If doing static linking, shared library dependency can't be
  # used so we specify pthread libs for every usage of libpq
--- 306,321 ----
  libpq_builddir = $(top_builddir)/src/interfaces/libpq
  endif
  
! # We need client applications to pull from libpgport rather than getting
! # the same symbols from libpq's copy of pgport.  This makes applications
! # bind to libpq symbols only based on the API and not pgport.
! # To do this we make sure pgport is linked to first, before libpq.
! # This does cause duplicate -lpgport's to appear on client link lines.
! ifdef PGXS
! libpq = -L$(libdir) -lpgport -L$(libpq_builddir) -lpq
! else
! libpq = -L$(top_builddir)/src/port -lpgport -L$(libpq_builddir) -lpq
! endif
  
  # If doing static linking, shared library dependency can't be
  # used so we specify pthread libs for every usage of libpq