FYI: configy things

[Akim Demaille]

The list for patches does not exist yet.

Index: ChangeLog
from  Akim Demaille  <address@hidden>

        * config/Makefile.am, config/stackovf.m4: New.
        * configure.in, Makefile.am: Adjust.

Index: Makefile.am
===================================================================
RCS file: /cvs/m4/Makefile.am,v
retrieving revision 1.4
diff -u -u -r1.4 Makefile.am
--- Makefile.am 2000/11/29 00:18:03 1.4
+++ Makefile.am 2001/08/07 10:01:36
@@ -1,17 +1,17 @@
 ## Makefile.am -- Process this file with automake to produce Makefile.in
 ##
 ## Copyright 2000 Free Software Foundation
-## 
+##
 ## 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
 ## the Free Software Foundation; either version 2 of the License, or
 ## (at your option) any later version.
-## 
+##
 ## This program is distributed in the hope that it will be useful,
 ## but WITHOUT ANY WARRANTY; without even the implied warranty of
 ## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 ## GNU General Public License for more details.
-## 
+##
 ## You should have received a copy of the GNU General Public License
 ## along with this program; see the file COPYING.  If not, write to
 ## the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
@@ -25,18 +25,12 @@
 
 auxdir         = $(top_srcdir)/$(ac_aux_dir)
 
-AUX_DIST       = $(auxdir)/config.guess $(auxdir)/config.sub \
-                 $(auxdir)/install-sh $(auxdir)/ltmain.sh \
-                 $(auxdir)/missing $(auxdir)/mkinstalldirs
-AUX_DIST_EXTRA = $(auxdir)/error.m4 $(auxdir)/gmp.m4 $(auxdir)/regex.m4
-
 ACLOCAL_AMFLAGS        = -I $(auxdir)
 
-SUBDIRS                        = intl po m4 modules src tests examples doc .
+SUBDIRS                        = intl po config m4 modules src tests examples 
doc .
 MAINTAINERCLEANFILES   = ABOUT-NLS COPYING INSTALL Makefile.in aclocal.m4 \
                          config-h.in configure ltmain.sh stamp-h.in \
-                         po/cat-id-tbl.c po/m4.pot po/stamp-cat-id \
-                         $(AUX_DIST)
+                         po/cat-id-tbl.c po/m4.pot po/stamp-cat-id
 
 
 ##                                                                      ##
@@ -57,7 +51,7 @@
 # checks fail.  Also, make sure the NEWS file is up-to-date.
 cvs-dist: distcheck # maintainer-check
        @if sed '1,2d;3q' $(srcdir)/NEWS | grep -e $(VERSION)" > dev/null; \
-         echo "NEWS not updatedl not releasing" 1>&2; \
+         echo "NEWS not updated not releasing" 1>&2; \
          exit 1;
        fi
        cd $(srcdir) && \
Index: configure.in
===================================================================
RCS file: /cvs/m4/configure.in,v
retrieving revision 1.7
diff -u -u -r1.7 configure.in
--- configure.in 2000/11/29 00:18:03 1.7
+++ configure.in 2001/08/07 10:01:36
@@ -1,16 +1,16 @@
 # Configure template for GNU m4.
-# Copyright 1991-1994, 2000 Free Software Foundation, Inc.
-#  
+# Copyright 1991, 1992, 1993, 1994, 2000, 2001 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
-# the Free Software Foundation; either version 2 of the License, or 
+# the Free Software Foundation; either version 2 of the License, or
 # (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
-# 
+#
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
@@ -54,9 +54,8 @@
 
 AC_LIB_LTDL
 
-AC_CHECK_HEADERS(limits.h locale.h memory.h siginfo.h string.h unistd.h 
errno.h)
+AC_CHECK_HEADERS(limits.h locale.h memory.h string.h unistd.h errno.h)
 AC_HEADER_STDC
-AC_TYPE_SIGNAL
 AC_TYPE_SIZE_T
 
 LIBM4_DLL_IMPORT=
@@ -69,7 +68,7 @@
 esac
 AC_SUBST(LIBM4_DLL_IMPORT)
 
-AC_CHECK_FUNCS(bzero calloc mkstemp mktemp sigaction sigaltstack sigstack 
sigvec strerror tmpfile)
+AC_CHECK_FUNCS(bzero calloc mkstemp mktemp strerror tmpfile)
 
 AC_FUNC_ALLOCA
 AC_FUNC_VPRINTF
@@ -78,7 +77,7 @@
 M4OBJS=
 m4_getopt=src/getopt.h
 rm -f $m4_getopt
-AC_CHECK_FUNC(getopt_long, [], 
+AC_CHECK_FUNC(getopt_long, [],
 [M4OBJS="getopt1.$ac_objext getopt.$ac_objext"
 echo linking src/gnu-getopt.h to $m4_getopt
 $LN_S ./gnu-getopt.h $m4_getopt])
@@ -118,49 +117,7 @@
    these are declared in <stdlib.h>.])],
   [AC_MSG_RESULT(no); AC_CHECK_FUNCS(ecvt)])
 
-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
-#  2. Either sigaltstack or sigstack
-#  3. getrlimit, including support for RLIMIT_STACK
-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>
-#include <sys/resource.h>
-#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)
-  fi
-fi
-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)
-  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>.]))
-  AC_EGREP_HEADER(stack_t, signal.h, ,
-       AC_DEFINE(stack_t, struct sigaltstack,
-       [Define to struct sigaltstack if stack_t is not defined in 
<sys/signal.h>.]))
-  AC_EGREP_HEADER(sigcontext, signal.h, 
-       AC_DEFINE(HAVE_SIGCONTEXT, 1,
-       [Define to 1 if <signal.h> declares sigcontext.]))
-  AC_EGREP_HEADER(siginfo_t, signal.h,
-                 AC_DEFINE(HAVE_SIGINFO_T, 1,
-       [Define to 1 if <signal.h> declares siginfo_t.]))
-
-  AC_TRY_COMPILE([#include <signal.h>],
-           [struct sigaltstack x; x.ss_base = 0;],
-           AC_DEFINE(ss_sp, ss_base,
-           [Define to ss_base if stack_t has ss_base instead of ss_sp.]))
-fi
+M4_AC_SYS_STACKOVF
 
 AC_MSG_CHECKING(if changeword is wanted)
 AC_ARG_ENABLE(changeword,
@@ -222,6 +179,7 @@
 
 AC_OUTPUT(
 Makefile
+config/Makefile
 intl/Makefile
 po/Makefile.in
 doc/Makefile
Index: config/Makefile.am
===================================================================
RCS file: Makefile.am
diff -N Makefile.am
--- /dev/null   Sat Apr 14 17:46:23 2001
+++ config/Makefile.am Tue Aug 7 03:01:36 2001
@@ -0,0 +1,25 @@
+## Makefile.am -- Process this file with automake to produce Makefile.in
+##
+## Copyright 2001 Free Software Foundation
+##
+## 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
+## the Free Software Foundation; either version 2 of the License, or
+## (at your option) any later version.
+##
+## This program is distributed in the hope that it will be useful,
+## but WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+## GNU General Public License for more details.
+##
+## You should have received a copy of the GNU General Public License
+## along with this program; see the file COPYING.  If not, write to
+## the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+## Boston, MA 02111-1307, USA.
+##
+## Written by Akim Demaille <address@hidden>
+
+EXTRA_DIST =                                   \
+debug.m4                                       \
+gmp.m4                                         \
+stackovf.m4
Index: config/debug.m4
===================================================================
RCS file: /cvs/m4/config/debug.m4,v
retrieving revision 1.1
diff -u -u -r1.1 debug.m4
--- config/debug.m4 2000/11/24 23:24:33 1.1
+++ config/debug.m4 2001/08/07 10:01:36
@@ -1,35 +1,38 @@
+##                                                           -*- Autoconf -*-
 ## debug.m4 -- massage compiler flags for debugging/optimisation
 ##
 ## Copyright 1999-2000 Ralf S. Engelschall
 ## Written by <address@hidden>
 ## Modified for M4 by Gary V. Vaughan <address@hidden>
-## 
+##
 ## 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
 ## the Free Software Foundation; either version 2 of the License, or
 ## (at your option) any later version.
-## 
+##
 ## This program is distributed in the hope that it will be useful,
 ## but WITHOUT ANY WARRANTY; without even the implied warranty of
 ## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 ## GNU General Public License for more details.
-## 
+##
 ## You should have received a copy of the GNU General Public License
 ## along with this program; see the file COPYING.  If not, write to
 ## the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 ## Boston, MA 02111-1307, USA.
 
-# serial 2
+# serial 3
 
 # M4_AC_COMPILER_OPTION(NAME, DISPLAY, OPTION, ACTION-SUCCESS, ACTION-FAILURE)
-# -----------------------------------------------------------------------------
-# Check whether compiler option works
-AC_DEFUN(M4_AC_COMPILER_OPTION,[dnl
-AC_MSG_CHECKING(whether compiler option(s) $2 work)
+# ----------------------------------------------------------------------------
+# Check whether compiler option works.
+AC_DEFUN([M4_AC_COMPILER_OPTION],
+[AC_MSG_CHECKING(whether compiler option(s) $2 work)
 AC_CACHE_VAL(ac_cv_compiler_option_$1,[
 SAVE_CFLAGS="$CFLAGS"
 CFLAGS="$CFLAGS $3"
-AC_TRY_COMPILE([],[], ac_cv_compiler_option_$1=yes, 
ac_cv_compiler_option_$1=no)
+AC_TRY_COMPILE([],[],
+               [ac_cv_compiler_option_$1=yes],
+               [ac_cv_compiler_option_$1=no])
 CFLAGS="$SAVE_CFLAGS"
 ])dnl
 if test ".$ac_cv_compiler_option_$1" = .yes; then
@@ -40,10 +43,11 @@
 AC_MSG_RESULT([$ac_cv_compiler_option_$1])
 ])# M4_AC_COMPILER_OPTION
 
+
 # M4_AC_CHECK_DEBUGGING
-# ----------------------
+# ---------------------
 # Debugging Support
-AC_DEFUN(M4_AC_CHECK_DEBUGGING,
+AC_DEFUN([M4_AC_CHECK_DEBUGGING],
 [AC_REQUIRE([AC_PROG_CC])dnl
 AC_ARG_ENABLE(debug,
 [  --enable-debug          build for debugging [default=no]],
@@ -96,4 +100,4 @@
 if test ".$msg" = .enabled; then
     enable_shared=no
 fi
-])
+])# M4_AC_CHECK_DEBUGGING
Index: config/gmp.m4
===================================================================
RCS file: /cvs/m4/config/gmp.m4,v
retrieving revision 1.1
diff -u -u -r1.1 gmp.m4
--- config/gmp.m4 2000/11/24 23:24:33 1.1
+++ config/gmp.m4 2001/08/07 10:01:36
@@ -1,24 +1,24 @@
-#!/bin/sh
-# Copyright 2000 Free Software Foundation, Inc.
-#  
+# -*- Autoconf -*-
+# Copyright 2000, 2001 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
-# the Free Software Foundation; either version 2 of the License, or 
+# the Free Software Foundation; either version 2 of the License, or
 # (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
-# 
+#
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
 # 02111-1307  USA
 
-# serial 2
+# serial 3
 
-AC_DEFUN(AM_WITH_GMP,
+AC_DEFUN([AM_WITH_GMP],
   [AC_MSG_CHECKING(if extended and fractional arithmetic is wanted)
   AC_ARG_WITH(gmp,
   [  --with-gmp              use gmp for extended and fractional arithmetic],
Index: config/stackovf.m4
===================================================================
RCS file: stackovf.m4
diff -N stackovf.m4
--- /dev/null   Sat Apr 14 17:46:23 2001
+++ config/stackovf.m4 Tue Aug 7 03:01:36 2001
@@ -0,0 +1,54 @@
+# -*- Autoconf -*-
+#serial 1
+
+# M4_AC_SYS_STACKOVF
+# ------------------
+AC_DEFUN([M4_AC_SYS_STACKOVF],
+[AC_REQUIRE([AC_TYPE_SIGNAL])dnl
+AC_CHECK_HEADERS(siginfo.h)
+AC_CHECK_FUNCS(sigaction sigaltstack sigstack sigvec)
+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
+#  2. Either sigaltstack or sigstack
+#  3. getrlimit, including support for RLIMIT_STACK
+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>
+#include <sys/resource.h>
+#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)
+  fi
+fi
+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)
+  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>.]))
+  AC_EGREP_HEADER(stack_t, signal.h, ,
+       AC_DEFINE(stack_t, struct sigaltstack,
+       [Define to struct sigaltstack if stack_t is not defined in 
<sys/signal.h>.]))
+  AC_EGREP_HEADER(sigcontext, signal.h,
+       AC_DEFINE(HAVE_SIGCONTEXT, 1,
+       [Define to 1 if <signal.h> declares sigcontext.]))
+  AC_EGREP_HEADER(siginfo_t, signal.h,
+                 AC_DEFINE(HAVE_SIGINFO_T, 1,
+       [Define to 1 if <signal.h> declares siginfo_t.]))
+
+  AC_TRY_COMPILE([#include <signal.h>],
+           [struct sigaltstack x; x.ss_base = 0;],
+           AC_DEFINE(ss_sp, ss_base,
+           [Define to ss_base if stack_t has ss_base instead of ss_sp.]))
+fi
+])# M4_AC_SYS_STACKOVF