[Libreoffice-commits] .: postgresql/makefile.mk

[Lionel Elie Mamane]

 postgresql/makefile.mk |   10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

New commits:
commit 069fa157ce67a282f532301e452387fb67a7a8c5
Author: Lionel Elie Mamane <lionel at mamane.lu>
Date:   Sun Feb 5 11:41:55 2012 +0100

    postgresql on MS Windows: use MozLDAP only if enabled

diff --git a/postgresql/makefile.mk b/postgresql/makefile.mk
index 2d814bd..340a6a8 100644
--- a/postgresql/makefile.mk
+++ b/postgresql/makefile.mk
@@ -56,8 +56,14 @@ BUILD_DIR=src
 
 CONFIGURE_ACTION =
 SOLARINC += -I$(SOLARVER)$/$(INPATH)$/inc$/mozilla$/ldap
-BUILD_ACTION = nmake -f win32.mak USE_SSL=1 USE_LDAP=1 USE_MOZLDAP=1
-.ELSE
+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_MOZLDAP=1
+.ENDIF
+.ENDIF # "$(WITH_LDAP)" == "YES"
+.ELSE #"$(GUI)$(COM)"!="WNTMSC"
 CONFIGURE_DIR=.
 BUILD_DIR=src/interfaces/libpq