From 47232884b9460e275d2ef95c40f126a66295d308 Mon Sep 17 00:00:00 2001
From: "psyc://psyced.org/~lynX" <@>
Date: Tue, 24 May 2011 16:16:56 +0200
Subject: [PATCH] don't panic if libpsyc isnt available

---
 world/net/spyc/active.c  | 3 +++
 world/net/spyc/circuit.c | 2 ++
 world/net/spyc/parse.c   | 5 +++++
 world/net/spyc/server.c  | 2 ++
 4 files changed, 12 insertions(+)

diff --git a/world/net/spyc/active.c b/world/net/spyc/active.c
index ffd1c78..5ab1a95 100644
--- a/world/net/spyc/active.c
+++ b/world/net/spyc/active.c
@@ -1,4 +1,7 @@
 // $Id: active.c,v 1.1 2008/01/30 17:06:48 lynx Exp $ // vim:syntax=lpc
 #include "psyc.h"
+#ifdef LIBPSYC
+
 #include "../psyc/active.c"
 
+#endif // LIBPSYC
diff --git a/world/net/spyc/circuit.c b/world/net/spyc/circuit.c
index 5ad365b..21545da 100644
--- a/world/net/spyc/circuit.c
+++ b/world/net/spyc/circuit.c
@@ -2,6 +2,7 @@
 // $Id: circuit.c,v 1.38 2008/10/14 19:02:29 lynx Exp $
 
 #include "psyc.h"
+#ifdef LIBPSYC
 
 #include <net.h>
 #include <uniform.h>
@@ -298,3 +299,4 @@ varargs int msg(string source, string mc, string data,
     return emit(buf);
 }
 
+#endif // LIBPSYC
diff --git a/world/net/spyc/parse.c b/world/net/spyc/parse.c
index 3f50fe2..dc0eda7 100644
--- a/world/net/spyc/parse.c
+++ b/world/net/spyc/parse.c
@@ -2,6 +2,9 @@
 // $Id: parse.c,v 1.30 2008/12/18 18:16:14 lynx Exp $
 
 #include "psyc.h"
+#ifdef LIBPSYC	// net/spyc currently doesn't work without libpsyc
+		// and probably never will.. will delete the old code soon
+
 #include <net.h>
 #include <input_to.h>
 
@@ -470,3 +473,5 @@ test() {
 }
 # endif
 #endif // !LIBPSYC
+
+#endif // LIBPSYC
diff --git a/world/net/spyc/server.c b/world/net/spyc/server.c
index 7444b91..ac0190a 100644
--- a/world/net/spyc/server.c
+++ b/world/net/spyc/server.c
@@ -4,6 +4,7 @@
 // the thing that answers on port 4404 of psyced.
 
 #include "psyc.h"
+#ifdef LIBPSYC
 
 #include <net.h>
 #include <services.h>
@@ -191,3 +192,4 @@ void circuit_msg(string mc, mapping vars, string data) {
     }
 }
 
+#endif // LIBPSYC