diff options
| author | Willem Jan Palenstijn <wjp@usecode.org> | 2015-02-25 16:37:36 +0100 |
|---|---|---|
| committer | Willem Jan Palenstijn <wjp@usecode.org> | 2015-02-25 16:37:36 +0100 |
| commit | 214a5429db07e3e18af5856e164f850fbabca427 (patch) | |
| tree | b9c72b87a1ad931c11153462206afb0464c85d12 /build | |
| parent | f619aba4543de6b9a4fe6fb63b6f1840ef509846 (diff) | |
| parent | 9a60acfc18e72b8aacdc7388617443e9854f4d3b (diff) | |
| download | astra-214a5429db07e3e18af5856e164f850fbabca427.tar.gz astra-214a5429db07e3e18af5856e164f850fbabca427.tar.bz2 astra-214a5429db07e3e18af5856e164f850fbabca427.tar.xz astra-214a5429db07e3e18af5856e164f850fbabca427.zip | |
Merge pull request #19 from wjp/osx-support
Improve support for OS X
Diffstat (limited to 'build')
| -rwxr-xr-x | build/linux/autogen.sh | 7 | ||||
| -rw-r--r-- | build/linux/configure.ac | 26 |
2 files changed, 5 insertions, 28 deletions
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 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]) |