diff options
| author | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2012-07-16 16:33:07 +0200 |
|---|---|---|
| committer | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2012-07-16 17:22:49 +0200 |
| commit | 336c956262340db1e6be932462fbd412ca668954 (patch) | |
| tree | 9c4f8a29034521beb2f8e72509b37672d30ab226 /postgresql | |
| parent | 069c1efa39e3bed146a3e70af796e6a70cf2f67e (diff) | |
First attempt at removing mozilla ldap at all (please help to fix)
Change-Id: I0559cf1820c782d22c4d75749f2171d7702b4e73
Diffstat (limited to 'postgresql')
| -rw-r--r-- | postgresql/makefile.mk | 17 | ||||
| -rw-r--r-- | postgresql/prj/build.lst | 2 |
2 files changed, 3 insertions, 16 deletions
diff --git a/postgresql/makefile.mk b/postgresql/makefile.mk index a04b6e275667..41fd8ca69776 100644 --- a/postgresql/makefile.mk +++ b/postgresql/makefile.mk @@ -56,30 +56,17 @@ CONFIGURE_DIR=. BUILD_DIR=src CONFIGURE_ACTION = -BUILD_ACTION = nmake -f win32.mak USE_SSL=1 -.IF "$(WITH_LDAP)" == "YES" -BUILD_ACTION += USE_LDAP=1 -.IF "$(WITH_OPENLDAP)" != "YES" -BUILD_ACTION += USE_MICROSOFT_LDAP=1 -.ENDIF -.ENDIF # "$(WITH_LDAP)" == "YES" +BUILD_ACTION = nmake -f win32.mak USE_SSL=1 USE_LDAP=1 USE_MICROSOFT_LDAP=1 .ELSE #"$(GUI)$(COM)"!="WNTMSC" CONFIGURE_DIR=. BUILD_DIR=src/interfaces/libpq -CONFIGURE_ACTION = CPPFLAGS="$(SOLARINC)" LDFLAGS="$(SOLARLIB)" ./configure --without-readline --disable-shared --with-openssl +CONFIGURE_ACTION = CPPFLAGS="$(SOLARINC)" LDFLAGS="$(SOLARLIB)" ./configure --without-readline --disable-shared --with-openssl --with-ldap .IF "$(CROSS_COMPILING)" == "YES" CONFIGURE_ACTION += --build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) .ENDIF -.IF "$(WITH_LDAP)" == "YES" -CONFIGURE_ACTION += --with-ldap -.IF "$(WITH_OPENLDAP)" != "YES" -CONFIGURE_ACTION += --with-includes='$(SOLARVER)$/$(INPATH)$/inc$/mozilla$/ldap' --with-mozldap -.ENDIF -.ENDIF # "$(WITH_LDAP)" == "YES" - .IF "$(WITH_KRB5)" == "YES" CONFIGURE_ACTION += --with-krb5 .ENDIF diff --git a/postgresql/prj/build.lst b/postgresql/prj/build.lst index 5059f9521b22..abe042ea5a34 100644 --- a/postgresql/prj/build.lst +++ b/postgresql/prj/build.lst @@ -1,3 +1,3 @@ -my postgresql : solenv sal OPENSSL:openssl MOZ:moz NULL +my postgresql : solenv sal OPENLDAP:openldap OPENSSL:openssl NULL my postgresql nmake - all my_mkout NULL |