From 8c02a01bc617e99e1c6b7627676402bb276bac80 Mon Sep 17 00:00:00 2001
From: Willem Jan Palenstijn <Willem.Jan.Palenstijn@cwi.nl>
Date: Wed, 25 Feb 2015 14:09:38 +0100
Subject: Remove CAsyncAlgorithm::timedJoin

It is currently unused, and its current implementation is not very portable.
---
 build/linux/configure.ac | 26 --------------------------
 1 file changed, 26 deletions(-)

(limited to 'build/linux')

diff --git a/build/linux/configure.ac b/build/linux/configure.ac
index cbf6016..24f0124 100644
--- a/build/linux/configure.ac
+++ b/build/linux/configure.ac
@@ -48,32 +48,6 @@ dnl Use iostream to check if the C++ compiler works
 AC_CHECK_HEADER(iostream, , AC_MSG_ERROR([No working c++ compiler found]))
 
 
-# clock_gettime
-
-AC_MSG_CHECKING([for clock_gettime])
-AC_TRY_LINK([
-#include <ctime>
-],[
-struct timespec t; clock_gettime(CLOCK_REALTIME, &t);
-],astra_clock_gettime_ok=yes,astra_clock_gettime_ok=no)
-AC_MSG_RESULT($astra_clock_gettime_ok)
-if test x$astra_clock_gettime_ok = xno; then
-  AC_MSG_CHECKING([for clock_gettime in librt])
-  LIBS="$LIBS -lrt"
-  AC_TRY_LINK([
-  #include <ctime>
-  ],[
-  struct timespec t; clock_gettime(CLOCK_REALTIME, &t);
-  ],astra_clock_gettime_ok=yes,astra_clock_gettime_ok=no)
-  AC_MSG_RESULT($astra_clock_gettime_ok)
-  if test x$astra_clock_gettime_ok = xno; then
-    AC_MSG_ERROR([No clock_gettime found])
-  else
-    SAVED_LIBS="$SAVED_LIBS -lrt"
-  fi
-fi
-
-
 # boost-unit-test-framework
 
 AC_MSG_CHECKING([for boost-unit-test-framework])
-- 
cgit v1.2.3


From e64e295fc6394124fdb4bf2630c823744eac23ea Mon Sep 17 00:00:00 2001
From: "Daniel M. Pelt" <d.m.pelt@cwi.nl>
Date: Wed, 25 Feb 2015 08:11:53 +0100
Subject: Added libtool check for OSX

---
 build/linux/autogen.sh | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'build/linux')

diff --git a/build/linux/autogen.sh b/build/linux/autogen.sh
index c856793..544fdeb 100755
--- a/build/linux/autogen.sh
+++ b/build/linux/autogen.sh
@@ -12,9 +12,12 @@ if test $? -ne 0; then
   exit 1
 fi
 
-libtoolize --install --force > /dev/null 2>&1
+case `uname` in Darwin*) LIBTOOLIZEBIN=glibtoolize ;;
+  *) LIBTOOLIZEBIN=libtoolize ;; esac
+
+$LIBTOOLIZEBIN --install --force > /dev/null 2>&1
 if test $? -ne 0; then
-  libtoolize --force
+  $LIBTOOLIZEBIN --force
   if test $? -ne 0; then
     echo "Error running libtoolize"
     exit 1
-- 
cgit v1.2.3