From 7e1faf1493d6aad22c298a6d3bd3b01731c79bce Mon Sep 17 00:00:00 2001 From: Pekka Riikonen Date: Sun, 11 May 2014 15:40:25 +0300 Subject: [PATCH] toolkit: update MAC OS X build instructions --- apps/silcd/server.c | 2 ++ lib/doc/building.html | 18 +++++------------- 2 files changed, 7 insertions(+), 13 deletions(-) diff --git a/apps/silcd/server.c b/apps/silcd/server.c index 7441676b..3c6300cb 100644 --- a/apps/silcd/server.c +++ b/apps/silcd/server.c @@ -3926,6 +3926,8 @@ SILC_TASK_CALLBACK(silc_server_channel_key_rekey) SilcServer server = app_context; SilcServerChannelRekey rekey = (SilcServerChannelRekey)context; + SILC_LOG_DEBUG(("Channel %s rekey", rekey->channel->channel_name)); + rekey->task = NULL; /* Return now if we are shutting down */ diff --git a/lib/doc/building.html b/lib/doc/building.html index 35745dac..a404b2b6 100644 --- a/lib/doc/building.html +++ b/lib/doc/building.html @@ -150,23 +150,15 @@ doing development with the Toolkit. Building on Mac OS X
 
-Building the Toolkit on Mac OS X is almost identical on compiling on Unix -system. The reason for this is that the Mac OS X is Unix based operating -system. To build the Toolkit on Mac OS X, give the following commands: +Building the Toolkit on Mac OS X requires the following tools:
 
- -setenv CFLAGS -no-cpp-precomp
-./configure powerpc
-make - +- Apple Xcode with command line tools
+- NASM >= 2.x
 
-The ./configure can take several options as arguments. To see them all give -command: - -
 
-./configure --help +For actual compilation follow the normal building instructions for +Unix and Linux based systems.
 
If you do not want to compile the applications, or they do not compile on -- 2.24.0