diff options
| author | Toby Goodwin <tjg@star.le.ac.uk> | 2003-08-13 13:51:14 +0100 |
|---|---|---|
| committer | Toby Goodwin <toby@paccrat.org> | 2015-05-16 21:22:10 +0100 |
| commit | d884971193ef4934424b77ae862e8b0ecf70bab3 (patch) | |
| tree | 700b8fd63be483aaa2a737036a3f7833fdf7b26a /configure.ac | |
| parent | 77b18786228a8cf9f58aee09677440c61dc218a9 (diff) | |
release: rc-1.7.1
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 53 |
1 files changed, 26 insertions, 27 deletions
diff --git a/configure.ac b/configure.ac index ffe9357..a2f2043 100644 --- a/configure.ac +++ b/configure.ac @@ -2,13 +2,13 @@ dnl Get things going... AC_INIT(rc.h) RELDATE=`cat $srcdir/RELDATE` -AC_DEFINE_UNQUOTED(RELDATE, "$RELDATE") +AC_DEFINE_UNQUOTED(RELDATE, "$RELDATE", [Release date]) dnl Automake stuff. dnl Use this one for snapshots... -dnl AM_INIT_AUTOMAKE(rc, 1.6s`echo $RELDATE |sed 's/-//g'`) +dnl AM_INIT_AUTOMAKE(rc, 1.7s`echo $RELDATE |sed 's/-//g'`) dnl ...and this one for releases -AM_INIT_AUTOMAKE(rc, 1.7) +AM_INIT_AUTOMAKE(rc, 1.7.1) AM_CONFIG_HEADER(config.h) @@ -40,7 +40,16 @@ AC_TYPE_SIZE_T AC_TYPE_UID_T AC_CHECK_TYPE(ssize_t, long) -AC_CHECK_FUNCS(getgroups setpgrp setrlimit) +AC_CHECK_FUNCS(getgroups lstat setpgrp setrlimit sigaction) + +dnl We prefer system calls that don't restart. If we have sigaction() +dnl we'll use it. Otherwise, we check whether good ol' signal() +dnl produces interruptible system calls. +case "$ac_cv_func_sigaction" in +no) AC_SYS_RESTARTABLE_SYSCALLS ;; +esac +AM_CONDITIONAL(AMC_RESTART, test "$ac_cv_sys_restartable_syscalls" = yes) + RC_FUNC_GETGROUPS RC_FUNC_SIGSETJMP @@ -55,22 +64,12 @@ RC_TYPE_RLIM_T RC_TYPE_SIG_ATOMIC_T -dnl We prefer system calls that don't restart. If we have sigaction() -dnl and SA_INTERRUPT, we'll use 'em. Otherwise, we check whether good -dnl ol' signal() produces interruptible system calls. -RC_FUNC_SIGACTION -case "$rc_cv_sa_int" in -yes) AC_DEFINE(HAVE_SA_INTERRUPT) ;; -no) AC_SYS_RESTARTABLE_SYSCALLS ;; -esac -AM_CONDITIONAL(AMC_RESTART, test "$ac_cv_sys_restartable_syscalls" = yes) - RC_SYS_V_SIGCLD dnl Does the kernel handle `#! /interpreter'? AC_SYS_INTERPRETER case "$ac_cv_sys_interpreter" in -yes) AC_DEFINE(HASH_BANG) ;; +yes) AC_DEFINE(HASH_BANG, 1, [Define to 1 if your kernel understands `#!' magic numbers]) ;; esac AM_CONDITIONAL(AMC_NO_HASHBANG, test "$ac_cv_sys_interpreter" = no) @@ -80,27 +79,27 @@ dnl /proc/self/fd. Failing that, we'll try for POSIX mkfifo(), or a dnl mknod() that makes FIFOs. RC_SYS_DEV_FD case "$rc_cv_sys_dev_fd" in -yes) AC_DEFINE(HAVE_DEV_FD) ;; -odd) AC_DEFINE(HAVE_PROC_SELF_FD) ;; +yes) AC_DEFINE(HAVE_DEV_FD, 1, [Define to 1 if you have /dev/fd.]) ;; +odd) AC_DEFINE(HAVE_PROC_SELF_FD, 1, [Define to 1 if you have /proc/self/fd.]) ;; no) AC_CHECK_FUNCS(mkfifo) ;; esac case "$ac_cv_func_mkfifo" in -yes) AC_DEFINE(HAVE_FIFO) ;; +yes) AC_DEFINE(HAVE_FIFO, 1, [Define to 1 if you have the `mkfifo' function.]) ;; no) RC_SYS_MKNOD_FIFO ;; esac dnl Now handle arguments. AC_ARG_ENABLE(builtin-echo, [ --disable-builtin-echo Don't include \`echo' as a builtin], - test "x$enableval" != "xno" && AC_DEFINE(RC_ECHO), + test "x$enableval" != "xno" && AC_DEFINE(RC_ECHO, 1, [Define to 1 to include `echo' as a builtin.]), AC_DEFINE(RC_ECHO)) AC_ARG_ENABLE(job, [ --disable-job Don't do job-control-style backgrounding], - test "x$enableval" != "xno" && AC_DEFINE(RC_JOB), + test "x$enableval" != "xno" && AC_DEFINE(RC_JOB, 1, [Define to 1 to use job-control-style backgrounding.]), AC_DEFINE(RC_JOB)) AC_ARG_ENABLE(protect-env, [ --disable-protect-env Don't protect environment names], - test "x$enableval" != "xno" && AC_DEFINE(PROTECT_ENV), + test "x$enableval" != "xno" && AC_DEFINE(PROTECT_ENV, 1, [Define to 1 to encode exported environment names.]), AC_DEFINE(PROTECT_ENV)) AC_ARG_ENABLE(def-interp, @@ -111,7 +110,7 @@ AC_ARG_ENABLE(def-interp, no) ;; yes) - AC_DEFINE(DEFAULTINTERP, "/bin/sh") + AC_DEFINE(DEFAULTINTERP, "/bin/sh", [The default interpreter]) ;; *) AC_DEFINE_UNQUOTED(DEFAULTINTERP, "$enableval") @@ -126,7 +125,7 @@ AC_ARG_ENABLE(def-path, [ case "$enableval" in no|yes) ;; - *) AC_DEFINE_UNQUOTED(DEFAULTPATH, $enableval) ;; + *) AC_DEFINE_UNQUOTED(DEFAULTPATH, $enableval, [The default path]) ;; esac ], enable_def_path=yes) @@ -166,14 +165,14 @@ AC_ARG_WITH(addon, [ --with-addon[=foo.c] Extra builtins, from addon.c by de ]) AM_CONDITIONAL(AMC_ADDON, test "$ADDON" != "") case "$ADDON" in -?*) AC_DEFINE(RC_ADDON) ;; +?*) AC_DEFINE(RC_ADDON, 1, [Define to 1 to use addon functions.]) ;; esac AC_SUBST(ADDON) AC_ARG_WITH(editline, [ --with-editline Simmule Turner's line editing], AC_CHECK_LIB(edit, readline, - AC_DEFINE(EDITLINE) LIBS="$LIBS -ledit", + AC_DEFINE(EDITLINE, 1, [Define to 1 if you are using `editline' or `vrl'.]) LIBS="$LIBS -ledit", AC_MSG_ERROR(editline library not found))) if test "${with_vrl+set}" = set -o "${with_readline+set}" = set; then @@ -189,9 +188,9 @@ dnl There are (at least) two incompatible versions of readline, and we dnl need to know which one we are using. We don't support readline 2.0. AC_ARG_WITH(readline, [ --with-readline Bloated GNU line editing], [ AC_CHECK_LIB(readline, readline, [ - AC_DEFINE(READLINE) + AC_DEFINE(READLINE, 1, [Define to 1 if you are using GNU `readline'.]) LIBS="$LIBS -lreadline $rc_lib_tgetent" - AC_CHECK_LIB(readline, _rl_clean_up_for_exit, , AC_DEFINE(READLINE_OLD), $rc_lib_tgetent) + AC_CHECK_LIB(readline, _rl_clean_up_for_exit, , AC_DEFINE(READLINE_OLD, 1, [Define to 1 for older versions GNU `readline'.]), $rc_lib_tgetent) ], AC_MSG_ERROR(readline library not found), $rc_lib_tgetent) ]) AM_CONDITIONAL(AMC_READLINE, test "${with_readline+set}" = set) |