Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

fix some more Ubuntu 12.04 built issues

  • Loading branch information...
commit db834d1708e2368b632cf35c96e6b01e7250e860 1 parent a5d8b82
@jwatte jwatte authored
Showing with 10 additions and 9 deletions.
  1. +9 −8 configure
  2. +1 −1  daemon/test_main.inl
View
17 configure
@@ -161,15 +161,16 @@ if [ -z "$STATGRAB" ]; then
fi
fi
if [ -z "$LIBRT" ]; then
- if [ -r /usr/lib/librt.so ]; then
- LIBRT=-lrt
- elif [ -r /usr/lib64/librt.so ]; then
- LIBRT=-lrt
- elif [ -r /usr/local/lib/librt.so ]; then
- LIBRT=-lrt
- elif [ -r /usr/local/lib64/librt.so ]; then
- LIBRT=-lrt
+ mkdir -p tmp
+ fn=tmp/tt$$.c
+ echo "#include <time.h>" > "$fn"
+ echo "int main() { (void)clock_gettime(0, NULL); }" >> "$fn"
+ if gcc -o tmp/tt "$fn" > /dev/null 2>&1; then
+ LIBRT=""
+ else
+ LIBRT="-lrt"
fi
+ rm -rf tmp
fi
if [ ! -z "$BOOST_SYSTEM" ]; then
View
2  daemon/test_main.inl
@@ -111,7 +111,7 @@ void test_Debug()
assert_true(DebugOption::find("http")->enabled());
assert_true(DebugOption::find("record")->enabled());
assert_false(DebugOption::find("admin")->enabled());
- assert_equal(DebugOption::find("derp"), NULL);
+ assert_equal(DebugOption::find("derp"), (DebugOption const *)NULL);
}
Please sign in to comment.
Something went wrong with that request. Please try again.