aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2017-07-24 12:32:18 +0200
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2017-07-26 10:12:43 +0200
commit9c8e3f13985cc6f61a1c140612b3be524af868f6 (patch)
tree70dedce177a325ddec4f634a31c53e4ff14083ba
parent9fa0a6b954e3893f81aff1851c8e363eb0ccb98b (diff)
downloadnx-libs-9c8e3f13985cc6f61a1c140612b3be524af868f6.tar.gz
nx-libs-9c8e3f13985cc6f61a1c140612b3be524af868f6.tar.bz2
nx-libs-9c8e3f13985cc6f61a1c140612b3be524af868f6.zip
nxcomp/configure.ac,m4/nx-macros.m4,nxcomp/src/Socket.h: Use AC_CHECK_TYPES to detect if type 'in_addr_t' is available.
-rw-r--r--m4/nx-macros.m49
-rw-r--r--nxcomp/configure.ac10
-rw-r--r--nxcomp/src/Socket.h10
3 files changed, 11 insertions, 18 deletions
diff --git a/m4/nx-macros.m4 b/m4/nx-macros.m4
index a878602e7..816bf4003 100644
--- a/m4/nx-macros.m4
+++ b/m4/nx-macros.m4
@@ -303,12 +303,3 @@ rm -f conftest*])
FreeBSD=
test "$nxconf_cv_freebsd" = yes && FreeBSD=yes
]) # NX_BUILD_ON_FreeBSD
-
-AC_DEFUN([NX_HAS_INADDRT],
-[AC_CACHE_CHECK(for in_addr_t, nx_cv_inaddrt,
-[AC_TRY_COMPILE([#include <netinet/in.h>],[in_addr_t t; t = 1; return t;],
-nx_cv_inaddrt=yes, nx_cv_inaddrt=no)
-rm -f conftest*])
-INADDRT=
-test "$nx_cv_inaddrt" = yes && INADDRT=yes
-]) # NX_HAS_INADDRT
diff --git a/nxcomp/configure.ac b/nxcomp/configure.ac
index 9d44a6991..42407c6fd 100644
--- a/nxcomp/configure.ac
+++ b/nxcomp/configure.ac
@@ -63,16 +63,8 @@ if test "$FreeBSD" = yes; then
CPPFLAGS="$CPPFLAGS -I/usr/local/include"
fi
-NX_HAS_INADDRT
-
# If in_addr_t is not defined use unsigned int.
-
-if test "$INADDRT" != yes ; then
- echo -e "using unsigned int for type in_addr_t"
- CPPFLAGS="$CPPFLAGS -DIN_ADDR_T=unsigned"
-else
- CPPFLAGS="$CPPFLAGS -DIN_ADDR_T=in_addr_t"
-fi
+AC_CHECK_TYPES([in_addr_t], [], [], [[#include <netinet/in.h>]])
AC_ARG_ENABLE(info,
[AS_HELP_STRING([--enable-debug], [enable to get info session log output (disabled by default)])],
diff --git a/nxcomp/src/Socket.h b/nxcomp/src/Socket.h
index 5e7e47705..77837a115 100644
--- a/nxcomp/src/Socket.h
+++ b/nxcomp/src/Socket.h
@@ -26,6 +26,10 @@
#ifndef Socket_H
#define Socket_H
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include <sys/types.h>
#include <sys/ioctl.h>
#include <sys/socket.h>
@@ -35,6 +39,12 @@
#include <sys/filio.h>
#endif
+#ifdef HAVE_IN_ADDR_T
+#define IN_ADDR_T in_addr_t
+#else
+#define IN_ADDR_T unsigned
+#endif
+
//
// Set socket options.
//