diff options
author | Simon Josefsson <simon@josefsson.org> | 2009-08-12 09:07:16 +0200 |
---|---|---|
committer | Simon Josefsson <simon@josefsson.org> | 2009-08-12 09:07:16 +0200 |
commit | 7cab871fb2d130250a5fd6c2b73603fdacd792ae (patch) | |
tree | 921fdbf6beb0f4ea9a35c866082b791b3ebae0bc | |
parent | 729e87c3a7987bd4089013f178978faeda080648 (diff) | |
download | gnutls-7cab871fb2d130250a5fd6c2b73603fdacd792ae.tar.gz |
Use include instead of copy.
-rw-r--r-- | libextra/Makefile.am | 2 | ||||
-rw-r--r-- | libextra/gl/m4/sockets.m4 | 90 |
2 files changed, 1 insertions, 91 deletions
diff --git a/libextra/Makefile.am b/libextra/Makefile.am index 6ecc055b74..28200c22b1 100644 --- a/libextra/Makefile.am +++ b/libextra/Makefile.am @@ -20,7 +20,7 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA # 02110-1301, USA. -ACLOCAL_AMFLAGS = -I m4 -I gl/m4 -I ../lib/m4 +ACLOCAL_AMFLAGS = -I m4 -I gl/m4 -I ../lib/m4 -I ../lib/gl/m4 AM_CFLAGS = $(WERROR_CFLAGS) $(WSTACK_CFLAGS) $(WARN_CFLAGS) AM_CPPFLAGS = \ diff --git a/libextra/gl/m4/sockets.m4 b/libextra/gl/m4/sockets.m4 deleted file mode 100644 index db71bf14a0..0000000000 --- a/libextra/gl/m4/sockets.m4 +++ /dev/null @@ -1,90 +0,0 @@ -# sockets.m4 serial 5 -dnl Copyright (C) 2008, 2009 Free Software Foundation, Inc. -dnl This file is free software; the Free Software Foundation -dnl gives unlimited permission to copy and/or distribute it, -dnl with or without modifications, as long as this notice is preserved. - -AC_DEFUN([gl_SOCKETS], -[ - AC_REQUIRE([AC_C_INLINE]) - - gl_PREREQ_SYS_H_WINSOCK2 dnl for HAVE_WINSOCK2_H - LIBSOCKET= - if test $HAVE_WINSOCK2_H = 1; then - dnl Native Windows API (not Cygwin). - AC_CACHE_CHECK([if we need to call WSAStartup in winsock2.h and -lws2_32], - [gl_cv_func_wsastartup], [ - gl_save_LIBS="$LIBS" - LIBS="$LIBS -lws2_32" - AC_TRY_LINK([ -#ifdef HAVE_WINSOCK2_H -# include <winsock2.h> -#endif], [ - WORD wVersionRequested = MAKEWORD(1, 1); - WSADATA wsaData; - int err = WSAStartup(wVersionRequested, &wsaData); - WSACleanup ();], - gl_cv_func_wsastartup=yes, gl_cv_func_wsastartup=no) - LIBS="$gl_save_LIBS" - ]) - if test "$gl_cv_func_wsastartup" = "yes"; then - AC_DEFINE([WINDOWS_SOCKETS], [1], [Define if WSAStartup is needed.]) - LIBSOCKET='-lws2_32' - fi - else - dnl Unix API. - dnl Solaris has most socket functions in libsocket. - dnl Haiku has most socket functions in libnetwork. - dnl BeOS has most socket functions in libnet. - AC_CACHE_CHECK([for library containing setsockopt], [gl_cv_lib_socket], [ - gl_cv_lib_socket= - AC_TRY_LINK([extern -#ifdef __cplusplus -"C" -#endif -char setsockopt();], [setsockopt();], - [], - [gl_save_LIBS="$LIBS" - LIBS="$gl_save_LIBS -lsocket" - AC_TRY_LINK([extern -#ifdef __cplusplus -"C" -#endif -char setsockopt();], [setsockopt();], - [gl_cv_lib_socket="-lsocket"]) - if test -z "$gl_cv_lib_socket"; then - LIBS="$gl_save_LIBS -lnetwork" - AC_TRY_LINK([extern -#ifdef __cplusplus -"C" -#endif -char setsockopt();], [setsockopt();], - [gl_cv_lib_socket="-lnetwork"]) - if test -z "$gl_cv_lib_socket"; then - LIBS="$gl_save_LIBS -lnet" - AC_TRY_LINK([extern -#ifdef __cplusplus -"C" -#endif -char setsockopt();], [setsockopt();], - [gl_cv_lib_socket="-lnet"]) - fi - fi - LIBS="$gl_save_LIBS" - ]) - if test -z "$gl_cv_lib_socket"; then - gl_cv_lib_socket="none needed" - fi - ]) - if test "$gl_cv_lib_socket" != "none needed"; then - LIBSOCKET="$gl_cv_lib_socket" - fi - fi - AC_SUBST([LIBSOCKET]) - gl_PREREQ_SOCKETS -]) - -# Prerequisites of lib/sockets.c. -AC_DEFUN([gl_PREREQ_SOCKETS], [ - : -]) |