Signed-off-by: Alon Bar-Lev <[email protected]>
---
configure.ac | 11 +++++++++++
src/openvpn/syshead.h | 8 --------
2 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/configure.ac b/configure.ac
index 2c80ef4..193d287 100644
--- a/configure.ac
+++ b/configure.ac
@@ -490,6 +490,17 @@ AC_CHECK_DECLS(
,
[[${SOCKET_INCLUDES}]]
)
+AC_CHECK_DECLS(
+ [SOL_IP],
+ ,
+ [AC_CHECK_DECLS(
+ [IPPROTO_IP],
+ [AC_DEFINE_UNQUOTED([SOL_IP], [IPPROTO_IP], [SOL_IP
emulation])],
+ [AC_MSG_ERROR([cannot find SOL_IP or IPPROTO_IP])],
+ [[${SOCKET_INCLUDES}]]
+ )],
+ [[${SOCKET_INCLUDES}]]
+)
dnl We emulate signals in Windows
AC_CHECK_DECLS(
diff --git a/src/openvpn/syshead.h b/src/openvpn/syshead.h
index f908752..c4dfd0b 100644
--- a/src/openvpn/syshead.h
+++ b/src/openvpn/syshead.h
@@ -367,14 +367,6 @@
#endif
/*
- * Does this platform define SOL_IP
- * or only bsd-style IPPROTO_IP ?
- */
-#ifndef SOL_IP
-#define SOL_IP IPPROTO_IP
-#endif
-
-/*
* Do we have a syslog capability?
*/
#if defined(HAVE_OPENLOG) && defined(HAVE_SYSLOG)
--
1.7.3.4
