diff options
| author | Simon J. Gerraty <sjg@FreeBSD.org> | 2017-11-01 23:16:32 +0000 |
|---|---|---|
| committer | Simon J. Gerraty <sjg@FreeBSD.org> | 2017-11-01 23:16:32 +0000 |
| commit | ade1697bee1de85ba84665fc7f1c633c0bfc1faa (patch) | |
| tree | 4e5eb116b9552d7e38555f8205c47f3fe07deb3e /configure.in | |
| parent | 56028c60f45b9c206f7a9b968fa2bd0af5619581 (diff) | |
| download | src-ade1697bee1de85ba84665fc7f1c633c0bfc1faa.tar.gz src-ade1697bee1de85ba84665fc7f1c633c0bfc1faa.zip | |
Import bmake-20171028vendor/NetBSD/bmake/20171028
From ChangeLog
2017-10-28 Simon J. Gerraty <sjg@bad.crufty.net>
* VERSION: 20171028
Merge with NetBSD make, pick up
o main.c: ignore empty MAKEOBJDIR
* Makefile.config.in:
make @prefix@ @machine*@ and @default_sys_path@ defaults.
2017-10-05 Simon J. Gerraty <sjg@bad.crufty.net>
* VERSION: 20171005
* unit-tests/dotwait.mk: redirect stderr through pipe for more
consistent result on some platforms.
2017-08-13 Simon J. Gerraty <sjg@bad.crufty.net>
* machine.sh: entry for AIX
2017-08-12 Simon J. Gerraty <sjg@bad.crufty.net>
* VERSION (_MAKE_VERSION): Move the setting of _MAKE_VERSION
to a file that can be included by configure as well as make.
This allows configure to set set _MAKE_VERSION in make-bootstrap.sh
2017-08-10 Simon J. Gerraty <sjg@bad.crufty.net>
* Makefile (_MAKE_VERSION): 20170810
Merge with NetBSD make, pick up
o meta.c: if target is in subdir we only need subdir name in
meta_name.
Notes
Notes:
svn path=/vendor/NetBSD/bmake/dist/; revision=325300
svn path=/vendor/NetBSD/bmake/20171028/; revision=325301; tag=vendor/NetBSD/bmake/20171028
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/configure.in b/configure.in index 29d368b2ed29..aed426ef8ede 100644 --- a/configure.in +++ b/configure.in @@ -1,11 +1,11 @@ dnl dnl RCSid: -dnl $Id: configure.in,v 1.57 2016/06/07 00:49:44 sjg Exp $ +dnl $Id: configure.in,v 1.58 2017/08/13 00:56:10 sjg Exp $ dnl dnl Process this file with autoconf to produce a configure script dnl AC_PREREQ(2.50) -AC_INIT([bmake], [20160606], [sjg@NetBSD.org]) +AC_INIT([bmake], [20170812], [sjg@NetBSD.org]) AC_CONFIG_HEADERS(config.h) dnl make srcdir absolute @@ -14,6 +14,9 @@ case "$srcdir" in *) srcdir=`cd $srcdir && pwd`;; esac +dnl get _MAKE_VERSION +. $srcdir/VERSION + dnl AC_ARG_WITH(defshell, [ --with-defshell=SHELL use SHELL by default - must be sh compatible, use sh or ksh to pick the internal definitions], @@ -386,6 +389,7 @@ AC_SUBST(GCC) AC_SUBST(diff_u) AC_SUBST(use_meta) AC_SUBST(filemon_h) +AC_SUBST(_MAKE_VERSION) AC_OUTPUT(makefile Makefile.config make-bootstrap.sh unit-tests/Makefile) cat <<EOF |