[pkgsrc/trunk]: pkgsrc/pkgtools/libnbcompat/files OpenBSD headers are still n...

[joerg <joerg%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/2e6723ceaef5
branches:  trunk
changeset: 549789:2e6723ceaef5
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Sat Nov 08 21:35:57 2008 +0000

description:
OpenBSD headers are still not standalone, even though SUS is pretty
explicit about it at least for netinet/in.h. Include sys/types.h before
checking for content of sys/socket.h and netinet/in.h to fix this.
Reported and tested by Georg Schwarz.

diffstat:

 pkgtools/libnbcompat/files/configure    |  34 +++++++++++++++++++++++++++++++++
 pkgtools/libnbcompat/files/configure.ac |  27 +++++++++++++++++++++----
 2 files changed, 56 insertions(+), 5 deletions(-)

diffs (151 lines):

diff -r 61da4ed7db8b -r 2e6723ceaef5 pkgtools/libnbcompat/files/configure
--- a/pkgtools/libnbcompat/files/configure      Sat Nov 08 21:18:35 2008 +0000
+++ b/pkgtools/libnbcompat/files/configure      Sat Nov 08 21:35:57 2008 +0000
@@ -10506,8 +10506,13 @@
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
+#ifdef HAVE_SYS_TYPES_H
+# include <sys/types.h>
+#endif
+
 #include <sys/socket.h>
 
+
 int
 main ()
 {
@@ -10541,8 +10546,13 @@
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
+#ifdef HAVE_SYS_TYPES_H
+# include <sys/types.h>
+#endif
+
 #include <sys/socket.h>
 
+
 int
 main ()
 {
@@ -10716,8 +10726,12 @@
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
+#ifdef HAVE_SYS_TYPES_H
+# include <sys/types.h>
+#endif
 #include <netinet/in.h>
 
+
 int
 main ()
 {
@@ -10751,8 +10765,12 @@
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
+#ifdef HAVE_SYS_TYPES_H
+# include <sys/types.h>
+#endif
 #include <netinet/in.h>
 
+
 int
 main ()
 {
@@ -10821,8 +10839,12 @@
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
+#ifdef HAVE_SYS_TYPES_H
+# include <sys/types.h>
+#endif
 #include <netinet/in.h>
 
+
 int
 main ()
 {
@@ -10856,8 +10878,12 @@
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
+#ifdef HAVE_SYS_TYPES_H
+# include <sys/types.h>
+#endif
 #include <netinet/in.h>
 
+
 int
 main ()
 {
@@ -10926,8 +10952,12 @@
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
+#ifdef HAVE_SYS_TYPES_H
+# include <sys/types.h>
+#endif
 #include <sys/socket.h>
 
+
 int
 main ()
 {
@@ -10961,8 +10991,12 @@
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
+#ifdef HAVE_SYS_TYPES_H
+# include <sys/types.h>
+#endif
 #include <sys/socket.h>
 
+
 int
 main ()
 {
diff -r 61da4ed7db8b -r 2e6723ceaef5 pkgtools/libnbcompat/files/configure.ac
--- a/pkgtools/libnbcompat/files/configure.ac   Sat Nov 08 21:18:35 2008 +0000
+++ b/pkgtools/libnbcompat/files/configure.ac   Sat Nov 08 21:35:57 2008 +0000
@@ -1,4 +1,4 @@
-dnl $NetBSD: configure.ac,v 1.69 2008/10/26 12:31:30 joerg Exp $
+dnl $NetBSD: configure.ac,v 1.70 2008/11/08 21:35:58 joerg Exp $
 
 dnl Process this file with autoconf to produce a configure script.
 AC_PREREQ(2.52)
@@ -256,11 +256,28 @@
 AC_CHECK_LIB(nsl, gethostbyname)
 
 need_getaddrinfo=no
-AC_CHECK_TYPES([socklen_t], [], [], [[#include <sys/socket.h>]])
+AC_CHECK_TYPES([socklen_t], [], [], [[#ifdef HAVE_SYS_TYPES_H
+# include <sys/types.h>
+#endif
+
+#include <sys/socket.h>
+]])
 AC_CHECK_TYPES([struct addrinfo], [], [], [[#include <netdb.h>]])
-AC_CHECK_TYPES([struct in6_addr], [], [], [[#include <netinet/in.h>]])
-AC_CHECK_TYPES([struct sockaddr_in6], [], [], [[#include <netinet/in.h>]])
-AC_CHECK_TYPES([struct sockaddr_storage], [], [], [[#include <sys/socket.h>]])
+AC_CHECK_TYPES([struct in6_addr], [], [], [[#ifdef HAVE_SYS_TYPES_H
+# include <sys/types.h>
+#endif
+#include <netinet/in.h>
+]])
+AC_CHECK_TYPES([struct sockaddr_in6], [], [], [[#ifdef HAVE_SYS_TYPES_H
+# include <sys/types.h>
+#endif
+#include <netinet/in.h>
+]])
+AC_CHECK_TYPES([struct sockaddr_storage], [], [], [[#ifdef HAVE_SYS_TYPES_H
+# include <sys/types.h>
+#endif
+#include <sys/socket.h>
+]])
 dnl Assume that freeaddrinfo is only missing if getaddrinfo is also missing
 AC_CHECK_FUNCS([getnameinfo gai_strerror getaddrinfo], [:],
     [need_getaddrinfo=yes])