diff --git a/Makefile.am b/Makefile.am index 2cb9c24..dc266e3 100644 --- a/Makefile.am +++ b/Makefile.am @@ -19,6 +19,7 @@ # OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE # USE OR OTHER DEALINGS IN THE SOFTWARE. +ACLOCAL_AMFLAGS = -I src/missing/m4 AUTOMAKE_OPTIONS = dist-bzip2 dist-zip SUBDIRS = src doc EXTRA_DIST = README.* Release_Notes inet_ntop.c autogen.sh m4 diff --git a/autogen.sh b/autogen.sh index bc8389c..1156f42 100755 --- a/autogen.sh +++ b/autogen.sh @@ -1,5 +1,5 @@ #! /bin/sh -aclocal -I src/missing/m4 \ +aclocal \ && automake --add-missing \ && autoconf && autoheader diff --git a/m4/m4/salen.m4 b/m4/m4/salen.m4 deleted file mode 100644 index 6e858da..0000000 --- a/m4/m4/salen.m4 +++ /dev/null @@ -1,32 +0,0 @@ -dnl Copyright (c) 1995, 1996, 1997, 1998 -dnl tising materials mentioning -dnl dnl features or use of this software display the following acknowledgement: -dnl dnl ``This product includes software developed by the University of California, -dnl dnl Lawrence Berkeley Laboratory and its contributors.'' Neither the name of -dnl dnl the University nor the names of its contributors may be used to endorse -dnl dnl or promote products derived from this software without specific prior -dnl dnl written permission. -dnl dnl THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED -dnl dnl WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF -dnl dnl MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. -dnl dnl -dnl dnl LBL autoconf macros -dnl dnl -dnl -dnl -dnl Checks to see if the sockaddr struct has the 4.4 BSD sa_len member -dnl borrowed from LBL libpcap -AC_DEFUN(AC_CHECK_SA_LEN, [ - AC_MSG_CHECKING(if sockaddr struct has sa_len member) - AC_CACHE_VAL($1, - AC_TRY_COMPILE([ -# include -# include ], - [u_int i = sizeof(((struct sockaddr *)0)->sa_len)], - $1=yes, - $1=no)) - AC_MSG_RESULT($$1) - if test $$1 = yes ; then - AC_DEFINE([HAVE_SOCKADDR_SA_LEN],1,[Define if struct sockaddr has the sa_len member]) - fi -]) diff --git a/m4/m4/sockaddrin6.m4 b/m4/m4/sockaddrin6.m4 deleted file mode 100644 index b065038..0000000 --- a/m4/m4/sockaddrin6.m4 +++ /dev/null @@ -1,60 +0,0 @@ -dnl * -dnl * Copyright (c) 2001 Motoyuki Kasahara -dnl * -dnl * Redistribution and use in source and binary forms, with or without -dnl * modification, are permitted provided that the following conditions -dnl * are met: -dnl * 1. Redistributions of source code must retain the above copyright -dnl * notice, this list of conditions and the following disclaimer. -dnl * 2. Redistributions in binary form must reproduce the above copyright -dnl * notice, this list of conditions and the following disclaimer in the -dnl * documentation and/or other materials provided with the distribution. -dnl * 3. Neither the name of the project nor the names of its contributors -dnl * may be used to endorse or promote products derived from this software -dnl * without specific prior written permission. -dnl * -dnl * THIS SOFTWARE IS PROVIDED BY THE PROJECT AND CONTRIBUTORS ``AS IS'' AND -dnl * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -dnl * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -dnl * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE PROJECT OR CONTRIBUTORSBE -dnl * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR -dnl * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF -dnl * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -dnl * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN -dnl * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -dnl * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF -dnl * THE POSSIBILITY OF SUCH DAMAGE. -dnl * - -dnl * -dnl * Check for struct sockaddr_in6 -dnl * -AC_DEFUN([AC_STRUCT_SOCKADDR_IN6], -[AC_CACHE_CHECK(for struct sockaddr_in6, ac_cv_struct_sockaddr_in6, -[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ -#include -#include -#include ]], [[ -struct sockaddr_in6 address; -]])],[ac_cv_struct_sockaddr_in6=yes],[ac_cv_struct_sockaddr_in6=no])]) -if test "$ac_cv_struct_sockaddr_in6" = yes; then - AC_DEFINE(HAVE_STRUCT_SOCKADDR_IN6, 1, -[Define to 1 if defines `struct sockaddr_in6']) -fi]) - -dnl * -dnl * Check for struct sockaddr_storage -dnl * -AC_DEFUN([AC_STRUCT_SOCKADDR_STORAGE], -[AC_CACHE_CHECK(for struct sockaddr_storage, ac_cv_struct_sockaddr_storage, -[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ -#include -#include -#include ]], [[ -struct sockaddr_storage address; -]])],[ac_cv_struct_sockaddr_storage=yes],[ac_cv_struct_sockaddr_storage=no])]) -if test "$ac_cv_struct_sockaddr_storage" = yes; then - AC_DEFINE(HAVE_STRUCT_SOCKADDR_STORAGE, 1, -[Define to 1 if defines `struct sockaddr_storage']) -fi]) - diff --git a/m4/m4/sockinttypes.m4 b/m4/m4/sockinttypes.m4 deleted file mode 100644 index 32d40b6..0000000 --- a/m4/m4/sockinttypes.m4 +++ /dev/null @@ -1,154 +0,0 @@ -dnl * -dnl * Copyright (c) 2001, 2003 Motoyuki Kasahara -dnl * -dnl * Redistribution and use in source and binary forms, with or without -dnl * modification, are permitted provided that the following conditions -dnl * are met: -dnl * 1. Redistributions of source code must retain the above copyright -dnl * notice, this list of conditions and the following disclaimer. -dnl * 2. Redistributions in binary form must reproduce the above copyright -dnl * notice, this list of conditions and the following disclaimer in the -dnl * documentation and/or other materials provided with the distribution. -dnl * 3. Neither the name of the project nor the names of its contributors -dnl * may be used to endorse or promote products derived from this software -dnl * without specific prior written permission. -dnl * -dnl * THIS SOFTWARE IS PROVIDED BY THE PROJECT AND CONTRIBUTORS ``AS IS'' AND -dnl * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -dnl * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -dnl * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE PROJECT OR CONTRIBUTORSBE -dnl * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR -dnl * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF -dnl * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -dnl * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN -dnl * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -dnl * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF -dnl * THE POSSIBILITY OF SUCH DAMAGE. -dnl * - -dnl * -dnl * Check for socklen_t. -dnl * -AC_DEFUN([AC_TYPE_SOCKLEN_T], -[AC_CACHE_CHECK([for socklen_t], ac_cv_type_socklen_t, -[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ -#include -#include ]], [[ -socklen_t socklen; -]])],[ac_cv_type_socklen_t=yes],[ac_cv_type_socklen_t=no])]) -if test "$ac_cv_type_socklen_t" != yes; then - AC_DEFINE(socklen_t, int, -[Define to `int' if or does not define.]) -fi]) - -dnl * -dnl * Check for in_port_t. -dnl * -AC_DEFUN([AC_TYPE_IN_PORT_T], -[AC_CACHE_CHECK([for in_port_t], ac_cv_type_in_port_t, -[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ -#include -#include -#include ]], [[ -in_port_t in_port; -]])],[ac_cv_type_in_port_t=yes],[ac_cv_type_in_port_t=no])]) -if test "$ac_cv_type_in_port_t" != yes; then - ac_cv_sin_port_size=unknown - AC_RUN_IFELSE([AC_LANG_SOURCE([[ - #include - #include - #include - int main() { - struct sockaddr_in addr; - return (sizeof(addr.sin_port) == sizeof(long)) ? 0 : 1; - } - ]])],[ac_cv_sin_port_size=long],[],[]) - AC_RUN_IFELSE([AC_LANG_SOURCE([[ - #include - #include - #include - int main() { - struct sockaddr_in addr; - return (sizeof(addr.sin_port) == sizeof(int)) ? 0 : 1; - } - ]])],[ac_cv_sin_port_size=int],[],[]) - AC_RUN_IFELSE([AC_LANG_SOURCE([[ - #include - #include - #include - int main() { - struct sockaddr_in addr; - return (sizeof(addr.sin_port) == sizeof(short)) ? 0 : 1; - } - ]])],[ac_cv_sin_port_size=short],[],[]) - AC_RUN_IFELSE([AC_LANG_SOURCE([[ - #include - #include - #include - int main() { - struct sockaddr_in addr; - return (sizeof(addr.sin_port) == sizeof(char)) ? 0 : 1; - } - ]])],[ac_cv_sin_port_size=char],[],[]) - if test "$ac_cv_sin_port_size" = unknown; then - AC_MSG_ERROR([Failed to get size of sin_port in struct sockaddr_in.]) - fi - AC_DEFINE_UNQUOTED(in_port_t, unsigned $ac_cv_sin_port_size, -[Define to `unsigned char', `unsigned short', `unsigned int' or -`unsigned long' according with size of `sin_port' in `struct sockaddr_in', -if , or does not define -`in_port_t'.]) -fi]) - -dnl * -dnl * Check for sa_family_t. -dnl * -AC_DEFUN([AC_TYPE_SA_FAMILY_T], -[AC_CACHE_CHECK([for sa_family_t], ac_cv_type_sa_family_t, -[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ -#include -#include ]], [[ -sa_family_t sa_family; -]])],[ac_cv_type_sa_family_t=yes],[ac_cv_type_sa_family_t=no])]) -if test "$ac_cv_type_sa_family_t" != yes; then - ac_cv_sa_family_size=unknown - AC_RUN_IFELSE([AC_LANG_SOURCE([[ - #include - #include - int main() { - struct sockaddr addr; - return (sizeof(addr.sa_family) == sizeof(long)) ? 0 : 1; - } - ]])],[ac_cv_sa_family_size=long],[],[]) - AC_RUN_IFELSE([AC_LANG_SOURCE([[ - #include - #include - int main() { - struct sockaddr addr; - return (sizeof(addr.sa_family) == sizeof(int)) ? 0 : 1; - } - ]])],[ac_cv_sa_family_size=int],[],[]) - AC_RUN_IFELSE([AC_LANG_SOURCE([[ - #include - #include - int main() { - struct sockaddr addr; - return (sizeof(addr.sa_family) == sizeof(short)) ? 0 : 1; - } - ]])],[ac_cv_sa_family_size=short],[],[]) - AC_RUN_IFELSE([AC_LANG_SOURCE([[ - #include - #include - int main() { - struct sockaddr addr; - return (sizeof(addr.sa_family) == sizeof(char)) ? 0 : 1; - } - ]])],[ac_cv_sa_family_size=char],[],[]) - if test "$ac_cv_sa_family_size" = unknown; then - AC_MSG_ERROR([Failed to get size of sa_family in struct sockaddr.]) - fi - AC_DEFINE_UNQUOTED(sa_family_t, unsigned $ac_cv_sa_family_size, -[Define to `unsigned char', `unsigned short', `unsigned int' or -`unsigned long' according with size of `sa_family' in `struct sockaddr', -if or does not define `sa_family_t'.]) -fi])