- Fix build with WITHOUT_LDAP

- Mark WITHOUT_MAILNEWS as BROKEN

Feature safe:	yes
This commit is contained in:
Beat Gaetzi 2011-11-27 13:52:57 +00:00
parent 5d09c7e4ca
commit f71e994f68
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=286506
2 changed files with 5 additions and 4 deletions

View file

@ -86,6 +86,7 @@ LIB_DEPENDS+= glitz.1:${PORTSDIR}/graphics/glitz
.if defined(WITHOUT_MAILNEWS)
EXTRA_PATCHES+= ${FILESDIR}/extra-mailnews-patch-bridge-bridge.mk
MOZ_OPTIONS+= --disable-ldap --disable-mailnews
BROKEN= Does not build
.else
# mail and news desired, but not LDAP
.if defined(WITHOUT_LDAP)

View file

@ -1,5 +1,5 @@
--- bridge/bridge.mk.orig 2011-10-24 10:44:24.000000000 +0200
+++ bridge/bridge.mk 2011-10-24 10:44:56.000000000 +0200
--- bridge/bridge.mk.orig 2011-11-24 18:31:11.000000000 +0100
+++ bridge/bridge.mk 2011-11-24 18:31:23.000000000 +0100
@@ -38,10 +38,10 @@
APP_LIBXUL_DIRS += $(DEPTH)$(SUBDIR)/mozilla/xpfe/components/autocomplete
@ -11,5 +11,5 @@
-#endif
+endif
ifdef MOZ_MAIL_NEWS
APP_LIBXUL_DIRS += \
#ifdef MOZ_MORK
APP_LIBXUL_DIRS += $(DEPTH)$(SUBDIR)/db/mork