Import Upstream version 1.0.15

m4/ev.m4

@@ -0,0 +1,33 @@
+dnl Check to find the libev headers/libraries
+
+AC_DEFUN([tinc_LIBEV],
+[
+    AC_ARG_WITH(libev,
+      AS_HELP_STRING([--with-libev=DIR], [libev base directory, or:]),
+      [libev="$withval"
+       CPPFLAGS="$CPPFLAGS -I$withval/include"
+       LDFLAGS="$LDFLAGS -L$withval/lib"]
+    )
+
+    AC_ARG_WITH(libev-include,
+      AS_HELP_STRING([--with-libev-include=DIR], [libev headers directory]),
+      [libev_include="$withval"
+       CPPFLAGS="$CPPFLAGS -I$withval"]
+    )
+
+    AC_ARG_WITH(libev-lib,
+      AS_HELP_STRING([--with-libev-lib=DIR], [libev library directory]),
+      [libev_lib="$withval"
+       LDFLAGS="$LDFLAGS -L$withval"]
+    )
+
+    AC_CHECK_HEADERS(ev.h,
+      [],
+      [AC_MSG_ERROR("ev header files not found."); break]
+    )
+
+    AC_CHECK_LIB(ev, ev_loop,
+      [LIBS="$LIBS -lev"],
+      [AC_MSG_ERROR("libev libraries not found.")]
+    )
+])

m4/openssl.m4

@@ -2,6 +2,20 @@ dnl Check to find the OpenSSL headers/libraries
 
 AC_DEFUN([tinc_OPENSSL],
 [
+  case $host_os in
+    *mingw*)
+    ;;
+    *)
+      AC_CHECK_FUNC(dlopen,
+        [],
+        [AC_CHECK_LIB(dl, dlopen,
+          [LIBS="$LIBS -ldl"],
+          [AC_MSG_ERROR([OpenSSL depends on libdl.]); break]
+        )]
+      )
+    ;;
+  esac
+
   AC_ARG_WITH(openssl,
     AS_HELP_STRING([--with-openssl=DIR], [OpenSSL base directory, or:]),
     [openssl="$withval"
@@ -31,20 +45,6 @@ AC_DEFUN([tinc_OPENSSL],
     [AC_MSG_ERROR([OpenSSL libraries not found.])]
   )
 
-case $host_os in
-  *mingw*)
-  ;;
-  *)
-    AC_CHECK_FUNC(dlopen,
-      [],
-      [AC_CHECK_LIB(dl, dlopen,
-        [LIBS="$LIBS -ldl"],
-        [AC_MSG_ERROR([OpenSSL depends on libdl.]); break]
-      )]
-    )
-  ;;
-esac
-
   AC_CHECK_FUNCS([RAND_pseudo_bytes EVP_EncryptInit_ex], ,
     [AC_MSG_ERROR([Missing OpenSSL functionality, make sure you have installed the latest version.]); break],
   )