Commit 0bdc18d5 authored by Tom Lane's avatar Tom Lane

Add LDAP_LIBS_FE to $(libpq) for static or AIX linking, per Albe Laurenz.

parent bb87c7b5
# -*-makefile-*- # -*-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, # All PostgreSQL makefiles include this file and use the variables it sets,
...@@ -343,12 +343,14 @@ libpq := -L$(libpq_builddir) -lpq ...@@ -343,12 +343,14 @@ libpq := -L$(libpq_builddir) -lpq
# If doing static linking, shared library dependency info isn't available, # If doing static linking, shared library dependency info isn't available,
# so add in the libraries that libpq depends on. # so add in the libraries that libpq depends on.
ifeq ($(enable_shared), no) 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 else
# On AIX even shared libraries do not remember their required libs, # On AIX even shared libraries do not remember their required libs,
# so again add in what libpq depends on. # so again add in what libpq depends on.
ifeq ($(PORTNAME), aix) 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
endif endif
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment