From a026b29b2f8fdc223da21325aab8d0d5c77a843a Mon Sep 17 00:00:00 2001 From: "Bruce A. Mah" Date: Thu, 20 Apr 2017 12:37:09 -0700 Subject: [PATCH] Move an autoconfig file into config/, get rid of a no-longer-used file. Follow-up for #517. --- .../ax_check_openssl.m4 | 0 config/ax_lib_socket_nsl.m4 | 40 ------------------- configure.ac | 2 +- 3 files changed, 1 insertion(+), 41 deletions(-) rename ax_check_openssl.m4 => config/ax_check_openssl.m4 (100%) delete mode 100644 config/ax_lib_socket_nsl.m4 diff --git a/ax_check_openssl.m4 b/config/ax_check_openssl.m4 similarity index 100% rename from ax_check_openssl.m4 rename to 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 -# Copyright (c) 2008 Stepan Kasal -# Copyright (c) 2008 Warren Young -# -# 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