commit 85590ce3487c3e5a6edb1a1f4f82a67ea62712e1
parent 3350079a799e9b685d829c720f2b875b27d1ff47
Author: tjg <tjg>
Date: Wed, 27 Nov 2002 12:40:33 +0000
Configuration: upgrade to autoconf-2.56 and automake-1.7.1.
Diffstat:
3 files changed, 27 insertions(+), 27 deletions(-)
diff --git a/Makefile.am b/Makefile.am
@@ -1,9 +1,5 @@
## Process this file with automake to produce Makefile.in
-if AMC_ADDON
-ADDON = @ADDON@
-endif
-
if AMC_HISTORY
man_MANS = rc.1 history.1
HISTORY = history
@@ -44,6 +40,10 @@ EXTRA_DIST = EXAMPLES RELDATE addon.c addon.h history.1 parse.y rc.1 trip.rc
sigmsgs.c sigmsgs.h: mksignal
./mksignal
+# Newer automake's buildtime dependency tracking can't seem to figure
+# this one out.
+status.c: statval.h
+
statval.h: mkstatval
./mkstatval > statval.h
diff --git a/acinclude.m4 b/acinclude.m4
@@ -9,7 +9,7 @@ int main(void) {
}
], rc_cv_func_posix_getgroups=yes, rc_cv_func_posix_getgroups=no, rc_cv_func_posix_getgroups=yes))
case "$rc_cv_func_posix_getgroups" in
- yes) AC_DEFINE(HAVE_POSIX_GETGROUPS) ;;
+ yes) AC_DEFINE(HAVE_POSIX_GETGROUPS, 1, [Has POSIX getgroups()]) ;;
esac
])
@@ -25,7 +25,7 @@ sigjmp_buf e;
sigsetjmp(e, 1);
], rc_cv_sigsetjmp=yes, rc_cv_sigsetjmp=no))
case "$rc_cv_sigsetjmp" in
- yes) AC_DEFINE(HAVE_SIGSETJMP) ;;
+ yes) AC_DEFINE(HAVE_SIGSETJMP, 1, [Define to 1 if you have the `sigsetjmp' function or macro.]) ;;
esac
])
@@ -38,7 +38,7 @@ AC_DEFUN(RC_FUNC_STRERROR, [
strerror(0);
], rc_cv_strerror=yes, rc_cv_strerror=no))
case "$rc_cv_strerror" in
- yes) AC_DEFINE(HAVE_STRERROR) ;;
+ yes) AC_DEFINE(HAVE_STRERROR, 1, [Define to 1 if you have the `strerror' function or macro.]) ;;
esac
])
@@ -61,7 +61,7 @@ int f;
f = RLIMIT_DATA;
], rc_cv_kernel_rlimit=yes, rc_cv_kernel_rlimit=no)]))
case "$rc_cv_kernel_rlimit" in
- yes) AC_DEFINE(RLIMIT_NEEDS_KERNEL) ;;
+ yes) AC_DEFINE(RLIMIT_NEEDS_KERNEL, 1, [Needs _KERNEL for RLIMIT]) ;;
esac
])
@@ -77,7 +77,7 @@ AC_DEFUN(RC_TYPE_RLIM_T, [
], rc_cv_have_rlim_t=yes, rc_cv_have_rlim_t=no))
case "$rc_cv_have_rlim_t" in
- yes) AC_DEFINE(HAVE_RLIM_T) ;;
+ yes) AC_DEFINE(HAVE_RLIM_T, 1, [Has rlim_t]) ;;
no) AC_CACHE_CHECK(for native quad_t, rc_cv_have_quad_t,
AC_TRY_COMPILE([
#include <sys/types.h>
@@ -88,7 +88,7 @@ a = (quad_t)0;
], rc_cv_have_quad_t=yes, rc_cv_have_quad_t=no))
case "$rc_cv_have_quad_t" in
- yes) AC_DEFINE(HAVE_QUAD_T)
+ yes) AC_DEFINE(HAVE_QUAD_T, 1, [Has quad_t])
AC_CACHE_CHECK(if rlimit values are quad_t, rc_cv_rlim_t_is_quad_t,
AC_TRY_RUN([
#include <sys/types.h>
@@ -108,7 +108,7 @@ main(){
], rc_cv_rlim_t_is_quad_t=yes, rc_cv_rlim_t_is_quad_t=no, $ac_cv_type_quad_t))
case "$rc_cv_rlim_t_is_quad_t" in
- yes) AC_DEFINE(RLIM_T_IS_QUAD_T) ;;
+ yes) AC_DEFINE(RLIM_T_IS_QUAD_T, 1, [rlim_t is quad_t]) ;;
esac
;;
esac
@@ -123,7 +123,7 @@ AC_DEFUN(RC_TYPE_SIG_ATOMIC_T, [
AC_EGREP_HEADER(sig_atomic_t, signal.h,
rc_cv_sig_atomic_t=yes, rc_cv_sig_atomic_t=no))
case "$rc_cv_sig_atomic_t" in
- no) AC_DEFINE(sig_atomic_t, int) ;;
+ no) AC_DEFINE(sig_atomic_t, int, [Has sig_atomic_t]) ;;
esac
])
@@ -159,7 +159,7 @@ int main(void) {
}
], rc_cv_sysv_sigcld=yes, rc_cv_sysv_sigcld=no, rc_cv_sysv_sigcld=yes))
case "$rc_cv_sysv_sigcld" in
- yes) AC_DEFINE(HAVE_SYSV_SIGCLD) ;;
+ yes) AC_DEFINE(HAVE_SYSV_SIGCLD, 1, [Has SysV SIGCLD]) ;;
esac
])
diff --git a/configure.ac b/configure.ac
@@ -2,7 +2,7 @@ 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...
@@ -69,7 +69,7 @@ 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)
@@ -79,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, [Has /dev/fd]) ;;
+odd) AC_DEFINE(HAVE_PROC_SELF_FD, 1, [Has /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, [Has mkfifo()]) ;;
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, [Builtin echo]),
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, [Pretend job control]),
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, [Protect environment]),
AC_DEFINE(PROTECT_ENV))
AC_ARG_ENABLE(def-interp,
@@ -110,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")
@@ -125,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)
@@ -165,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, [Use addon]) ;;
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, [editline]) LIBS="$LIBS -ledit",
AC_MSG_ERROR(editline library not found)))
if test "${with_vrl+set}" = set -o "${with_readline+set}" = set; then
@@ -188,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, [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, [Old readline]), $rc_lib_tgetent)
], AC_MSG_ERROR(readline library not found), $rc_lib_tgetent)
])
AM_CONDITIONAL(AMC_READLINE, test "${with_readline+set}" = set)
