[GNUnet-SVN] r27463 - in gnunet: . src/include

[gnunet]

Author: amatus
Date: 2013-06-18 04:51:15 +0200 (Tue, 18 Jun 2013)
New Revision: 27463

Modified:
   gnunet/configure.ac
   gnunet/src/include/platform.h
Log:
Compile on platforms without netinet/ip.h. Furthur fixes to come.


Modified: gnunet/configure.ac
===================================================================
--- gnunet/configure.ac 2013-06-18 02:49:20 UTC (rev 27462)
+++ gnunet/configure.ac 2013-06-18 02:51:15 UTC (rev 27463)
@@ -495,7 +495,7 @@
 AC_CHECK_HEADERS([fcntl.h math.h errno.h ctype.h limits.h stdio.h stdlib.h 
string.h unistd.h stdarg.h signal.h locale.h sys/stat.h 
sys/types.h],,AC_MSG_ERROR([Compiling GNUnet requires standard UNIX headers 
files]))
 
 # Checks for headers that are only required on some systems or opional (and 
where we do NOT abort if they are not there)
-AC_CHECK_HEADERS([malloc.h malloc/malloc.h langinfo.h sys/param.h sys/mount.h 
sys/statvfs.h sys/select.h sockLib.h sys/mman.h sys/msg.h sys/vfs.h arpa/inet.h 
fcntl.h libintl.h netdb.h netinet/in.h netinet/in_systm.h sys/ioctl.h 
sys/socket.h sys/time.h unistd.h kstat.h sys/sysinfo.h kvm.h sys/file.h 
sys/resource.h ifaddrs.h mach/mach.h stddef.h sys/timeb.h terminos.h argz.h 
ucred.h endian.h sys/endian.h execinfo.h])
+AC_CHECK_HEADERS([malloc.h malloc/malloc.h langinfo.h sys/param.h sys/mount.h 
sys/statvfs.h sys/select.h sockLib.h sys/mman.h sys/msg.h sys/vfs.h arpa/inet.h 
fcntl.h libintl.h netdb.h netinet/in.h netinet/in_systm.h netinet/ip.h 
sys/ioctl.h sys/socket.h sys/time.h unistd.h kstat.h sys/sysinfo.h kvm.h 
sys/file.h sys/resource.h ifaddrs.h mach/mach.h stddef.h sys/timeb.h terminos.h 
argz.h ucred.h endian.h sys/endian.h execinfo.h])
 
 SAVE_LDFLAGS=$LDFLAGS
 SAVE_CPPFLAGS=$CPPFLAGS

Modified: gnunet/src/include/platform.h
===================================================================
--- gnunet/src/include/platform.h       2013-06-18 02:49:20 UTC (rev 27462)
+++ gnunet/src/include/platform.h       2013-06-18 02:51:15 UTC (rev 27463)
@@ -86,7 +86,9 @@
 #if HAVE_NETINET_IN_SYSTM_H
 #include <netinet/in_systm.h>
 #endif
+#if HAVE_NETINET_IP_H
 #include <netinet/ip.h>         /* superset of previous */
+#endif
 #include <arpa/inet.h>
 #include <netinet/tcp.h>
 #include <pwd.h>