Attachment #25699 for bug #42848

View | Details | Raw Unified | Return to bug 42848
Collapse All | Expand All

Lines 82-87 Link Here

(-)include/apr.h.in (+2 lines)
82	#define APR_HAVE_MSWSOCK_H @mswsockh@	82	#define APR_HAVE_MSWSOCK_H @mswsockh@
83	#define APR_HAVE_NETDB_H @netdbh@	83	#define APR_HAVE_NETDB_H @netdbh@
84	#define APR_HAVE_NETINET_IN_H @netinet_inh@	84	#define APR_HAVE_NETINET_IN_H @netinet_inh@
		85	#define APR_HAVE_NETINET_IN_SYSTM_H @netinet_insystmh@
		86	#define APR_HAVE_NETINET_IP_H @netinet_iph@
85	#define APR_HAVE_NETINET_SCTP_H @netinet_sctph@	87	#define APR_HAVE_NETINET_SCTP_H @netinet_sctph@
86	#define APR_HAVE_NETINET_SCTP_UIO_H @netinet_sctp_uioh@	88	#define APR_HAVE_NETINET_SCTP_UIO_H @netinet_sctp_uioh@
87	#define APR_HAVE_NETINET_TCP_H @netinet_tcph@	89	#define APR_HAVE_NETINET_TCP_H @netinet_tcph@

Lines 127-134 Link Here

(-)include/apr.hw (+2 lines)
127	#define APR_HAVE_MSWSOCK_H APR_NOT_IN_WCE	127	#define APR_HAVE_MSWSOCK_H APR_NOT_IN_WCE
128	#define APR_HAVE_NETDB_H 0	128	#define APR_HAVE_NETDB_H 0
129	#define APR_HAVE_NETINET_IN_H 0	129	#define APR_HAVE_NETINET_IN_H 0
		130	#define APR_HAVE_NETINET_IN_SYSTM_H 0
130	#define APR_HAVE_NETINET_SCTP_H 0	131	#define APR_HAVE_NETINET_SCTP_H 0
131	#define APR_HAVE_NETINET_SCTP_UIO_H 0	132	#define APR_HAVE_NETINET_SCTP_UIO_H 0
		133	#define APR_HAVE_NETINET_IP_H 0
132	#define APR_HAVE_NETINET_TCP_H 0	134	#define APR_HAVE_NETINET_TCP_H 0
133	#define APR_HAVE_PTHREAD_H 0	135	#define APR_HAVE_PTHREAD_H 0
134	#define APR_HAVE_SEMAPHORE_H 0	136	#define APR_HAVE_SEMAPHORE_H 0




    kernel/OS.h		\
    net/errno.h		\
    netinet/in.h	\
    netinet/in_systm.h	\
    netinet/sctp.h      \
    netinet/sctp_uio.h  \
    sys/file.h		\

   netinet_tcph=0
fi

# Debian has a similiar problem with <netinet/ip.h> wihich prevents it
# from being included by itself.  Check for <netinet/ip.h> manually,
# including another header file first.
AC_CACHE_CHECK([for netinet/ip.h], [apr_cv_hdr_netinet_ip_h],
[AC_TRY_CPP(
[#ifdef HAVE_NETINET_IN_H
#include <netinet/in.h>
#endif
#ifdef HAVE_NETINET_IN_SYSTM_H
#include <netinet/in_systm.h>
#endif
#include <netinet/ip.h>
], [apr_cv_hdr_netinet_ip_h=yes], [apr_cv_hdr_netinet_ip_h=no])])
cat conftest.c >> /dev/tty
if test "$apr_cv_hdr_netinet_ip_h" = "yes"; then
   netinet_iph=1
   AC_DEFINE([HAVE_NETINET_IP_H], 1, [Defined if netinet/ip.h is present])
else
   netinet_iph=0
fi

AC_SUBST(arpa_ineth)
AC_SUBST(conioh)
AC_SUBST(ctypeh)

AC_SUBST(mswsockh)
AC_SUBST(netdbh)
AC_SUBST(netinet_inh)
AC_SUBST(netinet_insystmh)
AC_SUBST(netinet_iph)
AC_SUBST(netinet_sctph)
AC_SUBST(netinet_sctp_uioh)
AC_SUBST(netinet_tcph)

Return to bug 42848

Lines 1260-1265 Link Here

(-)configure.in (+24 lines)
1260	kernel/OS.h \	1260	kernel/OS.h \
1261	net/errno.h \	1261	net/errno.h \
1262	netinet/in.h \	1262	netinet/in.h \
		1263	netinet/in_systm.h \
1263	netinet/sctp.h \	1264	netinet/sctp.h \
1264	netinet/sctp_uio.h \	1265	netinet/sctp_uio.h \
1265	sys/file.h \	1266	sys/file.h \
Lines 1300-1305 Link Here
1300	netinet_tcph=0	1301	netinet_tcph=0
1301	fi	1302	fi
1302		1303
		1304	# Debian has a similiar problem with <netinet/ip.h> wihich prevents it
		1305	# from being included by itself. Check for <netinet/ip.h> manually,
		1306	# including another header file first.
		1307	AC_CACHE_CHECK([for netinet/ip.h], [apr_cv_hdr_netinet_ip_h],
		1308	[AC_TRY_CPP(
		1309	[#ifdef HAVE_NETINET_IN_H
		1310	#include <netinet/in.h>
		1311	#endif
		1312	#ifdef HAVE_NETINET_IN_SYSTM_H
		1313	#include <netinet/in_systm.h>
		1314	#endif
		1315	#include <netinet/ip.h>
		1316	], [apr_cv_hdr_netinet_ip_h=yes], [apr_cv_hdr_netinet_ip_h=no])])
		1317	cat conftest.c >> /dev/tty
		1318	if test "$apr_cv_hdr_netinet_ip_h" = "yes"; then
		1319	netinet_iph=1
		1320	AC_DEFINE([HAVE_NETINET_IP_H], 1, [Defined if netinet/ip.h is present])
		1321	else
		1322	netinet_iph=0
		1323	fi
		1324
1303	AC_SUBST(arpa_ineth)	1325	AC_SUBST(arpa_ineth)
1304	AC_SUBST(conioh)	1326	AC_SUBST(conioh)
1305	AC_SUBST(ctypeh)	1327	AC_SUBST(ctypeh)
Lines 1313-1318 Link Here
1313	AC_SUBST(mswsockh)	1335	AC_SUBST(mswsockh)
1314	AC_SUBST(netdbh)	1336	AC_SUBST(netdbh)
1315	AC_SUBST(netinet_inh)	1337	AC_SUBST(netinet_inh)
		1338	AC_SUBST(netinet_insystmh)
		1339	AC_SUBST(netinet_iph)
1316	AC_SUBST(netinet_sctph)	1340	AC_SUBST(netinet_sctph)
1317	AC_SUBST(netinet_sctp_uioh)	1341	AC_SUBST(netinet_sctp_uioh)
1318	AC_SUBST(netinet_tcph)	1342	AC_SUBST(netinet_tcph)