3 files changed, 37 insertions, 1 deletions
diff --git a/src/Makefile.am b/src/Makefile.am
index 664dabc..0d25a7c 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,10 +1,29 @@
+if BUILD_LIBZMQ
+lib_LTLIBRARIES = libxs.la libxszmq.la libzmq.la
+else
 lib_LTLIBRARIES = libxs.la libxszmq.la
+endif
 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = libxs.pc libxszmq.pc
 
+if BUILD_LIBZMQ
+include_HEADERS = ../include/xs.h ../include/xs_utils.h \
+    ../include/xszmq.h ../include/xszmq_utils.h \
+    ../include/zmq.h ../include/zmq_utils.h
+
+../include/zmq.h: ../include/xszmq.h
+	cp ../include/xszmq.h ../include/zmq.h
+
+../include/zmq_utils.h: ../include/xszmq_utils.h
+	cp ../include/xszmq_utils.h ../include/zmq_utils.h
+
+distclean-local:
+	-rm -f ../include/zmq.h ../include/zmq_utils.h
+else
 include_HEADERS = ../include/xs.h ../include/xs_utils.h \
     ../include/xszmq.h ../include/xszmq_utils.h
+endif
 
 libxs_la_SOURCES = \
     array.hpp \
@@ -155,6 +174,13 @@ else
 libxszmq_la_LDFLAGS = -version-info @LIBXSZMQ_ABI_VERSION@
 endif
 
+if BUILD_LIBZMQ
+libzmq_la_SOURCES = $(libxszmq_la_SOURCES)
+libzmq_la_CPPFLAGS = $(libxszmq_la_CPPFLAGS)
+libzmq_la_LIBADD = $(libxszmq_la_LIBADD)
+libzmq_la_LDFLAGS = $(libxszmq_la_LDFLAGS)
+endif
+
 dist-hook:
 		-rm $(distdir)/platform.hpp
 
diff --git a/src/libxszmq.pc.in b/src/libxszmq.pc.in
index 577724f..9c631ad 100644
--- a/src/libxszmq.pc.in
+++ b/src/libxszmq.pc.in
@@ -4,7 +4,7 @@ libdir=@libdir@
 includedir=@includedir@
 
 Name: libxszmq
-Description: Crossroads libzmq compatibility library
+Description: Crossroads libxszmq compatibility library
 Version: @VERSION@
 Libs: -L${libdir} -lxszmq
 Cflags: -I${includedir}
diff --git a/src/libzmq.pc.in b/src/libzmq.pc.in
new file mode 100644
index 0000000..b282680
--- /dev/null
+++ b/src/libzmq.pc.in
@@ -0,0 +1,10 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: libzmq
+Description: Crossroads libzmq compatibility library
+Version: @VERSION@
+Libs: -L${libdir} -lzmq
+Cflags: -I${includedir}