summaryrefslogtreecommitdiff
path: root/postgresql
diff options
context:
space:
mode:
authorFridrich Štrba <fridrich.strba@bluewin.ch>2012-07-16 17:21:57 +0200
committerFridrich Štrba <fridrich.strba@bluewin.ch>2012-07-16 17:22:49 +0200
commitaad94ec02c625a1cb15d8e8ebb71f2213520a6d2 (patch)
treebccfb80edd523a6158c09c03608dedf4e82a16f4 /postgresql
parent336c956262340db1e6be932462fbd412ca668954 (diff)
Fixing build with internal openldap
Change-Id: I365c5252a48b6ba4e8409534c75d34c4d07b2475
Diffstat (limited to 'postgresql')
-rw-r--r--postgresql/makefile.mk8
1 files changed, 7 insertions, 1 deletions
diff --git a/postgresql/makefile.mk b/postgresql/makefile.mk
index 41fd8ca69776..e4e50214b653 100644
--- a/postgresql/makefile.mk
+++ b/postgresql/makefile.mk
@@ -61,7 +61,13 @@ BUILD_ACTION = nmake -f win32.mak USE_SSL=1 USE_LDAP=1 USE_MICROSOFT_LDAP=1
CONFIGURE_DIR=.
BUILD_DIR=src/interfaces/libpq
-CONFIGURE_ACTION = CPPFLAGS="$(SOLARINC)" LDFLAGS="$(SOLARLIB)" ./configure --without-readline --disable-shared --with-openssl --with-ldap
+CONFIGURE_ACTION = ./configure --without-readline --disable-shared --with-openssl --with-ldap
+
+.IF "$(OS)" != "WNT" && "$(SYSTEM_OPENLDAP) != "YES"
+CONFIGURE_ACTION += CPPFLAGS="-I $(SOLARVER)$/$(INPATH)$/inc$/openldap"
+CONFIGURE_ACTION += LDFLAGS="$(SOLARLIB)"
+CONFIGURE_ACTION += EXTRA_LDAP_LIBS="-llber -lssl3 -lsmime3 -lnss3 -lnssutil3 -lplds4 -lplc4 -lnspr4"
+.ENDIF
.IF "$(CROSS_COMPILING)" == "YES"
CONFIGURE_ACTION += --build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)