From f41ea24e97f05f9ddb66547ef7d0aae95db88db1 Mon Sep 17 00:00:00 2001 From: Adam Ierymenko Date: Thu, 16 Jun 2016 00:11:46 +0000 Subject: [PATCH] Build fixes. --- doc/build.sh | 5 +++++ osdep/ManagedRoute.cpp | 4 +++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/doc/build.sh b/doc/build.sh index 4ed69004d..e06a4a205 100755 --- a/doc/build.sh +++ b/doc/build.sh @@ -13,6 +13,11 @@ if [ -e /usr/bin/ronn ]; then /usr/bin/ronn -r zerotier-idtool.1.md /usr/bin/ronn -r zerotier-one.8.md else + if [ ! -f /usr/bin/node -a ! -f /usr/bin/nodejs ]; then + echo 'Unable to build man pages: no /usr/bin/ronn or /usr/bin/node / nodejs!' + exit 0 + fi + if [ ! -f node_modules/marked-man/bin/marked-man ]; then echo 'Installing MarkDown to ROFF converter...' npm install marked-man diff --git a/osdep/ManagedRoute.cpp b/osdep/ManagedRoute.cpp index 0afac440a..118fc7d56 100644 --- a/osdep/ManagedRoute.cpp +++ b/osdep/ManagedRoute.cpp @@ -41,7 +41,9 @@ #include #include #include +#ifdef __BSD__ #include +#endif #include #endif @@ -264,7 +266,7 @@ static void _routeCmd(const char *op,const InetAddress &target,const InetAddress #endif // __WINDOWS__ -------------------------------------------------------- #ifndef ZT_ROUTING_SUPPORT_FOUND -#error ManagedRoute.cpp has no support for managing routes on this platform! You'll need to check and see if one of the existing ones will work and make sure proper defines are set, or write one. Please do a Github pull request if you do this for a new OS! +#error "ManagedRoute.cpp has no support for managing routes on this platform! You'll need to check and see if one of the existing ones will work and make sure proper defines are set, or write one. Please do a Github pull request if you do this for a new OS." #endif } // anonymous namespace