From: Peter Eisentraut <peter_e@gmx.net>
Date: Sun, 21 Jan 2007 09:19:06 +0000 (+0000)
Subject: Put back libpq link, but make sure that libpq's in-tree directory is
X-Git-Tag: REL9_0_0~6330
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=962e825cd7592e334a9f1327eb73030bab35d975;p=pg-rex%2Fsyncrep.git

Put back libpq link, but make sure that libpq's in-tree directory is
mentioned before the system directories.
---

diff --git a/src/interfaces/ecpg/test/Makefile.regress b/src/interfaces/ecpg/test/Makefile.regress
index f16622855b..847cded5b1 100644
--- a/src/interfaces/ecpg/test/Makefile.regress
+++ b/src/interfaces/ecpg/test/Makefile.regress
@@ -2,8 +2,8 @@ override CPPFLAGS := -I../../include -I$(top_srcdir)/src/interfaces/ecpg/include
 	-I$(libpq_srcdir) $(CPPFLAGS) 
 override CFLAGS += $(PTHREAD_CFLAGS) 
 
-override LDFLAGS := -L../../ecpglib -L../../pgtypeslib $(LDFLAGS)
-override LIBS := -lecpg -lpgtypes $(LIBS) $(PTHREAD_LIBS)
+override LDFLAGS := -L../../ecpglib -L../../pgtypeslib $(filter-out -l%, $(libpq)) $(LDFLAGS)
+override LIBS := -lecpg -lpgtypes $(filter -l%, $(libpq)) $(LIBS) $(PTHREAD_LIBS)
 
 ECPG = ../../preproc/ecpg --regression -I$(srcdir)/../../include