forked from mirrors/tftp-hpa-google
autoconf: modernize and modularize
Use my modular m4 library used for other things as well; update autoconf macros to 2.71 standard. Signed-off-by: H. Peter Anvin <hpa@zytor.com>
This commit is contained in:
H. Peter Anvin
parent
33051a296c
commit
fefaa2cc5c
35 changed files with 680 additions and 461 deletions
278
configure.ac
278
configure.ac
|
|
@ -1,61 +1,89 @@
|
|||
dnl
|
||||
dnl autoconf input file to generate MCONFIG
|
||||
dnl
|
||||
|
||||
dnl Process this file with autoconf 2.71 or later to produce
|
||||
dnl a configure script.
|
||||
AC_PREREQ([2.71])
|
||||
AC_INIT
|
||||
AC_CONFIG_SRCDIR([MCONFIG.in])
|
||||
AC_PREFIX_DEFAULT(/usr)
|
||||
AC_CONFIG_SRCDIR([MRULES])
|
||||
AC_PREFIX_DEFAULT([/usr])
|
||||
AC_CONFIG_AUX_DIR([autoconf/helpers])
|
||||
|
||||
dnl This prevents us from running Wine and thinking we are not
|
||||
dnl cross-compiling when in fact we are; running Wine here is at
|
||||
dnl the best very slow and doesn't buy us a single thing at all.
|
||||
PA_CROSS_COMPILE
|
||||
|
||||
dnl Enable any available C extensions
|
||||
PA_PROG_CC
|
||||
AC_USE_SYSTEM_EXTENSIONS
|
||||
AC_SEARCH_LIBS([strerror],[cposix])
|
||||
AC_PROG_CC
|
||||
|
||||
dnl Options for debugging and profiling
|
||||
PA_OPTION_DEBUG
|
||||
PA_OPTION_PROFILING
|
||||
|
||||
dnl LLVM doesn't error out on invalid -W options unless this option is
|
||||
dnl specified first. Enable this so this script can actually discover
|
||||
dnl which -W options are possible for this compiler.
|
||||
PA_ADD_CFLAGS([-Werror=unknown-warning-option])
|
||||
|
||||
dnl Force gcc and gcc-compatible compilers treat signed integers
|
||||
dnl as 2's complement
|
||||
PA_ADD_CFLAGS([-fwrapv])
|
||||
|
||||
dnl Force clang to behave in a predictable manner, in order to make bugs
|
||||
dnl possible to track down. gcc appears to have this behavior by default.
|
||||
PA_ADD_CFLAGS([-ftrivial-auto-var-init=zero])
|
||||
|
||||
dnl Some environments abuse __STRICT_ANSI__ to disable some
|
||||
dnl function declarations
|
||||
PA_ADD_CFLAGS([-U__STRICT_ANSI__])
|
||||
|
||||
dnl Don't put things in common if we can avoid it. We don't want to
|
||||
dnl assume all compilers support common, and this will help find those
|
||||
dnl problems. This also works around an OSX linker problem.
|
||||
PA_ADD_CFLAGS([-fno-common])
|
||||
|
||||
dnl Tests which may trigger warnings on some compilers
|
||||
AC_C_CONST
|
||||
AC_C_INLINE
|
||||
AC_C_RESTRICT
|
||||
|
||||
PA_ADD_CFLAGS(-W)
|
||||
PA_ADD_CFLAGS(-Wall)
|
||||
PA_ADD_CFLAGS(-Wpointer-arith)
|
||||
PA_ADD_CFLAGS(-Wbad-function-cast)
|
||||
PA_ADD_CFLAGS(-Wcast-equal)
|
||||
PA_ADD_CFLAGS(-Wstrict-prototypes)
|
||||
PA_ADD_CFLAGS(-Wmissing-prototypes)
|
||||
PA_ADD_CFLAGS(-Wmissing-declarations)
|
||||
PA_ADD_CFLAGS(-Wnested-externs)
|
||||
PA_ADD_CFLAGS(-Winline)
|
||||
PA_ADD_CFLAGS(-Wwrite-strings)
|
||||
PA_ADD_CFLAGS(-Wundef)
|
||||
PA_ADD_CFLAGS(-Wshadow)
|
||||
PA_ADD_CFLAGS(-Wsign-compare)
|
||||
PA_ADD_CFLAGS(-pipe)
|
||||
PA_ADD_CFLAGS(-fno-strict-aliasing)
|
||||
dnl Checks for header files.
|
||||
AC_CHECK_INCLUDES_DEFAULT
|
||||
|
||||
AC_CHECK_HEADERS(inttypes.h)
|
||||
AC_CHECK_HEADERS(stdint.h)
|
||||
dnl See if we need extra libraries
|
||||
XTRA=false
|
||||
|
||||
AC_SEARCH_LIBS([strerror],[cposix])
|
||||
|
||||
AC_CHECK_HEADERS_ONCE(inttypes.h)
|
||||
AC_CHECK_HEADERS_ONCE(stdint.h)
|
||||
AC_CHECK_HEADERS_ONCE(grp.h)
|
||||
AC_CHECK_HEADERS_ONCE(libgen.h)
|
||||
AC_CHECK_HEADERS_ONCE(setjmp.h)
|
||||
AC_CHECK_HEADERS_ONCE(strings.h)
|
||||
AC_CHECK_HEADERS_ONCE(sysexits.h)
|
||||
AC_CHECK_HEADERS_ONCE(unistd.h)
|
||||
AC_CHECK_HEADERS_ONCE(sys/filio.h)
|
||||
AC_CHECK_HEADERS_ONCE(sys/stat.h)
|
||||
AC_CHECK_HEADERS_ONCE(sys/time.h)
|
||||
PA_CHECK_INTTYPES_H_SANE
|
||||
AC_CHECK_HEADERS(fcntl.h)
|
||||
AC_CHECK_HEADERS(grp.h)
|
||||
AC_CHECK_HEADERS(libgen.h)
|
||||
AC_CHECK_HEADERS(setjmp.h)
|
||||
AC_CHECK_HEADERS(strings.h)
|
||||
AC_CHECK_HEADERS(sysexits.h)
|
||||
AC_CHECK_HEADERS(unistd.h)
|
||||
AC_CHECK_HEADERS(sys/file.h)
|
||||
AC_CHECK_HEADERS(sys/filio.h)
|
||||
AC_CHECK_HEADERS(sys/stat.h)
|
||||
AC_CHECK_HEADERS(sys/time.h)
|
||||
AC_CHECK_HEADERS(sys/types.h)
|
||||
AC_CHECK_HEADERS(arpa/inet.h)
|
||||
AC_CHECK_HEADERS(netdb.h)
|
||||
|
||||
dnl This is needed on some versions of FreeBSD...
|
||||
AC_CHECK_HEADERS(machine/param.h)
|
||||
AC_CHECK_HEADERS(sys/socket.h)
|
||||
AC_CHECK_HEADERS(winsock2.h)
|
||||
AC_CHECK_HEADERS(winsock.h)
|
||||
AC_CHECK_HEADERS_ONCE(machine/param.h)
|
||||
|
||||
AC_SYS_LARGEFILE
|
||||
dnl Windows...
|
||||
PA_ADD_HEADERS(windows.h)
|
||||
PA_ADD_HEADERS(winsock2.h)
|
||||
AS_IF([test "x$ac_cv_header_winsock2_h" != xyes],
|
||||
[PA_ADD_HEADERS(winsock.h)])
|
||||
|
||||
PA_ADD_HEADERS(fcntl.h)
|
||||
PA_ADD_HEADERS(sys/types.h)
|
||||
PA_ADD_HEADERS(arpa/inet.h)
|
||||
PA_ADD_HEADERS(sys/socket.h)
|
||||
PA_ADD_HEADERS(sys/file.h)
|
||||
PA_ADD_HEADERS(netinet/in.h)
|
||||
PA_ADD_HEADERS(sys/uio.h)
|
||||
PA_ADD_HEADERS(netdb.h)
|
||||
|
||||
AC_TYPE_OFF_T
|
||||
AC_TYPE_PID_T
|
||||
|
|
@ -68,23 +96,13 @@ AC_CHECK_TYPES(uint32_t)
|
|||
AC_CHECK_TYPES(u_short)
|
||||
AC_CHECK_TYPES(u_long)
|
||||
|
||||
dnl
|
||||
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
|
||||
AC_CHECK_TYPES(socklen_t,,,
|
||||
[AC_INCLUDES_DEFAULT
|
||||
#ifdef HAVE_SYS_TYPES_H
|
||||
# include <sys/types.h>
|
||||
#endif
|
||||
#ifdef HAVE_SYS_SOCKET_H
|
||||
# include <sys/socket.h>
|
||||
#endif
|
||||
])
|
||||
AC_CHECK_TYPES(socklen_t)
|
||||
|
||||
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)])
|
||||
|
||||
AC_CHECK_FUNCS(fcntl)
|
||||
AC_CHECK_FUNCS(flock)
|
||||
AC_CHECK_FUNCS(setsid)
|
||||
AC_CHECK_FUNCS(recvmsg)
|
||||
AC_CHECK_FUNCS(ftruncate)
|
||||
|
|
@ -100,22 +118,15 @@ dnl Solaris 8 has [u]intmax_t but not strtoumax(). How utterly braindamaged.
|
|||
AC_CHECK_FUNCS(strtoumax)
|
||||
AC_CHECK_FUNCS(strtoull)
|
||||
|
||||
PA_MSGHDR_MSG_CONTROL
|
||||
PA_STRUCT_IN_PKTINFO
|
||||
PA_STRUCT_ADDRINFO
|
||||
AC_CHECK_MEMBERS(struct msghdr.msg_control)
|
||||
AC_CHECK_MEMBERS(struct in_pktinfo.ipi_addr)
|
||||
AC_CHECK_MEMBERS(struct addrinfo.ai_addr)
|
||||
|
||||
PA_HEADER_DEFINES(fcntl.h, int, O_NONBLOCK)
|
||||
PA_HEADER_DEFINES(fcntl.h, int, O_BINARY)
|
||||
PA_HEADER_DEFINES(fcntl.h, int, O_TEXT)
|
||||
AC_CHECK_DECLS([O_NONBLOCK, O_BINARY, O_TEXT])
|
||||
AC_CHECK_DECLS([F_SETLK])
|
||||
AC_CHECK_DECLS([LOCK_SH, LOCK_EX])
|
||||
|
||||
PA_HEADER_DEFINES(fcntl.h, int, F_SETLK)
|
||||
|
||||
PA_HEADER_DEFINES(sys/file.h, int, LOCK_SH)
|
||||
PA_HEADER_DEFINES(sys/file.h, int, LOCK_EX)
|
||||
|
||||
AH_TEMPLATE([HAVE_SIGSETJMP],
|
||||
[Define if we have sigsetjmp, siglongjmp and sigjmp_buf.])
|
||||
PA_SIGSETJMP([AC_DEFINE(HAVE_SIGSETJMP)])
|
||||
PA_SIGSETJMP
|
||||
|
||||
dnl
|
||||
dnl Get common paths
|
||||
|
|
@ -123,38 +134,31 @@ dnl
|
|||
SRCROOT=`cd $srcdir && pwd`
|
||||
OBJROOT=`pwd`
|
||||
|
||||
XTRA=false
|
||||
PA_SEARCH_LIBS_AND_ADD(xmalloc, iberty)
|
||||
PA_SEARCH_LIBS_AND_ADD(xstrdup, iberty)
|
||||
PA_SEARCH_LIBS_AND_ADD(getopt_long, getopt, getopt_long)
|
||||
PA_SEARCH_LIBS_AND_ADD(getaddrinfo, [nsl resolv])
|
||||
if $pa_add_getaddrinfo
|
||||
then
|
||||
AC_SEARCH_LIBS(gethostbyname, [nsl resolv],
|
||||
AS_IF([$pa_add_getaddrinfo],
|
||||
[AC_SEARCH_LIBS(gethostbyname, [nsl resolv],
|
||||
[AC_SEARCH_LIBS(herror, [nsl resolv], ,
|
||||
[AC_MSG_ERROR(herror not found)])],
|
||||
[AC_MSG_ERROR(gethostbyname not found)])
|
||||
else
|
||||
AC_SEARCH_LIBS(freeaddrinfo, [nsl resolv], ,
|
||||
[AC_MSG_ERROR(gethostbyname not found)])],
|
||||
[AC_SEARCH_LIBS(freeaddrinfo, [nsl resolv], ,
|
||||
[AC_MSG_ERROR(getaddrinfo but not freeaddrinfo found)])
|
||||
AC_SEARCH_LIBS(gai_strerror, [nsl resolv], ,
|
||||
[AC_MSG_ERROR(getaddrinfo but not gai_strerror found)])
|
||||
fi
|
||||
[AC_MSG_ERROR(getaddrinfo but not gai_strerror found)])])
|
||||
|
||||
PA_SEARCH_LIBS_AND_ADD(inet_ntop, [nsl resolv])
|
||||
if $pa_add_inet_ntop
|
||||
then
|
||||
AC_SEARCH_LIBS(inet_ntoa, [nsl resolv], ,
|
||||
[AC_MSG_ERROR(inet_ntoa not found)])
|
||||
fi
|
||||
AS_IF([$pa_add_inet_ntop],
|
||||
[AC_SEARCH_LIBS(inet_ntoa, [nsl resolv], ,
|
||||
[AC_MSG_ERROR(inet_ntoa not found)])])
|
||||
|
||||
AC_SEARCH_LIBS(inet_aton, [nsl resolv], ,[AC_MSG_ERROR(inet_aton not found)])
|
||||
|
||||
AC_CHECK_FUNCS(daemon, , [XTRA=true; AC_LIBOBJ(daemon)])
|
||||
AC_CHECK_FUNCS(dup2, , [XTRA=true; AC_LIBOBJ(dup2)])
|
||||
if $XTRA
|
||||
then
|
||||
XTRALIBS="$OBJROOT/lib/libxtra.a $XTRALIBS"
|
||||
fi
|
||||
PA_SEARCH_LIBS_AND_ADD(daemon)
|
||||
PA_SEARCH_LIBS_AND_ADD(dup2)
|
||||
|
||||
AS_IF([$XTRA], [XTRALIBS="$OBJROOT/lib/libxtra.a $XTRALIBS"])
|
||||
|
||||
dnl
|
||||
dnl These libraries apply to the server only
|
||||
|
|
@ -162,31 +166,14 @@ dnl
|
|||
|
||||
common_libs="$LIBS"
|
||||
|
||||
PA_HEADER_DEFINES(netinet/in.h, int, IPPORT_TFTP)
|
||||
AC_CHECK_DECLS(IPPORT_TFTP)
|
||||
|
||||
PA_WITH_BOOL(tcpwrappers, 1,
|
||||
[ --without-tcpwrappers disable tcpwrapper permissions checking],
|
||||
[
|
||||
PA_ARG_DISABLED([tcpwrappers],
|
||||
[disable tcpwrapper permissions checking], [],
|
||||
[
|
||||
AC_SEARCH_LIBS(yp_get_default_domain, [nsl resolv])
|
||||
PA_HAVE_TCPWRAPPERS
|
||||
],:)
|
||||
|
||||
|
||||
AH_TEMPLATE([WITH_REGEX],
|
||||
[Define if we are compiling with regex filename remapping.])
|
||||
|
||||
PA_WITH_BOOL(remap, 1,
|
||||
[ --without-remap disable regex-based filename remapping],
|
||||
[
|
||||
AC_CHECK_HEADER(regex.h,
|
||||
[
|
||||
AC_SEARCH_LIBS(regcomp, [regex rx],
|
||||
[
|
||||
AC_DEFINE(WITH_REGEX)
|
||||
TFTPDOBJS="remap.${OBJEXT} $TFTPDOBJS"
|
||||
])
|
||||
])
|
||||
],:)
|
||||
])
|
||||
|
||||
TFTPD_LIBS="$LIBS $XTRALIBS"
|
||||
LIBS="$common_libs"
|
||||
|
|
@ -198,10 +185,10 @@ dnl
|
|||
AH_TEMPLATE([WITH_READLINE],
|
||||
[Define if we are compiling with readline/editline command-line editing.])
|
||||
|
||||
PA_WITH_BOOL(readline, 1,
|
||||
[ --without-readline disable the use of readline command-line editing],
|
||||
[
|
||||
AC_CHECK_HEADER(readline/readline.h,
|
||||
PA_ARG_DISABLED([readline],
|
||||
[disable the use of readline command-line editing], [],
|
||||
[
|
||||
AC_CHECK_HEADER(readline/readline.h,
|
||||
[
|
||||
dnl readline may need libtermcap or somesuch...
|
||||
AC_SEARCH_LIBS(tputs, [termcap terminfo])
|
||||
|
|
@ -226,23 +213,17 @@ LIBS="$common_libs"
|
|||
dnl
|
||||
dnl Check for IPV6 and disable-ipv6
|
||||
dnl
|
||||
PA_STRUCT_SOCKADDR_IN6
|
||||
AC_MSG_CHECKING([for IPv6 support])
|
||||
PA_WITH_BOOL(ipv6, 1,
|
||||
[ --without-ipv6 disable the support for IPv6],
|
||||
[
|
||||
if $HAVE_INET6
|
||||
then
|
||||
AC_MSG_RESULT(yes)
|
||||
AC_DEFINE(HAVE_IPV6, 1, [Define if IPv6 support is enabled.])
|
||||
PA_STRUCT_IN6_PKTINFO
|
||||
else
|
||||
AC_MSG_RESULT(no)
|
||||
AC_MSG_WARN([*** we do not have required IPv6 structs - IPv6 will be disabled])
|
||||
fi
|
||||
],
|
||||
[AC_MSG_RESULT(disabled)])
|
||||
|
||||
AC_CHECK_MEMBERS(struct sockaddr_in6.sin6_addr)
|
||||
AC_MSG_CHECKING([for IPv6 support])
|
||||
PA_ARG_DISABLED([ipv6],
|
||||
[disable support for IPv6],
|
||||
[AC_MSG_RESULT(disabled)],
|
||||
[AS_IF([test x"$ac_cv_member_struct_sockaddr_in6_sin6_addr$ac_cv_member_struct_addrinfo_ai_addr" = xyesyes],
|
||||
[AC_MSG_RESULT(yes)
|
||||
AC_DEFINE(HAVE_IPV6, 1, [define if IPv6 support is enabled])],
|
||||
[AC_MSG_RESULT(no)
|
||||
AC_MSG_WARN([*** we do not have required IPv6 structs - IPv6 will be disabled])])])
|
||||
|
||||
AC_SUBST(SRCROOT)
|
||||
AC_SUBST(OBJROOT)
|
||||
|
|
@ -265,6 +246,29 @@ AC_PROG_INSTALL
|
|||
INSTALL='\${SRCROOT}'/"$INSTALL"
|
||||
fi]
|
||||
|
||||
AC_CONFIG_HEADERS(aconfig.h)
|
||||
AC_CONFIG_FILES([MCONFIG])
|
||||
PA_ADD_CFLAGS(-W)
|
||||
PA_ADD_CFLAGS(-Wall)
|
||||
PA_ADD_CFLAGS(-Wpointer-arith)
|
||||
PA_ADD_CFLAGS(-Wbad-function-cast)
|
||||
PA_ADD_CFLAGS(-Wcast-equal)
|
||||
PA_ADD_CFLAGS(-Wstrict-prototypes)
|
||||
PA_ADD_CFLAGS(-Wmissing-prototypes)
|
||||
PA_ADD_CFLAGS(-Wmissing-declarations)
|
||||
PA_ADD_CFLAGS(-Wnested-externs)
|
||||
PA_ADD_CFLAGS(-Winline)
|
||||
PA_ADD_CFLAGS(-Wwrite-strings)
|
||||
PA_ADD_CFLAGS(-Wundef)
|
||||
PA_ADD_CFLAGS(-Wshadow)
|
||||
PA_ADD_CFLAGS(-Wsign-compare)
|
||||
PA_ADD_CFLAGS(-fno-strict-aliasing)
|
||||
|
||||
dnl
|
||||
dnl Test compiler features. On some compilers, this can be affected
|
||||
dnl by -Werror options, so run this *after* those options are added.
|
||||
dnl
|
||||
PA_CHECK_BAD_STDC_INLINE
|
||||
PA_C_TYPEOF
|
||||
|
||||
AC_CONFIG_HEADERS([config/config.h])
|
||||
AC_CONFIG_FILES([config/MCONFIG])
|
||||
AC_OUTPUT
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue