summaryrefslogtreecommitdiff
path: root/aclocal.m4
diff options
context:
space:
mode:
authorGary Houston <ghouston@arglist.com>1997-12-07 07:02:17 +0000
committerGary Houston <ghouston@arglist.com>1997-12-07 07:02:17 +0000
commit341eaef04b87c0c1d60dd26a22dff7ad4f67784b (patch)
treed6bac89d4de484e34cee820e56e3187ab3625f50 /aclocal.m4
parent8122b543c1af9c7459cf80e6d052cddcd7e0576f (diff)
downloadguile-341eaef04b87c0c1d60dd26a22dff7ad4f67784b.tar.gz
* README: using Automake 1.2d
* configure.in: AC_CHECK_FUNCS: add "system". * simpos.c (scm_system): always define: use sysmissing if not available. Check for HAVE_SYSTEM instead of _Windows (does Windows lack system or does it have an unusable one?). Check for error conditions -1 and 127. Use SCM_DEFER_INTS. Let the argument be optional: if not supplied, call system(NULL). * ports.c (scm_close_port): relax the type check from OPPORTP to PORTP; closing a closed port is allowed.
Diffstat (limited to 'aclocal.m4')
-rw-r--r--aclocal.m419
1 files changed, 15 insertions, 4 deletions
diff --git a/aclocal.m4 b/aclocal.m4
index ccfa9eab6..7870f9c52 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,4 +1,4 @@
-dnl aclocal.m4 generated automatically by aclocal 1.2c
+dnl aclocal.m4 generated automatically by aclocal 1.2d
dnl Copyright (C) 1994, 1995, 1996, 1997 Free Software Foundation, Inc.
dnl This Makefile.in is free software; the Free Software Foundation
@@ -176,8 +176,8 @@ fi
ifelse([$3],,
AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE")
AC_DEFINE_UNQUOTED(VERSION, "$VERSION"))
-AM_SANITY_CHECK
-AC_ARG_PROGRAM
+AC_REQUIRE([AM_SANITY_CHECK])
+AC_REQUIRE([AC_ARG_PROGRAM])
dnl FIXME This is truly gross.
missing_dir=`cd $ac_aux_dir && pwd`
AM_MISSING_PROG(ACLOCAL, aclocal, $missing_dir)
@@ -185,7 +185,7 @@ AM_MISSING_PROG(AUTOCONF, autoconf, $missing_dir)
AM_MISSING_PROG(AUTOMAKE, automake, $missing_dir)
AM_MISSING_PROG(AUTOHEADER, autoheader, $missing_dir)
AM_MISSING_PROG(MAKEINFO, makeinfo, $missing_dir)
-AC_PROG_MAKE_SET])
+AC_REQUIRE([AC_PROG_MAKE_SET])])
# serial 1
@@ -216,6 +216,17 @@ if (
# -L didn't work.
set X `ls -t $srcdir/configure conftestfile`
fi
+ if test "[$]*" != "X $srcdir/configure conftestfile" \
+ && test "[$]*" != "X conftestfile $srcdir/configure"; then
+
+ # If neither matched, then we have a broken ls. This can happen
+ # if, for instance, CONFIG_SHELL is bash and it inherits a
+ # broken ls alias from the environment. This has actually
+ # happened. Such a system could not be considered "sane".
+ AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken
+alias in your environment])
+ fi
+
test "[$]2" = conftestfile
)
then