mirror of
git://anongit.mindrot.org/openssh.git
synced 2024-12-13 21:53:47 +08:00
13aae5ee76
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>
87 lines
2.4 KiB
Plaintext
87 lines
2.4 KiB
Plaintext
dnl $Id: aclocal.m4,v 1.5 2001/10/22 00:53:59 tim Exp $
|
|
dnl
|
|
dnl OpenSSH-specific autoconf macros
|
|
dnl
|
|
|
|
|
|
dnl OSSH_CHECK_HEADER_FOR_FIELD(field, header, symbol)
|
|
dnl Does AC_EGREP_HEADER on 'header' for the string 'field'
|
|
dnl If found, set 'symbol' to be defined. Cache the result.
|
|
dnl TODO: This is not foolproof, better to compile and read from there
|
|
AC_DEFUN(OSSH_CHECK_HEADER_FOR_FIELD, [
|
|
# look for field '$1' in header '$2'
|
|
dnl This strips characters illegal to m4 from the header filename
|
|
ossh_safe=`echo "$2" | sed 'y%./+-%__p_%'`
|
|
dnl
|
|
ossh_varname="ossh_cv_$ossh_safe""_has_"$1
|
|
AC_MSG_CHECKING(for $1 field in $2)
|
|
AC_CACHE_VAL($ossh_varname, [
|
|
AC_EGREP_HEADER($1, $2, [ dnl
|
|
eval "$ossh_varname=yes" dnl
|
|
], [ dnl
|
|
eval "$ossh_varname=no" dnl
|
|
]) dnl
|
|
])
|
|
ossh_result=`eval 'echo $'"$ossh_varname"`
|
|
if test -n "`echo $ossh_varname`"; then
|
|
AC_MSG_RESULT($ossh_result)
|
|
if test "x$ossh_result" = "xyes"; then
|
|
AC_DEFINE($3)
|
|
fi
|
|
else
|
|
AC_MSG_RESULT(no)
|
|
fi
|
|
])
|
|
|
|
dnl OSSH_PATH_ENTROPY_PROG(variablename, command):
|
|
dnl Tidiness function, sets 'undef' if not found, and does the AC_SUBST
|
|
AC_DEFUN(OSSH_PATH_ENTROPY_PROG, [
|
|
AC_PATH_PROG($1, $2)
|
|
if test -z "[$]$1" ; then
|
|
$1="undef"
|
|
fi
|
|
AC_SUBST($1)
|
|
])
|
|
|
|
dnl Check for socklen_t: historically on BSD it is an int, and in
|
|
dnl POSIX 1g it is a type of its own, but some platforms use different
|
|
dnl types for the argument to getsockopt, getpeername, etc. So we
|
|
dnl have to test to find something that will work.
|
|
AC_DEFUN([TYPE_SOCKLEN_T],
|
|
[
|
|
AC_CHECK_TYPE([socklen_t], ,[
|
|
AC_MSG_CHECKING([for socklen_t equivalent])
|
|
AC_CACHE_VAL([curl_cv_socklen_t_equiv],
|
|
[
|
|
# Systems have either "struct sockaddr *" or
|
|
# "void *" as the second argument to getpeername
|
|
curl_cv_socklen_t_equiv=
|
|
for arg2 in "struct sockaddr" void; do
|
|
for t in int size_t unsigned long "unsigned long"; do
|
|
AC_TRY_COMPILE([
|
|
#include <sys/types.h>
|
|
#include <sys/socket.h>
|
|
|
|
int getpeername (int, $arg2 *, $t *);
|
|
],[
|
|
$t len;
|
|
getpeername(0,0,&len);
|
|
],[
|
|
curl_cv_socklen_t_equiv="$t"
|
|
break
|
|
])
|
|
done
|
|
done
|
|
|
|
if test "x$curl_cv_socklen_t_equiv" = x; then
|
|
AC_MSG_ERROR([Cannot find a type to use in place of socklen_t])
|
|
fi
|
|
])
|
|
AC_MSG_RESULT($curl_cv_socklen_t_equiv)
|
|
AC_DEFINE_UNQUOTED(socklen_t, $curl_cv_socklen_t_equiv,
|
|
[type to use in place of socklen_t if not defined])],
|
|
[#include <sys/types.h>
|
|
#include <sys/socket.h>])
|
|
])
|
|
|