mirror of
https://git.openldap.org/openldap/openldap.git
synced 2025-12-22 07:39:35 -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
66
configure
vendored
66
configure
vendored
|
|
@ -13972,7 +13972,6 @@ fi
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
for ac_header in \
|
for ac_header in \
|
||||||
|
|
@ -13992,7 +13991,6 @@ for ac_header in \
|
||||||
libutil.h \
|
libutil.h \
|
||||||
limits.h \
|
limits.h \
|
||||||
locale.h \
|
locale.h \
|
||||||
netinet/tcp.h \
|
|
||||||
malloc.h \
|
malloc.h \
|
||||||
memory.h \
|
memory.h \
|
||||||
psap.h \
|
psap.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
|
for ac_header in sys/ucred.h
|
||||||
do
|
do
|
||||||
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
|
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
|
||||||
|
|
|
||||||
10
configure.in
10
configure.in
|
|
@ -881,7 +881,6 @@ AC_CHECK_HEADERS( \
|
||||||
libutil.h \
|
libutil.h \
|
||||||
limits.h \
|
limits.h \
|
||||||
locale.h \
|
locale.h \
|
||||||
netinet/tcp.h \
|
|
||||||
malloc.h \
|
malloc.h \
|
||||||
memory.h \
|
memory.h \
|
||||||
psap.h \
|
psap.h \
|
||||||
|
|
@ -915,9 +914,14 @@ AC_CHECK_HEADERS( \
|
||||||
)
|
)
|
||||||
|
|
||||||
AC_CHECK_HEADERS( resolv.h, [], [],
|
AC_CHECK_HEADERS( resolv.h, [], [],
|
||||||
[$ac_includes_default]
|
[$ac_includes_default
|
||||||
#include <netinet/in.h>
|
#include <netinet/in.h>
|
||||||
)
|
])
|
||||||
|
|
||||||
|
AC_CHECK_HEADERS( netinet/tcp.h, [], [],
|
||||||
|
[$ac_includes_default
|
||||||
|
#include <netinet/in.h>
|
||||||
|
])
|
||||||
|
|
||||||
AC_CHECK_HEADERS( sys/ucred.h, [], [],
|
AC_CHECK_HEADERS( sys/ucred.h, [], [],
|
||||||
[$ac_includes_default
|
[$ac_includes_default
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue