[GNUnet-SVN] r33069 - in gnunet: . po

[gnunet]

Author: grothoff
Date: 2014-04-14 19:48:30 +0200 (Mon, 14 Apr 2014)
New Revision: 33069

Modified:
   gnunet/configure.ac
   gnunet/po/POTFILES.in
Log:
-attempting fix for FreeBSD configure error on netinet/ip.h reported by JS

Modified: gnunet/configure.ac
===================================================================
--- gnunet/configure.ac 2014-04-14 16:21:43 UTC (rev 33068)
+++ gnunet/configure.ac 2014-04-14 17:48:30 UTC (rev 33069)
@@ -614,8 +614,21 @@
 
 
 # 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 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 sys/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 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 sys/ucred.h endian.h 
sys/endian.h execinfo.h])
 
+# FreeBSD requires something more funky for netinet/in_systm.h and 
netinet/ip.h...
+AC_CHECK_HEADERS([sys/types.h netinet/in_systm.h netinet/in.h netinet/ip.h],,,
+[#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+#ifdef HAVE_NETINET_IN_SYSTM_H
+#include <netinet/in_systm.h>
+#endif
+#ifdef HAVE_NETINET_IN_H
+#include <netinet/in.h>
+#endif
+])
+
 SAVE_LDFLAGS=$LDFLAGS
 SAVE_CPPFLAGS=$CPPFLAGS
 

Modified: gnunet/po/POTFILES.in
===================================================================
--- gnunet/po/POTFILES.in       2014-04-14 16:21:43 UTC (rev 33068)
+++ gnunet/po/POTFILES.in       2014-04-14 17:48:30 UTC (rev 33069)
@@ -182,7 +182,6 @@
 src/identity/identity_api_lookup.c
 src/mesh/gnunet-mesh.c
 src/mesh/gnunet-mesh-profiler.c
-src/mesh/gnunet-mesh-profiler.c
 src/mesh/gnunet-service-mesh.c
 src/mesh/gnunet-service-mesh_channel.c
 src/mesh/gnunet-service-mesh_connection.c