summaryrefslogtreecommitdiff
path: root/net/samba
diff options
context:
space:
mode:
authorjlam <jlam@pkgsrc.org>2001-12-18 20:22:59 +0000
committerjlam <jlam@pkgsrc.org>2001-12-18 20:22:59 +0000
commit9efcd64075c222100ceb74e2479d5f24a4c213a9 (patch)
tree4398d1c69eccb0c7b3d197ff556f4f1145defdb1 /net/samba
parent0d69b6d0f6865112be8b6ae375bea30e661e33ca (diff)
downloadpkgsrc-9efcd64075c222100ceb74e2479d5f24a4c213a9.tar.gz
Since print/cups conflicts with another popular print package,
print/lprng, we make a new variable USE_CUPS that is used by packages to determine whether depend on print/cups and to compile in support for CUPS. USE_CUPS may be either "YES" or undefined. Deprecate SAMBA_WITH_CUPS as its purpose is superseded by USE_CUPS. Convert net/samba and net/samba20 to use USE_CUPS and make x11/kdelibs2 respect USE_CUPS.
Diffstat (limited to 'net/samba')
-rw-r--r--net/samba/Makefile5
1 files changed, 3 insertions, 2 deletions
diff --git a/net/samba/Makefile b/net/samba/Makefile
index 116bfc1e88a..bd6617d4061 100644
--- a/net/samba/Makefile
+++ b/net/samba/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.72 2001/12/02 06:56:43 jlam Exp $
+# $NetBSD: Makefile,v 1.73 2001/12/18 20:23:00 jlam Exp $
DISTNAME= samba-2.2.2
WRKSRC= ${WRKDIR}/${DISTNAME}/source
@@ -50,8 +50,9 @@ CFLAGS+= -I${BUILDLINK_DIR}/include/openssl # ssl.h, err.h
CONFIGURE_ENV+= ac_cv_lib_curses_tgetent=no
-.if defined(SAMBA_WITH_CUPS)
+.if defined(USE_CUPS) && (${USE_CUPS} == "YES")
.include "../../print/cups/buildlink.mk"
+BUILD_DEFS+= USE_CUPS
.endif
.if defined(USE_PAM)