[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Changes to m4/configure.ac [branch-1_4]
From: |
Eric Blake |
Subject: |
Changes to m4/configure.ac [branch-1_4] |
Date: |
Sat, 27 May 2006 18:11:24 +0000 |
Index: m4/configure.ac
diff -u m4/configure.ac:1.36.2.7 m4/configure.ac:1.36.2.8
--- m4/configure.ac:1.36.2.7 Thu Oct 20 12:50:53 2005
+++ m4/configure.ac Sat May 27 18:11:23 2006
@@ -1,5 +1,6 @@
# Configure template for GNU M4. -*-Autoconf-*-
-# Copyright (C) 1991, 1993, 1994, 2004, 2005 Free Software Foundation, Inc.
+# Copyright (C) 1991, 1993, 1994, 2004, 2005, 2006 Free Software
+# Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -16,10 +17,12 @@
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
# 02110-1301 USA
-
+AC_PREREQ([2.59])
AC_INIT([GNU M4], [1.4.4a], address@hidden)
-PACKAGE=$PACKAGE_TARNAME; AC_SUBST(PACKAGE)
-VERSION=$PACKAGE_VERSION; AC_SUBST(VERSION)
+PACKAGE=$PACKAGE_TARNAME; AC_SUBST([PACKAGE])
+VERSION=$PACKAGE_VERSION; AC_SUBST([VERSION])
+
+m4_pattern_forbid([^M4_])
AC_CONFIG_SRCDIR([src/m4.h])
AC_CONFIG_HEADERS([config.h:config-h.in])
@@ -34,7 +37,6 @@
AC_AIX
AC_ISC_POSIX
AC_MINIX
-fp_C_PROTOTYPES
AC_C_CONST
AC_CHECK_HEADERS([limits.h memory.h siginfo.h string.h unistd.h])
@@ -51,14 +53,15 @@
AC_MSG_CHECKING([ecvt declaration])
AC_EGREP_HEADER([ecvt], [stdlib.h],
- [AC_MSG_RESULT(yes)
+ [AC_MSG_RESULT([yes])
AC_DEFINE([HAVE_EFGCVT], [2],
- [Define to 1 if you have ecvt(3), fcvt(3) and gcvt(3). Define to 2 if
they are declared in stdlib.h])
+ [Define to 1 if you have ecvt(3), fcvt(3) and gcvt(3). Define to 2 if
+they are declared in stdlib.h])
],
- [AC_MSG_RESULT(no); AC_CHECK_FUNCS(ecvt)])
+ [AC_MSG_RESULT([no]); AC_CHECK_FUNCS([ecvt])])
-AC_MSG_CHECKING(if stack overflow is detectable)
+AC_MSG_CHECKING([if stack overflow is detectable])
# Code from Jim Avera <address@hidden>.
# stackovf.c requires:
# 1. Either sigaction with SA_ONSTACK, or sigvec with SV_ONSTACK
@@ -67,23 +70,22 @@
use_stackovf=no
if test "$ac_cv_func_sigaction" = yes || test "$ac_cv_func_sigvec" = yes; then
if test "$ac_cv_func_sigaltstack" = yes || test "$ac_cv_func_sigstack" =
yes; then
- AC_TRY_LINK([#include <sys/time.h>
+ AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <sys/time.h>
#include <sys/resource.h>
-#include <signal.h>],
- [struct rlimit r; int i; getrlimit (RLIMIT_STACK, &r)
+#include <signal.h>]],
+ [[struct rlimit r; int i; getrlimit (RLIMIT_STACK, &r)
#if (!defined(HAVE_SIGACTION) || !defined(SA_ONSTACK)) \
&& (!defined(HAVE_SIGVEC) || !defined(SV_ONSTACK))
choke me /* SA_ONSTACK and/or SV_ONSTACK are not defined */
-#endif],
- use_stackovf=yes)
+#endif]])],[use_stackovf=yes],[])
fi
fi
-AC_MSG_RESULT($use_stackovf)
+AC_MSG_RESULT([$use_stackovf])
if test "$use_stackovf" = yes; then
AC_DEFINE([USE_STACKOVF], [1],
[Define to 1 if using stack overflow detection])
- STACKOVF=stackovf.${U}o
- AC_SUBST(STACKOVF)
+ STACKOVF=stackovf.$(OBJEXT)
+ AC_SUBST([STACKOVF])
AC_EGREP_HEADER([rlim_t], [sys/resource.h], [],
[AC_DEFINE([rlim_t], [int],
[Define to int if rlim_t is not defined in sys/resource.h])
@@ -100,16 +102,17 @@
AC_MSG_CHECKING([[if changeword is wanted]])
AC_ARG_ENABLE([changeword],
- [[ --enable-changeword enable -W and changeword() builtin]],
+ [AS_HELP_STRING([--enable-changeword],
+ [enable -W and changeword() builtin])],
[if test "$enableval" = yes; then
- AC_MSG_RESULT(yes)
+ AC_MSG_RESULT([yes])
AC_DEFINE([ENABLE_CHANGEWORD], [1],
[Define to 1 if the changeword(REGEXP) functionality is wanted])
else
- AC_MSG_RESULT(no)
- fi], [AC_MSG_RESULT(no)])
+ AC_MSG_RESULT([no])
+ fi], [AC_MSG_RESULT([no])])
-fp_WITH_DMALLOC
+M4_WITH_DMALLOC
AC_CONFIG_FILES([stamp-h], [[test -z "$CONFIG_HEADERS" || date > stamp-h]])
- Changes to m4/configure.ac [branch-1_4],
Eric Blake <=