mirror of
https://git.openldap.org/openldap/openldap.git
synced 2025-12-20 22:59:34 -05:00
ITS#4312: fixed <netinet/tcp.h> detection for AIX and other
platforms where it requires <netinet/in.h> to be previously included.
This commit is contained in:
parent
8d93570cdf
commit
1637faa1ff
2 changed files with 85 additions and 19 deletions
78
configure
vendored
78
configure
vendored
|
|
@ -13972,14 +13972,13 @@ fi
|
|||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
for ac_header in \
|
||||
arpa/inet.h \
|
||||
arpa/nameser.h \
|
||||
arpa/nameser.h \
|
||||
assert.h \
|
||||
bits/types.h \
|
||||
bits/types.h \
|
||||
conio.h \
|
||||
crypt.h \
|
||||
direct.h \
|
||||
|
|
@ -13992,7 +13991,6 @@ for ac_header in \
|
|||
libutil.h \
|
||||
limits.h \
|
||||
locale.h \
|
||||
netinet/tcp.h \
|
||||
malloc.h \
|
||||
memory.h \
|
||||
psap.h \
|
||||
|
|
@ -14009,11 +14007,11 @@ for ac_header in \
|
|||
sys/errno.h \
|
||||
sys/ioctl.h \
|
||||
sys/param.h \
|
||||
sys/resource.h \
|
||||
sys/select.h \
|
||||
sys/socket.h \
|
||||
sys/resource.h \
|
||||
sys/select.h \
|
||||
sys/socket.h \
|
||||
sys/stat.h \
|
||||
sys/syslog.h \
|
||||
sys/syslog.h \
|
||||
sys/time.h \
|
||||
sys/types.h \
|
||||
sys/uio.h \
|
||||
|
|
@ -14238,6 +14236,70 @@ done
|
|||
|
||||
|
||||
|
||||
for ac_header in netinet/tcp.h
|
||||
do
|
||||
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
|
||||
echo "$as_me:$LINENO: checking for $ac_header" >&5
|
||||
echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
|
||||
if eval "test \"\${$as_ac_Header+set}\" = set"; then
|
||||
echo $ECHO_N "(cached) $ECHO_C" >&6
|
||||
else
|
||||
cat >conftest.$ac_ext <<_ACEOF
|
||||
/* confdefs.h. */
|
||||
_ACEOF
|
||||
cat confdefs.h >>conftest.$ac_ext
|
||||
cat >>conftest.$ac_ext <<_ACEOF
|
||||
/* end confdefs.h. */
|
||||
$ac_includes_default
|
||||
#include <netinet/in.h>
|
||||
|
||||
|
||||
#include <$ac_header>
|
||||
_ACEOF
|
||||
rm -f conftest.$ac_objext
|
||||
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
|
||||
(eval $ac_compile) 2>conftest.er1
|
||||
ac_status=$?
|
||||
grep -v '^ *+' conftest.er1 >conftest.err
|
||||
rm -f conftest.er1
|
||||
cat conftest.err >&5
|
||||
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
(exit $ac_status); } &&
|
||||
{ ac_try='test -z "$ac_c_werror_flag"
|
||||
|| test ! -s conftest.err'
|
||||
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
||||
(eval $ac_try) 2>&5
|
||||
ac_status=$?
|
||||
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
(exit $ac_status); }; } &&
|
||||
{ ac_try='test -s conftest.$ac_objext'
|
||||
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
||||
(eval $ac_try) 2>&5
|
||||
ac_status=$?
|
||||
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
(exit $ac_status); }; }; then
|
||||
eval "$as_ac_Header=yes"
|
||||
else
|
||||
echo "$as_me: failed program was:" >&5
|
||||
sed 's/^/| /' conftest.$ac_ext >&5
|
||||
|
||||
eval "$as_ac_Header=no"
|
||||
fi
|
||||
rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
|
||||
fi
|
||||
echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
|
||||
echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
|
||||
if test `eval echo '${'$as_ac_Header'}'` = yes; then
|
||||
cat >>confdefs.h <<_ACEOF
|
||||
#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
|
||||
_ACEOF
|
||||
|
||||
fi
|
||||
|
||||
done
|
||||
|
||||
|
||||
|
||||
for ac_header in sys/ucred.h
|
||||
do
|
||||
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
|
||||
|
|
|
|||
26
configure.in
26
configure.in
|
|
@ -864,11 +864,11 @@ AC_HEADER_DIRENT
|
|||
AC_HEADER_SYS_WAIT
|
||||
AC_HEADER_TIOCGWINSZ
|
||||
|
||||
AC_CHECK_HEADERS( \
|
||||
AC_CHECK_HEADERS( \
|
||||
arpa/inet.h \
|
||||
arpa/nameser.h \
|
||||
arpa/nameser.h \
|
||||
assert.h \
|
||||
bits/types.h \
|
||||
bits/types.h \
|
||||
conio.h \
|
||||
crypt.h \
|
||||
direct.h \
|
||||
|
|
@ -881,7 +881,6 @@ AC_CHECK_HEADERS( \
|
|||
libutil.h \
|
||||
limits.h \
|
||||
locale.h \
|
||||
netinet/tcp.h \
|
||||
malloc.h \
|
||||
memory.h \
|
||||
psap.h \
|
||||
|
|
@ -898,11 +897,11 @@ AC_CHECK_HEADERS( \
|
|||
sys/errno.h \
|
||||
sys/ioctl.h \
|
||||
sys/param.h \
|
||||
sys/resource.h \
|
||||
sys/select.h \
|
||||
sys/socket.h \
|
||||
sys/resource.h \
|
||||
sys/select.h \
|
||||
sys/socket.h \
|
||||
sys/stat.h \
|
||||
sys/syslog.h \
|
||||
sys/syslog.h \
|
||||
sys/time.h \
|
||||
sys/types.h \
|
||||
sys/uio.h \
|
||||
|
|
@ -915,11 +914,16 @@ AC_CHECK_HEADERS( \
|
|||
)
|
||||
|
||||
AC_CHECK_HEADERS( resolv.h, [], [],
|
||||
[$ac_includes_default]
|
||||
[$ac_includes_default
|
||||
#include <netinet/in.h>
|
||||
)
|
||||
])
|
||||
|
||||
AC_CHECK_HEADERS(sys/ucred.h, [], [],
|
||||
AC_CHECK_HEADERS( netinet/tcp.h, [], [],
|
||||
[$ac_includes_default
|
||||
#include <netinet/in.h>
|
||||
])
|
||||
|
||||
AC_CHECK_HEADERS( sys/ucred.h, [], [],
|
||||
[$ac_includes_default
|
||||
#ifdef HAVE_SYS_PARAM_H
|
||||
#include <sys/param.h>
|
||||
|
|
|
|||
Loading…
Reference in a new issue