aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Lane <tgl@sss.pgh.pa.us>2006-09-11 13:35:08 +0000
committerTom Lane <tgl@sss.pgh.pa.us>2006-09-11 13:35:08 +0000
commit0bdc18d5d1e594ed623b21ee57c31dcbd86bbfcf (patch)
tree79ee2ed0f00d90cfde26480b44b7e5b1446cc907
parentbb87c7b55174befaee68ada1fa61a4c2c2430459 (diff)
downloadpostgresql-0bdc18d5d1e594ed623b21ee57c31dcbd86bbfcf.tar.gz
postgresql-0bdc18d5d1e594ed623b21ee57c31dcbd86bbfcf.zip
Add LDAP_LIBS_FE to $(libpq) for static or AIX linking, per Albe Laurenz.
-rw-r--r--src/Makefile.global.in8
1 files changed, 5 insertions, 3 deletions
diff --git a/src/Makefile.global.in b/src/Makefile.global.in
index a9ac4f6179f..12cf42f0aa8 100644
--- a/src/Makefile.global.in
+++ b/src/Makefile.global.in
@@ -1,5 +1,5 @@
# -*-makefile-*-
-# $PostgreSQL: pgsql/src/Makefile.global.in,v 1.228 2006/09/10 22:07:02 tgl Exp $
+# $PostgreSQL: pgsql/src/Makefile.global.in,v 1.229 2006/09/11 13:35:08 tgl Exp $
#------------------------------------------------------------------------------
# All PostgreSQL makefiles include this file and use the variables it sets,
@@ -343,12 +343,14 @@ libpq := -L$(libpq_builddir) -lpq
# If doing static linking, shared library dependency info isn't available,
# so add in the libraries that libpq depends on.
ifeq ($(enable_shared), no)
-libpq += $(filter -lintl -lssl -lcrypto -lkrb5 -lcrypt, $(LIBS)) $(PTHREAD_LIBS)
+libpq += $(filter -lintl -lssl -lcrypto -lkrb5 -lcrypt, $(LIBS)) \
+ $(LDAP_LIBS_FE) $(PTHREAD_LIBS)
else
# On AIX even shared libraries do not remember their required libs,
# so again add in what libpq depends on.
ifeq ($(PORTNAME), aix)
-libpq += $(filter -lintl -lssl -lcrypto -lkrb5 -lcrypt, $(LIBS)) $(PTHREAD_LIBS)
+libpq += $(filter -lintl -lssl -lcrypto -lkrb5 -lcrypt, $(LIBS)) \
+ $(LDAP_LIBS_FE) $(PTHREAD_LIBS)
endif
endif