Fixes a conflict with XenStore (see

http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=668550)

Signed-off-by: Martin Lucina <martin@lucina.net>

25 files changed, 32 insertions, 32 deletions

diff --git a/doc/xs.txt b/doc/xs.txt
index d417456..4df3fee 100644
--- a/doc/xs.txt
+++ b/doc/xs.txt
@@ -9,7 +9,7 @@ xs - Crossroads I/O, a lightweight messaging layer
 
 SYNOPSIS
 --------
-*#include <xs.h>*
+*#include <xs/xs.h>*
 
 *cc* ['flags'] 'files' *-lxs* ['libraries']
 
diff --git a/include/xs.h b/include/xs/xs.h
index 56efa52..56efa52 100644
--- a/include/xs.h
+++ b/include/xs/xs.h
diff --git a/perf/inproc_lat.cpp b/perf/inproc_lat.cpp
index 54973db..d4f97f5 100644
--- a/perf/inproc_lat.cpp
+++ b/perf/inproc_lat.cpp
@@ -19,7 +19,7 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "../include/xs.h"
+#include "../include/xs/xs.h"
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/perf/inproc_thr.cpp b/perf/inproc_thr.cpp
index 570d87e..905c2be 100644
--- a/perf/inproc_thr.cpp
+++ b/perf/inproc_thr.cpp
@@ -19,7 +19,7 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "../include/xs.h"
+#include "../include/xs/xs.h"
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/perf/local_lat.cpp b/perf/local_lat.cpp
index 1fcf3f4..57d05af 100644
--- a/perf/local_lat.cpp
+++ b/perf/local_lat.cpp
@@ -19,7 +19,7 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "../include/xs.h"
+#include "../include/xs/xs.h"
 #include <stdio.h>
 #include <stdlib.h>
 
diff --git a/perf/local_thr.cpp b/perf/local_thr.cpp
index 5a9e6f1..a70491c 100644
--- a/perf/local_thr.cpp
+++ b/perf/local_thr.cpp
@@ -19,7 +19,7 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "../include/xs.h"
+#include "../include/xs/xs.h"
 #include <stdio.h>
 #include <stdlib.h>
 
diff --git a/perf/remote_lat.cpp b/perf/remote_lat.cpp
index 6aaf1e9..483400c 100644
--- a/perf/remote_lat.cpp
+++ b/perf/remote_lat.cpp
@@ -19,7 +19,7 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "../include/xs.h"
+#include "../include/xs/xs.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/perf/remote_thr.cpp b/perf/remote_thr.cpp
index b93c4d7..91f61b6 100644
--- a/perf/remote_thr.cpp
+++ b/perf/remote_thr.cpp
@@ -19,7 +19,7 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "../include/xs.h"
+#include "../include/xs/xs.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/src/Makefile.am b/src/Makefile.am
index 390dc50..8c3de7c 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -5,16 +5,16 @@ lib_LTLIBRARIES = libxs.la libzmq.la
 
 pkgconfig_DATA = libxs.pc libzmq.pc
 
-include_HEADERS = ../include/xs.h \
-    ../include/zmq.h ../include/zmq_utils.h
+include_HEADERS = ../include/zmq.h ../include/zmq_utils.h
 else
 lib_LTLIBRARIES = libxs.la
 
 pkgconfig_DATA = libxs.pc
-
-include_HEADERS = ../include/xs.h
 endif
 
+xsincludedir = $(includedir)/xs
+xsinclude_HEADERS = ../include/xs/xs.h
+
 libxs_la_SOURCES = \
     address.hpp \
     array.hpp \
diff --git a/src/core.cpp b/src/core.cpp
index 2d16167..ea80791 100644
--- a/src/core.cpp
+++ b/src/core.cpp
@@ -18,7 +18,7 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "../include/xs.h"
+#include "../include/xs/xs.h"
 
 #include "core.hpp"
 #include "err.hpp"
diff --git a/src/ctx.hpp b/src/ctx.hpp
index 8e2fd03..24e879d 100644
--- a/src/ctx.hpp
+++ b/src/ctx.hpp
@@ -26,7 +26,7 @@
 #include <vector>
 #include <string>
 
-#include "../include/xs.h"
+#include "../include/xs/xs.h"
 
 #include "mailbox.hpp"
 #include "array.hpp"
diff --git a/src/err.hpp b/src/err.hpp
index 64ab545..28b3303 100644
--- a/src/err.hpp
+++ b/src/err.hpp
@@ -23,7 +23,7 @@
 #define __XS_ERR_HPP_INCLUDED__
 
 //  Crossroads-specific error codes are defined in xs.h
-#include "../include/xs.h"
+#include "../include/xs/xs.h"
 
 #include <assert.h>
 #include <errno.h>
diff --git a/src/msg.cpp b/src/msg.cpp
index aa6960d..3b97366 100644
--- a/src/msg.cpp
+++ b/src/msg.cpp
@@ -20,7 +20,7 @@
 */
 
 #include "msg.hpp"
-#include "../include/xs.h"
+#include "../include/xs/xs.h"
 
 #include <string.h>
 #include <errno.h>
diff --git a/src/object.hpp b/src/object.hpp
index b695308..fe3c510 100644
--- a/src/object.hpp
+++ b/src/object.hpp
@@ -22,7 +22,7 @@
 #ifndef __XS_OBJECT_HPP_INCLUDED__
 #define __XS_OBJECT_HPP_INCLUDED__
 
-#include "../include/xs.h"
+#include "../include/xs/xs.h"
 
 #include "stdint.hpp"
 
diff --git a/src/options.cpp b/src/options.cpp
index f7bbdc4..62c03a2 100644
--- a/src/options.cpp
+++ b/src/options.cpp
@@ -23,7 +23,7 @@
 #include <string.h>
 #include <limits>
 
-#include "../include/xs.h"
+#include "../include/xs/xs.h"
 
 #include "options.hpp"
 #include "err.hpp"
diff --git a/src/precompiled.hpp b/src/precompiled.hpp
index 8ae2246..c77b4c5 100644
--- a/src/precompiled.hpp
+++ b/src/precompiled.hpp
@@ -40,7 +40,7 @@
 #include <vector>
 
 // Crossroads definitions and exported functions
-#include "../include/xs.h"
+#include "../include/xs/xs.h"
 
 #endif // _MSC_VER
 
diff --git a/src/prefix_filter.cpp b/src/prefix_filter.cpp
index 5f1a72a..06a77f5 100644
--- a/src/prefix_filter.cpp
+++ b/src/prefix_filter.cpp
@@ -24,7 +24,7 @@
 #include <stddef.h>
 #include <stdlib.h>
 
-#include "../include/xs.h"
+#include "../include/xs/xs.h"
 
 #include "prefix_filter.hpp"
 #include "err.hpp"
diff --git a/src/sub.hpp b/src/sub.hpp
index c50c0bd..0519af5 100644
--- a/src/sub.hpp
+++ b/src/sub.hpp
@@ -24,7 +24,7 @@
 
 #include <vector>
 
-#include "../include/xs.h"
+#include "../include/xs/xs.h"
 
 #include "xsub.hpp"
 #include "core.hpp"
diff --git a/src/upoll.hpp b/src/upoll.hpp
index d08cf5e..dbb5077 100644
--- a/src/upoll.hpp
+++ b/src/upoll.hpp
@@ -21,7 +21,7 @@
 #ifndef __XS_UPOLL_HPP_INCLUDED__
 #define __XS_UPOLL_HPP_INCLUDED__
 
-#include "../include/xs.h"
+#include "../include/xs/xs.h"
 
 namespace xs
 {
diff --git a/src/xpub.cpp b/src/xpub.cpp
index fe0b9a7..fbb45fb 100644
--- a/src/xpub.cpp
+++ b/src/xpub.cpp
@@ -21,7 +21,7 @@
 
 #include <string.h>
 
-#include "../include/xs.h"
+#include "../include/xs/xs.h"
 
 #include "xpub.hpp"
 #include "pipe.hpp"
diff --git a/src/xpub.hpp b/src/xpub.hpp
index c0e47ff..c76f03c 100644
--- a/src/xpub.hpp
+++ b/src/xpub.hpp
@@ -21,7 +21,7 @@
 #ifndef __XS_XPUB_HPP_INCLUDED__
 #define __XS_XPUB_HPP_INCLUDED__
 
-#include "../include/xs.h"
+#include "../include/xs/xs.h"
 
 #include <deque>
 #include <string>
diff --git a/src/xsub.hpp b/src/xsub.hpp
index 5bc11c4..0cf81b5 100644
--- a/src/xsub.hpp
+++ b/src/xsub.hpp
@@ -23,7 +23,7 @@
 
 #include <map>
 
-#include "../include/xs.h"
+#include "../include/xs/xs.h"
 
 #include "socket_base.hpp"
 #include "session_base.hpp"
diff --git a/src/xszmq.cpp b/src/xszmq.cpp
index f6e6fa1..21db52c 100644
--- a/src/xszmq.cpp
+++ b/src/xszmq.cpp
@@ -22,7 +22,7 @@
 #include "../include/zmq.h"
 #include "../include/zmq_utils.h"
 
-#include "../include/xs.h"
+#include "../include/xs/xs.h"
 
 #include "platform.hpp"
 
diff --git a/tests/testutil.hpp b/tests/testutil.hpp
index 58f1afd..b6a55a2 100644
--- a/tests/testutil.hpp
+++ b/tests/testutil.hpp
@@ -28,7 +28,7 @@
 #include <stddef.h>
 #include <stdlib.h>
 
-#include "../include/xs.h"
+#include "../include/xs/xs.h"
 #include "../src/platform.hpp"
 
 #if !defined XS_HAVE_WINDOWS
diff --git a/version.sh b/version.sh
index 23c453f..569b53a 100755
--- a/version.sh
+++ b/version.sh
@@ -3,15 +3,15 @@
 # This script extracts the Crossroads version from include/xs.h,
 # which is the master location for this information.
 #
-if [ ! -f include/xs.h ]; then
-    echo "version.sh: error: include/xs.h does not exist" 1>&2
+if [ ! -f include/xs/xs.h ]; then
+    echo "version.sh: error: include/xs/xs.h does not exist" 1>&2
     exit 1
 fi
-MAJOR=`egrep '^#define +XS_VERSION_MAJOR +[0-9]+$' include/xs.h`
-MINOR=`egrep '^#define +XS_VERSION_MINOR +[0-9]+$' include/xs.h`
-PATCH=`egrep '^#define +XS_VERSION_PATCH +[0-9]+$' include/xs.h`
+MAJOR=`egrep '^#define +XS_VERSION_MAJOR +[0-9]+$' include/xs/xs.h`
+MINOR=`egrep '^#define +XS_VERSION_MINOR +[0-9]+$' include/xs/xs.h`
+PATCH=`egrep '^#define +XS_VERSION_PATCH +[0-9]+$' include/xs/xs.h`
 if [ -z "$MAJOR" -o -z "$MINOR" -o -z "$PATCH" ]; then
-    echo "version.sh: error: could not extract version from include/xs.h" 1>&2
+    echo "version.sh: error: could not extract version from include/xs/xs.h" 1>&2
     exit 1
 fi
 MAJOR=`echo $MAJOR | awk '{ print $3 }'`