summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--net/samba/Makefile6
1 files changed, 1 insertions, 5 deletions
diff --git a/net/samba/Makefile b/net/samba/Makefile
index f1df534af4a..ffae0832793 100644
--- a/net/samba/Makefile
+++ b/net/samba/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.282 2020/05/22 10:56:31 adam Exp $
+# $NetBSD: Makefile,v 1.283 2020/05/23 10:48:30 rillig Exp $
DISTNAME= samba-${VERSION}
CATEGORIES= net
@@ -68,10 +68,6 @@ CONFIGURE_ARGS+= --localstatedir=${SAMBA_VARDIR}
CONFIGURE_ARGS+= --with-mandir=${PREFIX}/${PKGMANDIR}
CONFIGURE_ARGS+= --with-swatdir=${PREFIX}/share/samba/swat
CONFIGURE_ARGS+= --enable-external-libtdb
-#
-# Explicitly disable samba4 merged-build option which is broken.
-#
-CONFIGURE_ARGS+= --enable-merged-build=no
.include "../../net/samba/options.mk"