Merge from Artem's fork

.gitignore

@@ -4,14 +4,12 @@ ref/*
 *.exe
 dsm
 *.so
-*.a
 dsm_discover
 dsm_lookup
 dsm_inverse
 configure
 .*/
-build*/
-*.a
+build/
 *.deps
 *.la
 *.libs
@@ -26,7 +24,12 @@ build*/
 aclocal.m4
 autom4te.cache
 config
-config.*
+config.rb
+config.h.*
+config.s*
+config.log
+config.guess
+universal/*.a
 config.h.in
 configure
 libtool

compat/compat.h

@@ -31,6 +31,11 @@
 #include "config.h"
 
 #include <stdlib.h>
+
+#ifndef _WIN32
+#include <sys/time.h>
+#endif
+
 #if !defined HAVE_STRLCPY && !defined HAVE_LIBBSD
 size_t strlcpy(char *dst, const char *src, size_t siz);
 #endif
@@ -46,7 +51,7 @@ enum {
     CLOCK_THREAD_CPUTIME_ID
 };
 #endif
-#if !defined HAVE_CLOCK_GETTIME
+#if !defined HAVE_CLOCK_GETTIME && !defined( __APPLE__ )
 int clock_gettime(clockid_t clk_id, struct timespec *tp);
 #endif
 

config.h

@@ -0,0 +1,163 @@
+/* config.h.  Generated from config.h.in by configure.  */
+/* config.h.in.  Generated from configure.ac by autoheader.  */
+
+/* ... */
+#define ASN1_ARRAY_TYPE asn1_static_node
+
+/* Define to 1 if you have the <alloca.h> header file. */
+#define HAVE_ALLOCA_H 1
+
+/* Define to 1 if you have the <arpa/inet.h> header file. */
+#define HAVE_ARPA_INET_H 1
+
+/* Define to 1 if you have the <bsd/string.h> header file. */
+/* #undef HAVE_BSD_STRING_H */
+
+/* Define to 1 if the system has the type `clockid_t'. */
+#define HAVE_CLOCKID_T 1
+
+/* Define to 1 if you have the `clock_gettime' function. */
+#define HAVE_CLOCK_GETTIME 1
+
+/* Define to 1 if you have the declaration of `CLOCK_MONOTONIC', and to 0 if
+   you don't. */
+#define HAVE_DECL_CLOCK_MONOTONIC 1
+
+/* Define to 1 if you have the <dlfcn.h> header file. */
+#define HAVE_DLFCN_H 1
+
+/* Define to 1 if you have the `getifaddrs' function. */
+#define HAVE_GETIFADDRS 1
+
+/* Define if you have the iconv() function and it works. */
+#define HAVE_ICONV 1
+
+/* Define to 1 if you have the <ifaddrs.h> header file. */
+#define HAVE_IFADDRS_H 1
+
+/* Define to 1 if you have the <inttypes.h> header file. */
+#define HAVE_INTTYPES_H 1
+
+/* Define to 1 if you have the <langinfo.h> header file. */
+#define HAVE_LANGINFO_H 1
+
+/* Does this system have libbsd strl*** functions implementation */
+#define HAVE_LIBBSD 1
+
+/* Define to 1 if you have the <memory.h> header file. */
+#define HAVE_MEMORY_H 1
+
+/* Define to 1 if you have the `pipe' function. */
+#define HAVE_PIPE 1
+
+/* Define if you have POSIX threads libraries and header files. */
+#define HAVE_PTHREAD 1
+
+/* Have PTHREAD_PRIO_INHERIT. */
+#define HAVE_PTHREAD_PRIO_INHERIT 1
+
+/* Define to 1 if you have the <stdint.h> header file. */
+#define HAVE_STDINT_H 1
+
+/* Define to 1 if you have the <stdlib.h> header file. */
+#define HAVE_STDLIB_H 1
+
+/* Define to 1 if you have the <strings.h> header file. */
+#define HAVE_STRINGS_H 1
+
+/* Define to 1 if you have the <string.h> header file. */
+#define HAVE_STRING_H 1
+
+/* Define to 1 if you have the `strlcpy' function. */
+#define HAVE_STRLCPY 1
+
+/* Define to 1 if you have the `strndup' function. */
+#define HAVE_STRNDUP 1
+
+/* Define to 1 if the system has the type `struct timespec'. */
+#define HAVE_STRUCT_TIMESPEC 1
+
+/* Define to 1 if you have the <sys/queue.h> header file. */
+#define HAVE_SYS_QUEUE_H 1
+
+/* Define to 1 if you have the <sys/socket.h> header file. */
+#define HAVE_SYS_SOCKET_H 1
+
+/* Define to 1 if you have the <sys/stat.h> header file. */
+#define HAVE_SYS_STAT_H 1
+
+/* Define to 1 if you have the <sys/types.h> header file. */
+#define HAVE_SYS_TYPES_H 1
+
+/* libtasn1 has v 3.0 downcase types */
+#define HAVE_TASN1_3PLUS 1
+
+/* Define to 1 if you have the <unistd.h> header file. */
+#define HAVE_UNISTD_H 1
+
+/* Define to 1 if you have the `_pipe' function. */
+/* #undef HAVE__PIPE */
+
+/* Define as const if the declaration of iconv() needs const. */
+#define ICONV_CONST 
+
+/* Define to the sub-directory where libtool stores uninstalled libraries. */
+#define LT_OBJDIR ".libs/"
+
+/* Name of package */
+#define PACKAGE "libdsm"
+
+/* Define to the address where bug reports for this package should be sent. */
+#define PACKAGE_BUGREPORT ""
+
+/* Define to the full name of this package. */
+#define PACKAGE_NAME "libdsm"
+
+/* Define to the full name and version of this package. */
+#define PACKAGE_STRING "libdsm 0.2.7"
+
+/* Define to the one symbol short name of this package. */
+#define PACKAGE_TARNAME "libdsm"
+
+/* Define to the home page for this package. */
+#define PACKAGE_URL ""
+
+/* Define to the version of this package. */
+#define PACKAGE_VERSION "0.2.7"
+
+/* Define to necessary symbol if this constant uses a non-standard name on
+   your system. */
+/* #undef PTHREAD_CREATE_JOINABLE */
+
+/* Define to 1 if you have the ANSI C header files. */
+#define STDC_HEADERS 1
+
+/* Define to 1 for Unicode (Wide Chars) APIs. */
+/* #undef UNICODE */
+
+/* Path of the random number generation device */
+#define URANDOM "/dev/urandom"
+
+/* Version number of package */
+#define VERSION "0.2.7"
+
+/* Define to 64 for large files support. */
+#define _FILE_OFFSET_BITS 64
+
+/* Define to 2 to get glibc warnings. */
+#define _FORTIFY_SOURCE 2
+
+/* Extensions to ISO C89 from ISO C99. */
+/* #undef _ISOC99_SOURCE */
+
+/* IEEE Std 1003.1. */
+/* #undef _POSIX_C_SOURCE */
+
+/* IEEE Std 1003.1. */
+/* #undef _POSIX_SOURCE */
+
+/* Define to 1 for Unicode (Wide Chars) APIs. */
+/* #undef _UNICODE */
+
+/* ... */
+/* #undef asn1_static_node */