diff options
author | bsiegert <bsiegert@pkgsrc.org> | 2011-06-18 22:17:41 +0000 |
---|---|---|
committer | bsiegert <bsiegert@pkgsrc.org> | 2011-06-18 22:17:41 +0000 |
commit | 7cb16bb66575467ac59352068eaec344242b439a (patch) | |
tree | c8f5dd7d540977ec601c02e7d04c13e80115f641 /devel/bmake/files/configure.in | |
parent | 92219014db9b676e01e78bbe73c3877f94f2a471 (diff) | |
download | pkgsrc-7cb16bb66575467ac59352068eaec344242b439a.tar.gz |
Import bmake-20110606. Many changes, among them:
- unit-tests/modts now works on MirBSD
- meta mode
- ApplyModifiers: when we parse a variable which is not the entire modifier
string, or not followed by ':', do not consider it as containing modifiers.
- when long modifiers fail to match, check sysV style.
- :hash - cheap 32bit hash of value
- :localtime, :gmtime - use value as format string for strftime.
- fix for use after free() in CondDoExists().
- boot-strap (TOOL_DIFF): aparently at least on linux distro
formats the output of 'type' differently - so eat any "()"
- correct sysV substitution handling of empty lhs and variable
- correct exists() check for dir with trailing /
- correct handling of modifiers for non-existant variables during evaluation
of conditionals.
- fix for incorrect .PARSEDIR when .OBJDIR is re-computed after makefiles
have been read.
- fix example of :? modifier in man page.
- sigcompat.c: convert to ansi so we can use higher warning levels.
- parse.c: SunOS 5.8 at least does not have MAP_FILE
- use mmap(2) if available, for reading makefiles
- to ensure unit-tests results match, need to control LC_ALL as well as LANG.
- if stale dependency is an IMPSRC, search via .PATH
- machine.sh: like os.sh, allow for uname -p producing useless drivel
- boot-strap: document configure knobs for meta and filemon.
Diffstat (limited to 'devel/bmake/files/configure.in')
-rw-r--r-- | devel/bmake/files/configure.in | 53 |
1 files changed, 51 insertions, 2 deletions
diff --git a/devel/bmake/files/configure.in b/devel/bmake/files/configure.in index 2855edcfc61..212e7058506 100644 --- a/devel/bmake/files/configure.in +++ b/devel/bmake/files/configure.in @@ -1,10 +1,10 @@ dnl dnl RCSid: -dnl $Id: configure.in,v 1.1.1.5 2010/04/20 13:32:23 joerg Exp $ +dnl $Id: configure.in,v 1.1.1.6 2011/06/18 22:17:53 bsiegert Exp $ dnl dnl Process this file with autoconf to produce a configure script dnl -AC_INIT([bmake], [20100414], [sjg@NetBSD.org]) +AC_INIT([bmake], [2010505], [sjg@NetBSD.org]) AC_CONFIG_HEADER(config.h) dnl @@ -22,6 +22,42 @@ no) ;; ;; esac]) dnl +use_meta=yes +AC_ARG_WITH(meta, +[ --without-meta dissable use of meta-mode], +[case "${withval}" in +yes|no) use_meta=${withval};; +*) AC_MSG_ERROR(bad value ${withval} given for meta) ;; +esac]) +dnl +AC_ARG_WITH(filemon, +[ --with-filemon=path/filemon.h indicate path to filemon.h for meta-mode], +[ case "/${withval}" in +/no|*/filemon.h) filemon_h="${withval}";; +*/filemon*) filemon_h="${withval}/filemon.h";; +*) AC_MSG_ERROR(bad value ${withval} given for filemon) ;; +esac], +[ +OS=`uname -s` +for d in "$srcdir/filemon" "$srcdir/../filemon" +do + for x in "/$OS" "" + do + filemon_h="$d$x/filemon.h" + test -s "$filemon_h" && break + done + test -s "$filemon_h" && break +done +test -s "${filemon_h:-/dev/null}" || filemon_h=no +]) +dnl echo "Note: use_meta=$use_meta filemon_h=$filemon_h" >&6 +case "$use_meta" in +yes) + case "$filemon_h" in + *.h) echo "Using: filemon=$filemon_h" >&6;; + esac + ;; +esac dnl dnl Check for OS problems dnl Solaris's signal.h only privides sigset_t etc if one of @@ -47,11 +83,13 @@ AC_HEADER_DIRENT dnl Keep this list sorted AC_CHECK_HEADERS( \ ar.h \ + err.h \ fcntl.h \ paths.h \ poll.h \ ranlib.h \ string.h \ + sys/mman.h \ sys/select.h \ sys/socket.h \ sys/time.h \ @@ -94,11 +132,14 @@ AC_FUNC_VPRINTF AC_FUNC_WAIT3 dnl Keep this list sorted AC_CHECK_FUNCS( \ + err \ + errx \ getcwd \ getenv \ getopt \ getwd \ killpg \ + mmap \ putenv \ select \ setenv \ @@ -107,6 +148,7 @@ AC_CHECK_FUNCS( \ snprintf \ strerror \ strftime \ + strsep \ strtod \ strtol \ unsetenv \ @@ -114,12 +156,17 @@ AC_CHECK_FUNCS( \ wait3 \ wait4 \ waitpid \ + warn \ + warnx \ ) dnl functions which we may need to provide AC_REPLACE_FUNCS( \ getenv \ realpath \ + dirname \ + stresep \ + strlcpy \ ) AC_CHECK_LIB([util], [emalloc], @@ -298,6 +345,8 @@ AC_SUBST(default_sys_path) AC_SUBST(INSTALL) AC_SUBST(GCC) AC_SUBST(diff_u) +AC_SUBST(use_meta) +AC_SUBST(filemon_h) AC_OUTPUT(Makefile make-bootstrap.sh unit-tests/Makefile) cat <<EOF |