Patch from Dan Scott to fix up the OpenSRF build process in the new SVN repo:

OpenSRF-svn-build.patch: this modifies the objson headers to specify
that "utils.h" is actually found in "opensrf/utils.h". I beleive the
ILS build was failing with the unqualified include because it didn't
have access to the utils.h file that used to be kept around in a
common TMP directory when OpenSRF and ILS were built simultaneously.

git-svn-id: svn://svn.open-ils.org/OpenSRF/trunk@944 9efc2488-bf62-4759-914b-345cdb29e865

diff --git a/src/objson/json2xml.h b/src/objson/json2xml.h
index 47b5a4f..5998150 100644 (file)
--- a/src/objson/json2xml.h
+++ b/src/objson/json2xml.h
@@ -5,7 +5,7 @@
 /* the JSON parser, so we can read the response we're XMLizing */
 #include "object.h"
 #include "json_parser.h"
-#include "utils.h"
+#include "opensrf/utils.h"
 
 char* jsonObjectToXML(jsonObject*);
 

diff --git a/src/objson/json_parser.h b/src/objson/json_parser.h
index 32b6298..f6d9803 100644 (file)
--- a/src/objson/json_parser.h
+++ b/src/objson/json_parser.h
@@ -24,7 +24,7 @@ GNU General Public License for more details.
 
 #include <stdio.h>
 #include "object.h"
-#include "utils.h"
+#include "opensrf/utils.h"
 
 
 

diff --git a/src/objson/object.h b/src/objson/object.h
index baa63e9..d782574 100644 (file)
--- a/src/objson/object.h
+++ b/src/objson/object.h
@@ -26,7 +26,7 @@ GNU General Public License for more details.
 #include <stdlib.h>
 #include <string.h>
 
-#include "utils.h"
+#include "opensrf/utils.h"
 
 /* json object types */
 #define JSON_HASH      0