From: Robert Haas <rhaas@postgresql.org>
Date: Fri, 19 Aug 2011 15:57:38 +0000 (-0400)
Subject: Fix contrib/sepgsql and contrib/xml2 to always link required libraries.
X-Git-Tag: REL9_1_0~67
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1ffcc377f692fb227ebfeb6036aa949099d71979;p=postgresql

Fix contrib/sepgsql and contrib/xml2 to always link required libraries.

contrib/xml2 can get by without libxslt; the relevant features just
won't work.  But if doesn't have libxml2, or if sepgsql doesn't have
libselinux, the link succeeds but the module then fails to work at load
time.  To avoid that, link the require libraries unconditionally, so
that it will be clear at link-time that there is a problem.

Per discussion with Tom Lane and KaiGai Kohei.
---

diff --git a/contrib/sepgsql/Makefile b/contrib/sepgsql/Makefile
index bc995dd29a..536de2b224 100644
--- a/contrib/sepgsql/Makefile
+++ b/contrib/sepgsql/Makefile
@@ -18,5 +18,5 @@ include $(top_builddir)/src/Makefile.global
 include $(top_srcdir)/contrib/contrib-global.mk
 endif
 
-SHLIB_LINK += $(filter -lselinux, $(LIBS))
+SHLIB_LINK += -lselinux
 REGRESS_OPTS += --launcher $(top_builddir)/contrib/sepgsql/launcher
diff --git a/contrib/xml2/Makefile b/contrib/xml2/Makefile
index ad325723c9..be3d018cf5 100644
--- a/contrib/xml2/Makefile
+++ b/contrib/xml2/Makefile
@@ -8,7 +8,7 @@ DATA = xml2--1.0.sql xml2--unpackaged--1.0.sql
 
 REGRESS = xml2
 
-SHLIB_LINK += $(filter -lxslt, $(LIBS)) $(filter -lxml2, $(LIBS))
+SHLIB_LINK += $(filter -lxslt, $(LIBS)) -lxml2
 
 ifdef USE_PGXS
 PG_CONFIG = pg_config