aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--share/mk/bsd.own.mk2
-rw-r--r--usr.bin/grep/Makefile8
2 files changed, 6 insertions, 4 deletions
diff --git a/share/mk/bsd.own.mk b/share/mk/bsd.own.mk
index 24a0fcd53734..b463f094ad38 100644
--- a/share/mk/bsd.own.mk
+++ b/share/mk/bsd.own.mk
@@ -283,6 +283,7 @@ __DEFAULT_YES_OPTIONS = \
GCOV \
GDB \
GNU \
+ GNU_GREP_COMPAT \
GPIB \
GPIO \
GPL_DTC \
@@ -310,6 +311,7 @@ __DEFAULT_YES_OPTIONS = \
LOCATE \
LPR \
LS_COLORS \
+ LZMA_SUPPORT \
MAIL \
MAILWRAPPER \
MAKE \
diff --git a/usr.bin/grep/Makefile b/usr.bin/grep/Makefile
index 8b2fa0c49703..abc2f447073f 100644
--- a/usr.bin/grep/Makefile
+++ b/usr.bin/grep/Makefile
@@ -43,7 +43,7 @@ MLINKS= grep.1 egrep.1 \
LDADD= -lz
DPADD= ${LIBZ}
-.if !defined(WITHOUT_LZMA_SUPPORT)
+.if ${MK_LZMA_SUPPORT} != "no"
LDADD+= -llzma
DPADD+= ${LIBLZMA}
@@ -57,7 +57,7 @@ LINKS+= ${BINDIR}/${PROG} ${BINDIR}/xzgrep \
CFLAGS+= -DWITHOUT_LZMA
.endif
-.if !defined(WITHOUT_BZIP2_SUPPORT)
+.if ${MK_BZIP2_SUPPORT} != "no"
LDADD+= -lbz2
DPADD+= ${LIBBZ2}
@@ -73,13 +73,13 @@ MLINKS+= grep.1 bzgrep.1 \
CFLAGS+= -DWITHOUT_BZIP2
.endif
-.if !defined(WITHOUT_GNU_COMPAT)
+.if ${MK_GNU_GREP_COMPAT} != "no"
CFLAGS+= -I${DESTDIR}/usr/include/gnu
LDADD+= -lgnuregex
DPADD+= ${LIBGNUREGEX}
.endif
-.if !defined(WITHOUT_NLS)
+.if ${MK_NLS} != "no"
.include "${.CURDIR}/nls/Makefile.inc"
.else
CFLAGS+= -DWITHOUT_NLS