summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Eggert <eggert@cs.ucla.edu>2003-05-18 10:19:11 +0000
committerAndreas Gruenbacher <agruen@suse.de>2009-03-19 01:43:36 +0100
commitaee6b74cbe85d3946fc5c41b928a82723733796a (patch)
tree6f612e1ac65e5cdfe082a49bb18e567b6fbb33b5
parentc7d157b86debb0c0639067a28a58ec6dd9b7880c (diff)
downloadpatch-aee6b74cbe85d3946fc5c41b928a82723733796a.tar.gz
(AC_PREREQ): Bump to 2.57. (AC_INIT): Bump to 2.5.9. (AC_GNU_SOURCE): Add, early on. (gl_BACKUPFILE, gl_DIRNAME, gl_ERROR, gl_FUNC_MEMCHR, gl_FUNC_RMDIR, gl_GETOPT, gl_PREREQ_XMALLOC, gl_QUOTE, gl_QUOTEARG): Add. (jm_PREREQ_ADDEXT): Add, with definition. (jm_PREREQ_DIRNAME, jm_PREREQ_ERROR, jm_PREREQ_MEMCHR, jm_PREREQ_QUOTEARG): Remove. (AC_REPLACE_FUNCS): Remove memchr, rename, rmdir). (jm_FUNC_GLIBC_UNLOCKED_IO, jm_AC_DOS): Add. (jm_CHECK_TYPE_STRUCT_DIRENT_D_INO): Do not call directly. (AC_OUTPUT): Use new style, with AC_CONFIG_FILES.
-rw-r--r--configure.ac39
1 files changed, 29 insertions, 10 deletions
diff --git a/configure.ac b/configure.ac
index a37a3a9..0b98647 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,7 @@
# Configure `patch'.
-# Copyright (C) 1993, 1997, 1998, 1999, 2002 Free Software Foundation, Inc.
+
+# Copyright (C) 1993, 1997, 1998, 1999, 2002, 2003 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,8 +18,8 @@
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
# 02111-1307, USA.
-AC_PREREQ(2.53)
-AC_INIT(patch, 2.5.8, bug-patch@gnu.org)
+AC_PREREQ(2.57)
+AC_INIT(patch, 2.5.9, bug-patch@gnu.org)
AC_CONFIG_SRCDIR(patch.c)
AC_CONFIG_HEADER(config.h:config.hin)
AC_ARG_PROGRAM
@@ -30,6 +32,7 @@ AC_PROG_MAKE_SET
# because <errno.h> reserves symbols starting with `E'.
AC_PATH_PROG(ed_PROGRAM, ed, ed)
+AC_GNU_SOURCE
AC_AIX
AC_MINIX
AC_PROG_CC_STDC
@@ -51,17 +54,32 @@ AC_TYPE_SIGNAL
AC_TYPE_SIZE_T
jm_CHECK_TYPE_STRUCT_UTIMBUF
+gl_BACKUPFILE
+gl_DIRNAME
+gl_ERROR
+gl_FUNC_MEMCHR
+gl_FUNC_RMDIR
+gl_GETOPT
+gl_PREREQ_XMALLOC
+gl_QUOTE
+gl_QUOTEARG
+
+dnl This should be in gnulib, but isn't for some reason.
+AC_DEFUN([jm_PREREQ_ADDEXT],
+[
+ dnl For addext.c.
+ AC_REQUIRE([AC_SYS_LONG_FILE_NAMES])
+ AC_CHECK_FUNCS(pathconf)
+ AC_CHECK_HEADERS(limits.h string.h unistd.h)
+])
jm_PREREQ_ADDEXT
-jm_PREREQ_DIRNAME
-jm_PREREQ_ERROR
-jm_PREREQ_MEMCHR
-jm_PREREQ_QUOTEARG
AC_CHECK_DECLS([free, getenv, malloc, mktemp])
AC_CHECK_FUNCS(_doprintf geteuid getuid isascii memcmp mktemp \
pathconf raise sigaction sigprocmask sigsetmask strerror)
-AC_REPLACE_FUNCS(memchr mkdir rename rmdir strncasecmp)
+AC_REPLACE_FUNCS(mkdir strncasecmp)
AC_FUNC_FSEEKO
+jm_FUNC_GLIBC_UNLOCKED_IO
jm_FUNC_MALLOC
jm_FUNC_REALLOC
AC_FUNC_CLOSEDIR_VOID
@@ -69,7 +87,8 @@ AC_FUNC_SETMODE_DOS
AC_FUNC_VPRINTF
PATCH_FUNC_MKDIR_TAKES_ONE_ARG
+jm_AC_DOS
AC_SYS_LONG_FILE_NAMES
-jm_CHECK_TYPE_STRUCT_DIRENT_D_INO
-AC_OUTPUT(Makefile)
+AC_CONFIG_FILES([Makefile])
+AC_OUTPUT