build: Update for newer autoconf.

* configure.ac (AC_PREREQ): Require >= 2.69.
(AC_HEADER_STDC): Remove.
* m4/sys_socket_h.m4: Remove.

--

Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>

2 files changed, 1 insertions, 25 deletions

diff --git a/configure.ac b/configure.ac
index e2d3d47..acf1264 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
 # Process this file with autoconf to produce a configure script.
 
 
-AC_PREREQ([2.61])
+AC_PREREQ([2.69])
 min_automake_version="1.14"
 
 # To build a release you need to create a tag with the version number
@@ -337,7 +337,6 @@ AC_SUBST(LIBASSUAN_CONFIG_API_VERSION)
 #
 # Checks for header files.
 #
-AC_HEADER_STDC
 AC_CHECK_HEADERS([locale.h sys/uio.h stdint.h inttypes.h \
                   sys/types.h sys/stat.h unistd.h sys/time.h fcntl.h \
                   sys/select.h ucred.h sys/ucred.h])
diff --git a/m4/sys_socket_h.m4 b/m4/sys_socket_h.m4
deleted file mode 100644
index d3e45b4..0000000
--- a/m4/sys_socket_h.m4
+++ /dev/null
@@ -1,23 +0,0 @@
-# sys_socket_h.m4 serial 2
-dnl Copyright (C) 2005, 2006 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-dnl From Simon Josefsson.
-
-AC_DEFUN([gl_HEADER_SYS_SOCKET],
-[
-  AC_CHECK_HEADERS_ONCE([sys/socket.h])
-  if test $ac_cv_header_sys_socket_h = yes; then
-    SYS_SOCKET_H=''
-  else
-    dnl We cannot use AC_CHECK_HEADERS_ONCE here, because that would make
-    dnl the check for those headers unconditional; yet cygwin reports
-    dnl that the headers are present but cannot be compiled (since on
-    dnl cygwin, all socket information should come from sys/socket.h).
-    AC_CHECK_HEADERS([winsock2.h ws2tcpip.h])
-    SYS_SOCKET_H='sys/socket.h'
-  fi
-  AC_SUBST(SYS_SOCKET_H)
-])