[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
10-fyi-rm-autoconf-macros.patch
|
From: |
Akim Demaille |
|
Subject: |
10-fyi-rm-autoconf-macros.patch |
|
Date: |
Sun, 21 Oct 2001 20:03:53 +0200 |
Index: ChangeLog
from Akim Demaille <address@hidden>
* m4/error.m4, m4/obstack.m4, m4/ptrdiff.m4, m4/strtod.m4:
Remove, since Autoconf 2.52 has them.
* automake.in, aclocal.in, automake.texi: Adjust.
Index: NEWS
--- NEWS Sun, 23 Sep 2001 09:10:19 +0200 akim
+++ NEWS Sat, 20 Oct 2001 10:21:28 +0200 akim
@@ -2,6 +2,11 @@
* Autoconf 2.52 is required.
* `dist' generates all the archive flavors, as did `dist-all'.
* `dist-gzip' generates the Gzip tar file only.
+* Combining Automake Makefile conditionals no longer lead to a combinatorial
+ explosion. Makefile.in's keep a reasonable size.
+* AM_FUNC_ERROR_AT_LINE, AM_FUNC_STRTOD, AM_FUNC_OBSTACK, AM_PTRDIFF_T
+ are no longer shipped, since Autoconf 2.52 provides them (both as AM_
+ and AC_).
New in 1.5:
* Support for `configure.ac'.
Index: aclocal.in
--- aclocal.in Sat, 13 Oct 2001 20:31:52 +0200 akim
+++ aclocal.in Sat, 20 Oct 2001 10:13:51 +0200 akim
@@ -93,12 +93,11 @@
'fp_WITH_REGEX' => "use `AM_WITH_REGEX'",
'gm_PROG_LIBTOOL' => "use `AM_PROG_LIBTOOL'",
'jm_MAINTAINER_MODE' => "use `AM_MAINTAINER_MODE'",
- 'md_TYPE_PTRDIFF_T' => "use `AM_TYPE_PTRDIFF_T'",
+ 'md_TYPE_PTRDIFF_T' => "add `ptrdiff_t' to `AC_CHECK_TYPES(...)'",
'ud_PATH_LISPDIR' => "use `AM_PATH_LISPDIR'",
'ud_GNU_GETTEXT' => "use `AM_GNU_GETTEXT'",
# Now part of autoconf proper, under a different name.
- 'AM_FUNC_FNMATCH' => "use `AC_FUNC_FNMATCH'",
'fp_FUNC_FNMATCH' => "use `AC_FUNC_FNMATCH'",
'AM_SANITY_CHECK_CC' => "automatically done by `AC_PROG_CC'",
'AM_PROG_INSTALL' => "use `AC_PROG_INSTALL'",
@@ -106,9 +105,6 @@
'AM_CYGWIN32' => "use `AC_CYGWIN'",
'AM_MINGW32' => "use `AC_MINGW32'",
'AM_FUNC_MKTIME' => "use `AC_FUNC_MKTIME'",
-
-# These aren't quite obsolete.
-# 'md_PATH_PROG',
);
# Regexp to match the above macros.
Index: automake.in
--- automake.in Sun, 14 Oct 2001 15:01:29 +0200 akim
+++ automake.in Sat, 20 Oct 2001 10:13:49 +0200 akim
@@ -284,12 +284,11 @@ sub target_hook ($$$$)
'fp_WITH_REGEX' => "use `AM_WITH_REGEX'",
'gm_PROG_LIBTOOL' => "use `AM_PROG_LIBTOOL'",
'jm_MAINTAINER_MODE' => "use `AM_MAINTAINER_MODE'",
- 'md_TYPE_PTRDIFF_T' => "use `AM_TYPE_PTRDIFF_T'",
+ 'md_TYPE_PTRDIFF_T' => "add `ptrdiff_t' to `AC_CHECK_TYPES(...)'",
'ud_PATH_LISPDIR' => "use `AM_PATH_LISPDIR'",
'ud_GNU_GETTEXT' => "use `AM_GNU_GETTEXT'",
# Now part of autoconf proper, under a different name.
- 'AM_FUNC_FNMATCH' => "use `AC_FUNC_FNMATCH'",
'fp_FUNC_FNMATCH' => "use `AC_FUNC_FNMATCH'",
'AM_SANITY_CHECK_CC' => "automatically done by `AC_PROG_CC'",
'AM_PROG_INSTALL' => "use `AC_PROG_INSTALL'",
@@ -297,9 +296,6 @@ sub target_hook ($$$$)
'AM_CYGWIN32' => "use `AC_CYGWIN'",
'AM_MINGW32' => "use `AC_MINGW32'",
'AM_FUNC_MKTIME' => "use `AC_FUNC_MKTIME'",
-
-# These aren't quite obsolete.
-# 'md_PATH_PROG',
);
# Regexp to match the above macros.
@@ -4555,7 +4551,7 @@ sub scan_one_autoconf_file
$libsources{'getopt.c'} = 1;
$libsources{'getopt1.c'} = 1;
}
- elsif (/AM_FUNC_STRTOD/)
+ elsif (/A[CM]_FUNC_STRTOD/)
{
$libsources{'strtod.c'} = 1;
}
@@ -4570,12 +4566,12 @@ sub scan_one_autoconf_file
{
$libsources{'mktime.c'} = 1;
}
- elsif (/AM_FUNC_ERROR_AT_LINE/)
+ elsif (/A[CM]_FUNC_ERROR_AT_LINE/)
{
$libsources{'error.c'} = 1;
$libsources{'error.h'} = 1;
}
- elsif (/AM_FUNC_OBSTACK/)
+ elsif (/A[CM]_FUNC_OBSTACK/)
{
$libsources{'obstack.c'} = 1;
$libsources{'obstack.h'} = 1;
Index: automake.texi
--- automake.texi Fri, 28 Sep 2001 09:30:37 +0200 akim
+++ automake.texi Sat, 20 Oct 2001 10:22:31 +0200 akim
@@ -20,7 +20,8 @@
@ifinfo
This file documents GNU automake @value{VERSION}
-Copyright 1995, 1996, 1997, 1998, 1999, 2000 Free Software Foundation, Inc.
+Copyright 1995, 1996, 1997, 1998, 1999, 2000, 2001
+Free Software Foundation, Inc.
Permission is granted to make and distribute verbatim copies of
this manual provided the copyright notice and this permission notice
@@ -1128,15 +1129,17 @@ FIXME: give complete list of things look
@vindex build_alias
@vindex target_alias
address@hidden AC_FUNC_ALLOCA
address@hidden AC_FUNC_ALLOCA
address@hidden AC_FUNC_ERROR_AT_LINE
address@hidden AC_FUNC_FNMATCH
@itemx AC_FUNC_GETLOADAVG
@itemx AC_FUNC_MEMCMP
address@hidden AC_STRUCT_ST_BLOCKS
address@hidden AC_FUNC_FNMATCH
@itemx AC_FUNC_MKTIME
address@hidden AM_FUNC_STRTOD
address@hidden AC_FUNC_OBSTACK
address@hidden AC_FUNC_STRTOD
@itemx AC_REPLACE_FUNCS
@itemx AC_REPLACE_GNU_GETOPT
address@hidden AC_STRUCT_ST_BLOCKS
@itemx AM_WITH_REGEX
Automake will ensure that the appropriate dependencies are generated for
the objects corresponding to these macros. Also, Automake will verify
@@ -1146,16 +1149,17 @@ FIXME: give complete list of things look
@xref{A Library}, for more information. Also, see @ref{Particular
Functions, , Particular Function Checks, autoconf, The Autoconf Manual}.
@cvindex AC_FUNC_ALLOCA
address@hidden AC_FUNC_ERROR_AT_LINE
address@hidden AC_FUNC_FNMATCH
@cvindex AC_FUNC_GETLOADAVG
@cvindex AC_FUNC_MEMCMP
address@hidden AC_STRUCT_ST_BLOCKS
address@hidden AC_FUNC_FNMATCH
address@hidden AC_FUNC_FNMATCH
address@hidden AC_FUNC_MKTIME
address@hidden AC_FUNC_OBSTACK
address@hidden AC_FUNC_STRTOD
@cvindex AC_REPLACE_FUNCS
@cvindex AC_REPLACE_GNU_GETOPT
address@hidden AM_FUNC_STRTOD
address@hidden AC_STRUCT_ST_BLOCKS
@cvindex AM_WITH_REGEX
address@hidden AC_FUNC_MKTIME
@item LIBOBJS
Automake will detect statements which put @file{.o} files into
@@ -1353,22 +1357,6 @@ @node Macros, Extending aclocal, Invokin
tracking scheme. They are called automatically by automake when
required, and there should be no need to invoke them manually.
address@hidden AM_FUNC_STRTOD
-If the @code{strtod} function is not available, or does not work
-correctly (like the one on SunOS 5.4), add @file{strtod.o} to output
-variable @code{LIBOBJS}.
address@hidden AM_FUNC_STRTOD
-
address@hidden AM_FUNC_ERROR_AT_LINE
-If the function @code{error_at_line} is not found, then add
address@hidden to @code{LIBOBJS}.
address@hidden AM_FUNC_ERROR_AT_LINE
-
address@hidden AM_FUNC_OBSTACK
-Check for the GNU obstacks code; if not found, add @file{obstack.o} to
address@hidden
address@hidden AM_FUNC_OBSTACK
-
@item AM_C_PROTOTYPES
Check to see if function prototypes are understood by the compiler. If
so, define @samp{PROTOTYPES} and set the output variables @samp{U} and
@@ -1462,12 +1450,6 @@ @node Macros, Extending aclocal, Invokin
Check to see if POSIX termios headers and functions are available on the
system. If so, set the shell variable @code{am_cv_sys_posix_termios} to
@samp{yes}. If not, set the variable to @samp{no}.
-
address@hidden AM_TYPE_PTRDIFF_T
address@hidden HAVE_PTRDIFF_T
address@hidden ptrdiff_t
-Define @samp{HAVE_PTRDIFF_T} if the type @samp{ptrdiff_t} is defined in
address@hidden<stddef.h>}.
@item AM_WITH_DMALLOC
@cvindex WITH_DMALLOC
Index: m4/Makefile.am
--- m4/Makefile.am Sun, 23 Sep 2001 08:36:36 +0200 akim
+++ m4/Makefile.am Sat, 20 Oct 2001 10:05:37 +0200 akim
@@ -20,10 +20,11 @@
## 02111-1307, USA.
m4datadir = $(datadir)/aclocal
+
m4data_DATA = as.m4 auxdir.m4 ccstdc.m4 cond.m4 depend.m4 depout.m4 \
-dmalloc.m4 error.m4 gcj.m4 header.m4 init.m4 install-sh.m4 lex.m4 \
+dmalloc.m4 gcj.m4 header.m4 init.m4 install-sh.m4 lex.m4 \
lispdir.m4 make.m4 maintainer.m4 minuso.m4 missing.m4 multi.m4 \
-obstack.m4 protos.m4 ptrdiff.m4 python.m4 regex.m4 sanity.m4 strip.m4 \
-strtod.m4 termios.m4 winsz.m4
+obstack.m4 protos.m4 python.m4 regex.m4 sanity.m4 strip.m4 \
+termios.m4 winsz.m4
EXTRA_DIST = $(m4data_DATA)
Index: m4/error.m4
--- m4/error.m4 Sun, 23 Sep 2001 08:36:36 +0200 akim
+++ m4/error.m4 Sat, 20 Oct 2001 10:24:09 +0200 akim
@@ -1,30 +0,0 @@
-# From Jim Meyering. Use this if you use the GNU error.[ch].
-# FIXME: Migrate into libit
-
-# Copyright 1996, 1999, 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, 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.
-
-AC_DEFUN([AM_FUNC_ERROR_AT_LINE],
-[AC_CACHE_CHECK([for error_at_line], am_cv_lib_error_at_line,
- [AC_TRY_LINK([],[error_at_line(0, 0, "", 0, "");],
- am_cv_lib_error_at_line=yes,
- am_cv_lib_error_at_line=no)])
- if test $am_cv_lib_error_at_line = no; then
- LIBOBJS="$LIBOBJS error.$ac_objext"
- fi
- AC_SUBST(LIBOBJS)dnl
-])
Index: m4/obstack.m4
--- m4/obstack.m4 Sun, 23 Sep 2001 08:36:36 +0200 akim
+++ m4/obstack.m4 Sat, 20 Oct 2001 10:24:09 +0200 akim
@@ -1,32 +0,0 @@
-# From Jim Meyering.
-# FIXME: migrate into libit.
-
-# Copyright 1996, 1998, 1999, 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, 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.
-
-AC_DEFUN([AM_FUNC_OBSTACK],
-[AC_CACHE_CHECK([for obstacks], am_cv_func_obstack,
- [AC_TRY_LINK([#include "obstack.h"],
- [struct obstack *mem;obstack_free(mem,(char *) 0)],
- am_cv_func_obstack=yes,
- am_cv_func_obstack=no)])
- if test $am_cv_func_obstack = yes; then
- AC_DEFINE(HAVE_OBSTACK,1,[Define if libc includes obstacks])
- else
- LIBOBJS="$LIBOBJS obstack.$ac_objext"
- fi
-])
Index: m4/ptrdiff.m4
--- m4/ptrdiff.m4 Sun, 23 Sep 2001 08:36:36 +0200 akim
+++ m4/ptrdiff.m4 Sat, 20 Oct 2001 10:24:09 +0200 akim
@@ -1,31 +0,0 @@
-# AM_TYPE_PTRDIFF_T
-
-# Copyright 1996, 1998, 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, 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.
-
-# From Ulrich Drepper.
-
-# serial 1
-
-AC_DEFUN([AM_TYPE_PTRDIFF_T],
- [AC_CACHE_CHECK([for ptrdiff_t], am_cv_type_ptrdiff_t,
- [AC_TRY_COMPILE([#include <stddef.h>], [ptrdiff_t p],
- am_cv_type_ptrdiff_t=yes, am_cv_type_ptrdiff_t=no)])
- if test $am_cv_type_ptrdiff_t = yes; then
- AC_DEFINE(HAVE_PTRDIFF_T,1,[Define if system has ptrdiff_t type])
- fi
-])
Index: m4/strtod.m4
--- m4/strtod.m4 Sun, 23 Sep 2001 08:36:36 +0200 akim
+++ m4/strtod.m4 Sat, 20 Oct 2001 10:24:09 +0200 akim
@@ -1,69 +0,0 @@
-## Copyright 1996, 1999, 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, 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.
-
-## From Jim Meyering.
-
-## serial 1
-
-## @defmac AC_FUNC_STRTOD
-## @maindex FUNC_STRTOD
-## @ovindex LIBOBJS
-## If the @code{strtod} function is not available, or does not work
-## correctly (like the one on SunOS 5.4), add @samp{strtod.$ac_objext} to
output
-## variable @code{LIBOBJS}.
-## @end defmac
-
-AC_DEFUN([AM_FUNC_STRTOD],
-[AC_CACHE_CHECK(for working strtod, am_cv_func_strtod,
-[AC_TRY_RUN([
-double strtod ();
-int
-main()
-{
- {
- /* Some versions of Linux strtod mis-parse strings with leading '+'. */
- char *string = " +69";
- char *term;
- double value;
- value = strtod (string, &term);
- if (value != 69 || term != (string + 4))
- exit (1);
- }
-
- {
- /* Under Solaris 2.4, strtod returns the wrong value for the
- terminating character under some conditions. */
- char *string = "NaN";
- char *term;
- strtod (string, &term);
- if (term != string && *(term - 1) == 0)
- exit (1);
- }
- exit (0);
-}
-], am_cv_func_strtod=yes, am_cv_func_strtod=no, am_cv_func_strtod=no)])
-test $am_cv_func_strtod = no && LIBOBJS="$LIBOBJS strtod.$ac_objext"
-AC_SUBST(LIBOBJS)dnl
-am_cv_func_strtod_needs_libm=no
-if test $am_cv_func_strtod = no; then
- AC_CHECK_FUNCS(pow)
- if test $ac_cv_func_pow = no; then
- AC_CHECK_LIB(m, pow, [am_cv_func_strtod_needs_libm=yes],
- [AC_MSG_WARN([can't find library containing definition of
pow])])
- fi
-fi
-])
Index: m4/Makefile.am
--- m4/Makefile.am Sat, 20 Oct 2001 10:24:24 +0200 akim
+++ m4/Makefile.am Sat, 20 Oct 2001 10:40:41 +0200 akim
@@ -24,7 +24,7 @@
m4data_DATA = as.m4 auxdir.m4 ccstdc.m4 cond.m4 depend.m4 depout.m4 \
dmalloc.m4 gcj.m4 header.m4 init.m4 install-sh.m4 lex.m4 \
lispdir.m4 make.m4 maintainer.m4 minuso.m4 missing.m4 multi.m4 \
-obstack.m4 protos.m4 python.m4 regex.m4 sanity.m4 strip.m4 \
+protos.m4 python.m4 regex.m4 sanity.m4 strip.m4 \
termios.m4 winsz.m4
EXTRA_DIST = $(m4data_DATA)