mirror of
https://kernel.googlesource.com/pub/scm/network/tftp/tftp-hpa
synced 2025-04-29 11:29:52 +03:00
autoconf: remove workarounds for some very old systems
Remove workarounds for some ridiculously old systems; these workarounds are basically untestable. Signed-off-by: H. Peter Anvin <hpa@zytor.com>
This commit is contained in:
parent
e83d71d394
commit
9c0908a778
2 changed files with 13 additions and 72 deletions
31
config.h
31
config.h
|
@ -30,6 +30,10 @@
|
||||||
/* Standard includes */
|
/* Standard includes */
|
||||||
|
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
|
#include <time.h>
|
||||||
|
#include <stdlib.h>
|
||||||
|
#include <errno.h>
|
||||||
|
#include <signal.h>
|
||||||
|
|
||||||
#ifdef HAVE_SYS_TYPES_H
|
#ifdef HAVE_SYS_TYPES_H
|
||||||
#include <sys/types.h>
|
#include <sys/types.h>
|
||||||
|
@ -39,21 +43,6 @@
|
||||||
#include <sys/stat.h>
|
#include <sys/stat.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef STDC_HEADERS
|
|
||||||
#include <stdlib.h>
|
|
||||||
#include <stddef.h>
|
|
||||||
#else
|
|
||||||
#ifdef HAVE_STDLIB_H
|
|
||||||
#include <stdlib.h>
|
|
||||||
#endif
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifdef HAVE_MEMORY_H
|
|
||||||
#ifndef STDC_HEADERS
|
|
||||||
#include <memory.h>
|
|
||||||
#endif
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifdef HAVE_STRING_H
|
#ifdef HAVE_STRING_H
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
#endif
|
#endif
|
||||||
|
@ -80,15 +69,8 @@
|
||||||
#include <setjmp.h>
|
#include <setjmp.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef TIME_WITH_SYS_TIME
|
#ifdef HAVE_SYS_TIME_H
|
||||||
#include <sys/time.h>
|
#include <sys/time.h>
|
||||||
#include <time.h>
|
|
||||||
#else
|
|
||||||
#if HAVE_SYS_TIME_H
|
|
||||||
#include <sys/time.h>
|
|
||||||
#else
|
|
||||||
#include <time.h>
|
|
||||||
#endif
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef HAVE_GRP_H
|
#ifdef HAVE_GRP_H
|
||||||
|
@ -99,9 +81,6 @@
|
||||||
#include <fcntl.h>
|
#include <fcntl.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include <errno.h>
|
|
||||||
#include <signal.h>
|
|
||||||
|
|
||||||
#ifdef HAVE_SYS_SOCKET_H
|
#ifdef HAVE_SYS_SOCKET_H
|
||||||
#include <sys/socket.h>
|
#include <sys/socket.h>
|
||||||
#else
|
#else
|
||||||
|
|
54
configure.ac
54
configure.ac
|
@ -2,12 +2,13 @@ dnl
|
||||||
dnl autoconf input file to generate MCONFIG
|
dnl autoconf input file to generate MCONFIG
|
||||||
dnl
|
dnl
|
||||||
|
|
||||||
AC_PREREQ(2.61)
|
AC_PREREQ([2.71])
|
||||||
AC_INIT(MCONFIG.in)
|
AC_INIT
|
||||||
|
AC_CONFIG_SRCDIR([MCONFIG.in])
|
||||||
AC_PREFIX_DEFAULT(/usr)
|
AC_PREFIX_DEFAULT(/usr)
|
||||||
|
|
||||||
AC_USE_SYSTEM_EXTENSIONS
|
AC_USE_SYSTEM_EXTENSIONS
|
||||||
AC_ISC_POSIX
|
AC_SEARCH_LIBS([strerror],[cposix])
|
||||||
AC_PROG_CC
|
AC_PROG_CC
|
||||||
|
|
||||||
AC_C_CONST
|
AC_C_CONST
|
||||||
|
@ -30,21 +31,15 @@ PA_ADD_CFLAGS(-Wsign-compare)
|
||||||
PA_ADD_CFLAGS(-pipe)
|
PA_ADD_CFLAGS(-pipe)
|
||||||
PA_ADD_CFLAGS(-fno-strict-aliasing)
|
PA_ADD_CFLAGS(-fno-strict-aliasing)
|
||||||
|
|
||||||
AC_HEADER_STDC
|
|
||||||
AC_CHECK_HEADERS(inttypes.h)
|
AC_CHECK_HEADERS(inttypes.h)
|
||||||
AC_CHECK_HEADERS(stdint.h)
|
AC_CHECK_HEADERS(stdint.h)
|
||||||
PA_CHECK_INTTYPES_H_SANE
|
PA_CHECK_INTTYPES_H_SANE
|
||||||
AC_CHECK_HEADERS(fcntl.h)
|
AC_CHECK_HEADERS(fcntl.h)
|
||||||
AC_CHECK_HEADERS(grp.h)
|
AC_CHECK_HEADERS(grp.h)
|
||||||
AC_CHECK_HEADERS(libgen.h)
|
AC_CHECK_HEADERS(libgen.h)
|
||||||
AC_CHECK_HEADERS(memory.h)
|
|
||||||
AC_CHECK_HEADERS(setjmp.h)
|
AC_CHECK_HEADERS(setjmp.h)
|
||||||
AC_CHECK_HEADERS(stddef.h)
|
|
||||||
AC_CHECK_HEADERS(stdlib.h)
|
|
||||||
AC_CHECK_HEADERS(string.h)
|
|
||||||
AC_CHECK_HEADERS(strings.h)
|
AC_CHECK_HEADERS(strings.h)
|
||||||
AC_CHECK_HEADERS(sysexits.h)
|
AC_CHECK_HEADERS(sysexits.h)
|
||||||
AC_CHECK_HEADERS(time.h)
|
|
||||||
AC_CHECK_HEADERS(unistd.h)
|
AC_CHECK_HEADERS(unistd.h)
|
||||||
AC_CHECK_HEADERS(sys/file.h)
|
AC_CHECK_HEADERS(sys/file.h)
|
||||||
AC_CHECK_HEADERS(sys/filio.h)
|
AC_CHECK_HEADERS(sys/filio.h)
|
||||||
|
@ -53,7 +48,7 @@ AC_CHECK_HEADERS(sys/time.h)
|
||||||
AC_CHECK_HEADERS(sys/types.h)
|
AC_CHECK_HEADERS(sys/types.h)
|
||||||
AC_CHECK_HEADERS(arpa/inet.h)
|
AC_CHECK_HEADERS(arpa/inet.h)
|
||||||
AC_CHECK_HEADERS(netdb.h)
|
AC_CHECK_HEADERS(netdb.h)
|
||||||
AC_HEADER_TIME
|
|
||||||
dnl This is needed on some versions of FreeBSD...
|
dnl This is needed on some versions of FreeBSD...
|
||||||
AC_CHECK_HEADERS(machine/param.h)
|
AC_CHECK_HEADERS(machine/param.h)
|
||||||
AC_CHECK_HEADERS(sys/socket.h)
|
AC_CHECK_HEADERS(sys/socket.h)
|
||||||
|
@ -78,44 +73,10 @@ dnl <sys/socket.h> isn't among the list of standard headers that autoconf checks
|
||||||
dnl but POSIX requires <sys/socket.h> for socklen_t to be defined.
|
dnl but POSIX requires <sys/socket.h> for socklen_t to be defined.
|
||||||
dnl
|
dnl
|
||||||
AC_CHECK_TYPES(socklen_t,,,
|
AC_CHECK_TYPES(socklen_t,,,
|
||||||
[
|
[AC_INCLUDES_DEFAULT
|
||||||
#include <stdio.h>
|
|
||||||
#if HAVE_SYS_TYPES_H
|
#if HAVE_SYS_TYPES_H
|
||||||
# include <sys/types.h>
|
# include <sys/types.h>
|
||||||
#endif
|
#endif
|
||||||
#if HAVE_SYS_STAT_H
|
|
||||||
# include <sys/stat.h>
|
|
||||||
#endif
|
|
||||||
#if STDC_HEADERS
|
|
||||||
# include <stdlib.h>
|
|
||||||
# include <stddef.h>
|
|
||||||
#else
|
|
||||||
# if HAVE_STDLIB_H
|
|
||||||
# include <stdlib.h>
|
|
||||||
# endif
|
|
||||||
#endif
|
|
||||||
#if HAVE_STRING_H
|
|
||||||
# if !STDC_HEADERS && HAVE_MEMORY_H
|
|
||||||
# include <memory.h>
|
|
||||||
# endif
|
|
||||||
# include <string.h>
|
|
||||||
#endif
|
|
||||||
#if HAVE_STRINGS_H
|
|
||||||
# include <strings.h>
|
|
||||||
#endif
|
|
||||||
#if HAVE_INTTYPES_H
|
|
||||||
# include <inttypes.h>
|
|
||||||
#else
|
|
||||||
# if HAVE_STDINT_H
|
|
||||||
# include <stdint.h>
|
|
||||||
# endif
|
|
||||||
#endif
|
|
||||||
#if HAVE_UNISTD_H
|
|
||||||
# include <unistd.h>
|
|
||||||
#endif
|
|
||||||
#ifdef HAVE_SYS_SOCKET_H
|
|
||||||
# include <sys/socket.h>
|
|
||||||
#endif
|
|
||||||
])
|
])
|
||||||
|
|
||||||
AC_SEARCH_LIBS(socket, [socket ws2_32 wsock32], , [AC_MSG_ERROR(socket library not found)])
|
AC_SEARCH_LIBS(socket, [socket ws2_32 wsock32], , [AC_MSG_ERROR(socket library not found)])
|
||||||
|
@ -300,4 +261,5 @@ AC_PROG_INSTALL
|
||||||
fi]
|
fi]
|
||||||
|
|
||||||
AC_CONFIG_HEADERS(aconfig.h)
|
AC_CONFIG_HEADERS(aconfig.h)
|
||||||
AC_OUTPUT(MCONFIG)
|
AC_CONFIG_FILES([MCONFIG])
|
||||||
|
AC_OUTPUT
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue