summaryrefslogtreecommitdiff
path: root/postgresql
diff options
context:
space:
mode:
authorLionel Elie Mamane <lionel@mamane.lu>2012-02-05 11:41:55 +0100
committerLionel Elie Mamane <lionel@mamane.lu>2012-02-05 12:05:31 +0100
commit069fa157ce67a282f532301e452387fb67a7a8c5 (patch)
treeeba37918d3889318b17deccfa2556ac5ddc5d18f /postgresql
parent9648045af26e127db4854349b3bd039f566ffb12 (diff)
postgresql on MS Windows: use MozLDAP only if enabled
Diffstat (limited to 'postgresql')
-rw-r--r--postgresql/makefile.mk10
1 files changed, 8 insertions, 2 deletions
diff --git a/postgresql/makefile.mk b/postgresql/makefile.mk
index 2d814bdeb798..340a6a8c9aa2 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