diff options
author | Christian Grothoff <christian@grothoff.org> | 2014-04-14 17:48:30 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2014-04-14 17:48:30 +0000 |
commit | 04206bcc8f95670b172c00a8bf803b812908972f (patch) | |
tree | 9aa8f491f04a7f9b46c481297bff79ce60c090df | |
parent | 29ed96cadc9f4a685d70589db4ff30dc516c1d63 (diff) | |
download | gnunet-04206bcc8f95670b172c00a8bf803b812908972f.tar.gz gnunet-04206bcc8f95670b172c00a8bf803b812908972f.zip |
-attempting fix for FreeBSD configure error on netinet/ip.h reported by JS
-rw-r--r-- | configure.ac | 15 | ||||
-rw-r--r-- | po/POTFILES.in | 1 |
2 files changed, 14 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index 8fb6244f4..105950a0e 100644 --- a/configure.ac +++ b/configure.ac | |||
@@ -614,7 +614,20 @@ AC_CHECK_HEADERS([fcntl.h math.h errno.h ctype.h limits.h stdio.h stdlib.h strin | |||
614 | 614 | ||
615 | 615 | ||
616 | # Checks for headers that are only required on some systems or opional (and where we do NOT abort if they are not there) | 616 | # Checks for headers that are only required on some systems or opional (and where we do NOT abort if they are not there) |
617 | 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]) | 617 | 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]) |
618 | |||
619 | # FreeBSD requires something more funky for netinet/in_systm.h and netinet/ip.h... | ||
620 | AC_CHECK_HEADERS([sys/types.h netinet/in_systm.h netinet/in.h netinet/ip.h],,, | ||
621 | [#ifdef HAVE_SYS_TYPES_H | ||
622 | #include <sys/types.h> | ||
623 | #endif | ||
624 | #ifdef HAVE_NETINET_IN_SYSTM_H | ||
625 | #include <netinet/in_systm.h> | ||
626 | #endif | ||
627 | #ifdef HAVE_NETINET_IN_H | ||
628 | #include <netinet/in.h> | ||
629 | #endif | ||
630 | ]) | ||
618 | 631 | ||
619 | SAVE_LDFLAGS=$LDFLAGS | 632 | SAVE_LDFLAGS=$LDFLAGS |
620 | SAVE_CPPFLAGS=$CPPFLAGS | 633 | SAVE_CPPFLAGS=$CPPFLAGS |
diff --git a/po/POTFILES.in b/po/POTFILES.in index 6eb492153..3e1535ea9 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in | |||
@@ -182,7 +182,6 @@ src/identity/identity_api.c | |||
182 | src/identity/identity_api_lookup.c | 182 | src/identity/identity_api_lookup.c |
183 | src/mesh/gnunet-mesh.c | 183 | src/mesh/gnunet-mesh.c |
184 | src/mesh/gnunet-mesh-profiler.c | 184 | src/mesh/gnunet-mesh-profiler.c |
185 | src/mesh/gnunet-mesh-profiler.c | ||
186 | src/mesh/gnunet-service-mesh.c | 185 | src/mesh/gnunet-service-mesh.c |
187 | src/mesh/gnunet-service-mesh_channel.c | 186 | src/mesh/gnunet-service-mesh_channel.c |
188 | src/mesh/gnunet-service-mesh_connection.c | 187 | src/mesh/gnunet-service-mesh_connection.c |