[Saga-devel] saga SVN commit 3277: /trunk/adaptors/default/rpc/

[amerzky at cct.lsu.edu]

User: amerzky
Date: 2009/01/14 11:18 AM

Modified:
 /trunk/adaptors/default/rpc/
  Makefile, rpc_connection.cpp

Log:
 sorry for compile problem - include now ifdef'ed
 A

File Changes:

Directory: /trunk/adaptors/default/rpc/
=======================================

File [modified]: Makefile
Delta lines: +1 -0
===================================================================
--- trunk/adaptors/default/rpc/Makefile	2009-01-14 15:45:40 UTC (rev 3276)
+++ trunk/adaptors/default/rpc/Makefile	2009-01-14 17:18:38 UTC (rev 3277)
@@ -17,5 +17,6 @@
 
 -include ../config/make.cfg
 -include $(SAGA_MAKE_INCLUDE_ROOT)/saga.adaptor.mk
+-include $(SAGA_MAKE_INCLUDE_ROOT)/saga.mk
 -include ../config/saga.config.xmlrpc.c.mk
 

File [modified]: rpc_connection.cpp
Delta lines: +4 -1
===================================================================
--- trunk/adaptors/default/rpc/rpc_connection.cpp	2009-01-14 15:45:40 UTC (rev 3276)
+++ trunk/adaptors/default/rpc/rpc_connection.cpp	2009-01-14 17:18:38 UTC (rev 3277)
@@ -11,8 +11,11 @@
 #include <saga/saga/rpc.hpp>
 
 #include "rpc_connection.hpp"
-#include "../config/config.hpp"
 
+#ifndef SAGA_SKIP_CONFIG_HPP
+# include "../config/config.hpp"
+#endif
+
 ///////////////////////////////////////////////////////////////////////////////
 namespace rpc
 {