summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authortaca <taca@pkgsrc.org>2011-03-31 13:57:30 +0000
committertaca <taca@pkgsrc.org>2011-03-31 13:57:30 +0000
commit78f45373ff675e316d1a1d965a6e3c4322ab270b (patch)
treed1849acb7fbdec9cd8cc7527ae9645ad8bdb20cf /net
parent6357e4c11bf1dcb4b94ded3b3beaf556c9894639 (diff)
downloadpkgsrc-78f45373ff675e316d1a1d965a6e3c4322ab270b.tar.gz
Explicitly disable merged build option (samba4).
Reflects discussion by PR pkg/44786.
Diffstat (limited to 'net')
-rw-r--r--net/samba35/Makefile6
1 files changed, 5 insertions, 1 deletions
diff --git a/net/samba35/Makefile b/net/samba35/Makefile
index 20cade632e7..03e25609478 100644
--- a/net/samba35/Makefile
+++ b/net/samba35/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2011/03/08 08:30:07 adam Exp $
+# $NetBSD: Makefile,v 1.5 2011/03/31 13:57:30 taca Exp $
.include "../../net/samba/Makefile.mirrors"
@@ -65,6 +65,10 @@ CONFIGURE_ARGS+= --with-statedir=${SAMBA_STATEDIR}
CONFIGURE_ARGS+= --localstatedir=${SAMBA_VARDIR}
CONFIGURE_ARGS+= --with-mandir=${PREFIX}/${PKGMANDIR}
CONFIGURE_ARGS+= --with-swatdir=${PREFIX}/share/samba/swat
+#
+# Explicitly disable samba4 merged-build option which is broken.
+#
+CONFIGURE_ARGS+= --enable-merged-build=no
.include "../../net/samba/options.mk"