diff options
| author | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2012-07-16 17:21:57 +0200 |
|---|---|---|
| committer | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2012-07-16 17:22:49 +0200 |
| commit | aad94ec02c625a1cb15d8e8ebb71f2213520a6d2 (patch) | |
| tree | bccfb80edd523a6158c09c03608dedf4e82a16f4 | |
| parent | 336c956262340db1e6be932462fbd412ca668954 (diff) | |
Fixing build with internal openldap
Change-Id: I365c5252a48b6ba4e8409534c75d34c4d07b2475
| -rw-r--r-- | extensions/Library_ldapbe2.mk | 7 | ||||
| -rw-r--r-- | openldap/makefile.mk | 2 | ||||
| -rw-r--r-- | postgresql/makefile.mk | 8 |
3 files changed, 15 insertions, 2 deletions
diff --git a/extensions/Library_ldapbe2.mk b/extensions/Library_ldapbe2.mk index 3a5736f6aeb5..9fd80731ede6 100644 --- a/extensions/Library_ldapbe2.mk +++ b/extensions/Library_ldapbe2.mk @@ -61,6 +61,13 @@ else # 0S!=WNT $(eval $(call gb_Library_add_libs,ldapbe2,\ -lldap \ -llber \ + -lssl3 \ + -lsmime3 \ + -lnss3 \ + -lnssutil3 \ + -lplds4 \ + -lplc4 \ + -lnspr4 \ )) endif diff --git a/openldap/makefile.mk b/openldap/makefile.mk index da58c5516814..88ffabe8211c 100644 --- a/openldap/makefile.mk +++ b/openldap/makefile.mk @@ -36,7 +36,7 @@ PATCH_FILES=\ CONFIGURE_DIR= CONFIGURE_ACTION=.$/configure -CONFIGURE_FLAGS=--disable-slapd --with-pic --with-tls=moznss --disable-shared --enable-static +CONFIGURE_FLAGS=--disable-slapd --with-pic --with-tls=moznss --without-cyrus-sasl --disable-shared --enable-static .IF "$(SYSTEM_NSS)" == "YES" CONFIGURE_FLAGS+=CPPFLAGS="$(NSS_CFLAGS)" CFLAGS="$(NSS_CFLAGS)" LDFLAGS="$(NSS_LIBS)" .ELSE 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) |