diff options
| author | Bruce A. Mah <bmah@es.net> | 2017-04-20 12:37:09 -0700 |
|---|---|---|
| committer | Bruce A. Mah <bmah@es.net> | 2017-04-20 12:37:09 -0700 |
| commit | a026b29b2f8fdc223da21325aab8d0d5c77a843a (patch) | |
| tree | 2cea6f89b82f9840231884426f2c8ae359597363 | |
| parent | 02d411cb02cc9d3584527c5b175c8f9a36e5c083 (diff) | |
| download | iperf3-a026b29b2f8fdc223da21325aab8d0d5c77a843a.tar.gz | |
Move an autoconfig file into config/, get rid of a no-longer-used file.
Follow-up for #517.
| -rw-r--r-- | config/ax_check_openssl.m4 (renamed from ax_check_openssl.m4) | 0 | ||||
| -rw-r--r-- | config/ax_lib_socket_nsl.m4 | 40 | ||||
| -rw-r--r-- | configure.ac | 2 |
3 files changed, 1 insertions, 41 deletions
diff --git a/ax_check_openssl.m4 b/config/ax_check_openssl.m4 index 28e48cb..28e48cb 100644 --- a/ax_check_openssl.m4 +++ b/config/ax_check_openssl.m4 diff --git a/config/ax_lib_socket_nsl.m4 b/config/ax_lib_socket_nsl.m4 deleted file mode 100644 index 058e975..0000000 --- a/config/ax_lib_socket_nsl.m4 +++ /dev/null @@ -1,40 +0,0 @@ -# =========================================================================== -# http://www.gnu.org/software/autoconf-archive/ax_lib_socket_nsl.html -# =========================================================================== -# -# SYNOPSIS -# -# AX_LIB_SOCKET_NSL -# -# DESCRIPTION -# -# This macro figures out what libraries are required on this platform to -# link sockets programs. -# -# The common cases are not to need any extra libraries, or to need -# -lsocket and -lnsl. We need to avoid linking with libnsl unless we need -# it, though, since on some OSes where it isn't necessary it will totally -# break networking. Unisys also includes gethostbyname() in libsocket but -# needs libnsl for socket(). -# -# LICENSE -# -# Copyright (c) 2008 Russ Allbery <rra@stanford.edu> -# Copyright (c) 2008 Stepan Kasal <kasal@ucw.cz> -# Copyright (c) 2008 Warren Young <warren@etr-usa.com> -# -# Copying and distribution of this file, with or without modification, are -# permitted in any medium without royalty provided the copyright notice -# and this notice are preserved. This file is offered as-is, without any -# warranty. - -#serial 6 - -AU_ALIAS([LIB_SOCKET_NSL], [AX_LIB_SOCKET_NSL]) -AC_DEFUN([AX_LIB_SOCKET_NSL], -[ - AC_SEARCH_LIBS([gethostbyname], [nsl]) - AC_SEARCH_LIBS([socket], [socket], [], [ - AC_CHECK_LIB([socket], [socket], [LIBS="-lsocket -lnsl $LIBS"], - [], [-lnsl])]) -]) diff --git a/configure.ac b/configure.ac index faae23f..e5d8c18 100644 --- a/configure.ac +++ b/configure.ac @@ -25,7 +25,7 @@ # Initialize the autoconf system for the specified tool, version and mailing list AC_INIT(iperf, 3-CURRENT, https://github.com/esnet/iperf, iperf, http://software.es.net/iperf/) -m4_include([ax_check_openssl.m4]) +m4_include([config/ax_check_openssl.m4]) AC_LANG(C) # Specify where the auxiliary files created by configure should go. The config |