summaryrefslogtreecommitdiff
path: root/aclocal.m4
diff options
context:
space:
mode:
authorTim Rice <tim@multitalents.net>2001-10-21 17:53:58 -0700
committerTim Rice <tim@multitalents.net>2001-10-21 17:53:58 -0700
commit13aae5ee7673a0b75369256e7ed6117f9f1b6c7d (patch)
tree5bada50a28a0d33e8907cf0f288a10d57931f0f8 /aclocal.m4
parentf2366b5a7d3cc9f7ad4dc6b89e30853b474bccec (diff)
[configure.in] Clean up library testing.
Add optional PATH to --with-pcre, --with-zlib, --with-tcp-wrappers based on patch by albert chin (china@thewrittenword.com) Re-arange AC_CHECK_HEADERS and AC_CHECK_FUNCS for eaiser reading of patches to configure.in Replace obsolete AC_STRUCT_ST_BLKSIZE with AC_CHECK_MEMBERS Add test for broken dirname() on Solaris 2.5.1 by Dan Astoorian <djast@cs.toronto.edu> [acconfig.h aclocal.m4 defines.h configure.in] Better socklen_t patch by albert chin (china@thewrittenword.com) [scp.c] Replace obsolete HAVE_ST_BLKSIZE with HAVE_STRUCT_STAT_ST_BLKSIZE [Makefile.in] When running make in top level, always do make in openbsd-compat patch by Dave Dykstra <dwd@bell-labs.com>
Diffstat (limited to 'aclocal.m4')
-rw-r--r--aclocal.m443
1 files changed, 42 insertions, 1 deletions
diff --git a/aclocal.m4 b/aclocal.m4
index d196b7585..2705a9b23 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,4 +1,4 @@
1dnl $Id: aclocal.m4,v 1.4 2000/06/26 00:20:19 djm Exp $ 1dnl $Id: aclocal.m4,v 1.5 2001/10/22 00:53:59 tim Exp $
2dnl 2dnl
3dnl OpenSSH-specific autoconf macros 3dnl OpenSSH-specific autoconf macros
4dnl 4dnl
@@ -43,3 +43,44 @@ AC_DEFUN(OSSH_PATH_ENTROPY_PROG, [
43 AC_SUBST($1) 43 AC_SUBST($1)
44]) 44])
45 45
46dnl Check for socklen_t: historically on BSD it is an int, and in
47dnl POSIX 1g it is a type of its own, but some platforms use different
48dnl types for the argument to getsockopt, getpeername, etc. So we
49dnl have to test to find something that will work.
50AC_DEFUN([TYPE_SOCKLEN_T],
51[
52 AC_CHECK_TYPE([socklen_t], ,[
53 AC_MSG_CHECKING([for socklen_t equivalent])
54 AC_CACHE_VAL([curl_cv_socklen_t_equiv],
55 [
56 # Systems have either "struct sockaddr *" or
57 # "void *" as the second argument to getpeername
58 curl_cv_socklen_t_equiv=
59 for arg2 in "struct sockaddr" void; do
60 for t in int size_t unsigned long "unsigned long"; do
61 AC_TRY_COMPILE([
62 #include <sys/types.h>
63 #include <sys/socket.h>
64
65 int getpeername (int, $arg2 *, $t *);
66 ],[
67 $t len;
68 getpeername(0,0,&len);
69 ],[
70 curl_cv_socklen_t_equiv="$t"
71 break
72 ])
73 done
74 done
75
76 if test "x$curl_cv_socklen_t_equiv" = x; then
77 AC_MSG_ERROR([Cannot find a type to use in place of socklen_t])
78 fi
79 ])
80 AC_MSG_RESULT($curl_cv_socklen_t_equiv)
81 AC_DEFINE_UNQUOTED(socklen_t, $curl_cv_socklen_t_equiv,
82 [type to use in place of socklen_t if not defined])],
83 [#include <sys/types.h>
84#include <sys/socket.h>])
85])
86