Date: Tue, 1 Apr 2014 14:24:32 +0000 (UTC) From: Warner Losh <imp@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r263997 - in head: share/mk usr.bin/grep Message-ID: <201404011424.s31EOWZO015184@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: imp Date: Tue Apr 1 14:24:32 2014 New Revision: 263997 URL: http://svnweb.freebsd.org/changeset/base/263997 Log: Don't test WITHOUT_FOO in program makefiles, test MK_FOO instead. Modified: head/share/mk/bsd.own.mk head/usr.bin/grep/Makefile Modified: head/share/mk/bsd.own.mk ============================================================================== --- head/share/mk/bsd.own.mk Tue Apr 1 14:24:25 2014 (r263996) +++ head/share/mk/bsd.own.mk Tue Apr 1 14:24:32 2014 (r263997) @@ -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 \ Modified: head/usr.bin/grep/Makefile ============================================================================== --- head/usr.bin/grep/Makefile Tue Apr 1 14:24:25 2014 (r263996) +++ head/usr.bin/grep/Makefile Tue Apr 1 14:24:32 2014 (r263997) @@ -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}/xzgr 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201404011424.s31EOWZO015184>