diff options
| author | Robert Haas <rhaas@postgresql.org> | 2011-08-19 11:57:38 -0400 |
|---|---|---|
| committer | Robert Haas <rhaas@postgresql.org> | 2011-08-19 12:01:23 -0400 |
| commit | 1ffcc377f692fb227ebfeb6036aa949099d71979 (patch) | |
| tree | 0835ef3cd7f41268cc4d2721e44d69220cb53c10 | |
| parent | 1013770dd22193928fab5a3e379dc5ebe5a260be (diff) | |
| download | postgresql-1ffcc377f692fb227ebfeb6036aa949099d71979.tar.gz postgresql-1ffcc377f692fb227ebfeb6036aa949099d71979.zip | |
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.
| -rw-r--r-- | contrib/sepgsql/Makefile | 2 | ||||
| -rw-r--r-- | contrib/xml2/Makefile | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/contrib/sepgsql/Makefile b/contrib/sepgsql/Makefile index bc995dd29a2..536de2b2241 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 ad325723c99..be3d018cf53 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 |