Merge branch 'for-sustrik' of git.lucina.net:libxs

7 files changed, 28 insertions, 58 deletions

diff --git a/.gitignore b/.gitignore
index 0933b44..048a74d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -20,8 +20,6 @@ autom4te.cache
 .*
 *~
 .*~
-include/zmq.h
-include/zmq_utils.h
 tests/pair_inproc
 tests/pair_ipc
 tests/pair_tcp
@@ -55,7 +53,6 @@ doc/*.7
 doc/*.html
 doc/*.xml
 src/libxs.pc
-src/libxszmq.pc
 src/libzmq.pc
 bin/
 lib/
diff --git a/configure.ac b/configure.ac
index 04e2dfd..2ba0f26 100644
--- a/configure.ac
+++ b/configure.ac
@@ -28,14 +28,14 @@ AC_SUBST(PACKAGE_VERSION)
 LIBXS_ABI_VERSION="1:0:0"
 AC_SUBST(LIBXS_ABI_VERSION)
 
-# ABI version for libxszmq
+# ABI version for XS libzmq compatibility library
 #
 # This must be set to the ABI version of libzmq we are emulating.
 # This is currently libzmq 2.1 which is ABI 1.0.0.
 #
-# libxszmq -version-info current:revision:age
-LIBXSZMQ_ABI_VERSION="1:0:0"
-AC_SUBST(LIBXSZMQ_ABI_VERSION)
+# libzmq -version-info current:revision:age
+LIBZMQ_ABI_VERSION="1:0:0"
+AC_SUBST(LIBZMQ_ABI_VERSION)
 
 # Take a copy of original flags
 XS_ORIG_CFLAGS="${CFLAGS:-none}"
@@ -279,14 +279,14 @@ AC_TYPE_UINT32_T
 AC_C_VOLATILE
 
 #  libzmq compatibility mode
-libxs_libzmq_compat="no"
-AC_ARG_ENABLE([libzmq-compat], [AS_HELP_STRING([--enable-libzmq-compat],
+libxs_libzmq="no"
+AC_ARG_ENABLE([libzmq], [AS_HELP_STRING([--enable-libzmq],
     [install libzmq compatibility library and headers [default=no]])],
-    [enable_libzmq_compat=$enableval], [enable_libzmq_compat=no])
+    [enable_libzmq=$enableval], [enable_libzmq=no])
 
-if test "x$enable_libzmq_compat" != "xno"; then
+if test "x$enable_libzmq" != "xno"; then
     AC_MSG_NOTICE([enabling libzmq compatibility library and headers])
-    libxs_libzmq_compat="yes"
+    libxs_libzmq="yes"
 fi
 
 #  PGM extension
@@ -381,7 +381,7 @@ if test "x$libxs_pedantic" = "xyes"; then
 fi
 AC_LANG_POP([C++])
 
-AM_CONDITIONAL(BUILD_LIBZMQ, test "x$libxs_libzmq_compat" = "xyes")
+AM_CONDITIONAL(BUILD_LIBZMQ, test "x$libxs_libzmq" = "xyes")
 AM_CONDITIONAL(BUILD_PGM, test "x$libxs_pgm_ext" = "xyes")
 AM_CONDITIONAL(ON_MINGW, test "x$libxs_on_mingw32" = "xyes")
 
@@ -401,10 +401,10 @@ AC_SUBST(LIBXS_EXTRA_CXXFLAGS)
 AC_SUBST(LIBXS_EXTRA_LDFLAGS)
 
 AC_CONFIG_FILES([Makefile src/Makefile doc/Makefile
-    perf/Makefile src/libxs.pc src/libxszmq.pc \
+    perf/Makefile src/libxs.pc \
     builds/msvc/Makefile tests/Makefile \
     foreign/openpgm/Makefile])
-if test "x$libxs_libzmq_compat" == "xyes"; then
+if test "x$libxs_libzmq" == "xyes"; then
     AC_CONFIG_FILES([src/libzmq.pc])
 fi
 AC_OUTPUT
@@ -422,7 +422,7 @@ Configuration for $PACKAGE_STRING
     GCC code coverage reporting: ${XS_GCOV-no}
     Polling system: $libxs_cv_poller
     Disable eventfd: $xs_disable_eventfd
-    Build libzmq compatibility library and headers: $libxs_libzmq_compat
+    Build libzmq compatibility library and headers: $libxs_libzmq
     PGM extension: $with_pgm_ext
     Use system-provided PGM library: $with_system_pgm_ext
     Build documentation: $libxs_build_doc
@@ -439,8 +439,8 @@ Installation:
 
 EOF
 
-if test "x$libxs_libzmq_compat" == "xyes"; then
-    AC_MSG_WARN([The --enable-libzmq-compat option was specified:])
+if test "x$libxs_libzmq" == "xyes"; then
+    AC_MSG_WARN([The --enable-libzmq option was specified:])
     AC_MSG_WARN([libzmq compatibility library and headers are enabled.])
     AC_MSG_WARN([This will overwrite any existing installation of libzmq.])
 fi
diff --git a/include/xszmq.h b/include/zmq.h
index 4463d9d..4463d9d 100644
--- a/include/xszmq.h
+++ b/include/zmq.h
diff --git a/include/xszmq_utils.h b/include/zmq_utils.h
index b25bf91..b25bf91 100644
--- a/include/xszmq_utils.h
+++ b/include/zmq_utils.h
diff --git a/src/Makefile.am b/src/Makefile.am
index 84c7d3d..0b226a1 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,29 +1,18 @@
 pkgconfigdir = $(libdir)/pkgconfig
 
 if BUILD_LIBZMQ
-lib_LTLIBRARIES = libxs.la libxszmq.la libzmq.la
+lib_LTLIBRARIES = libxs.la libzmq.la
 
-pkgconfig_DATA = libxs.pc libxszmq.pc libzmq.pc
+pkgconfig_DATA = libxs.pc libzmq.pc
 
 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
-lib_LTLIBRARIES = libxs.la libxszmq.la
+lib_LTLIBRARIES = libxs.la
 
-pkgconfig_DATA = libxs.pc libxszmq.pc
+pkgconfig_DATA = libxs.pc
 
-include_HEADERS = ../include/xs.h ../include/xs_utils.h \
-    ../include/xszmq.h ../include/xszmq_utils.h
+include_HEADERS = ../include/xs.h ../include/xs_utils.h
 endif
 
 libxs_la_SOURCES = \
@@ -165,24 +154,18 @@ libxs_la_CPPFLAGS = -I$(top_srcdir)/@pgm_srcdir@/include/
 libxs_la_LIBADD = $(top_srcdir)/@pgm_srcdir@/libpgm_noinst.la
 endif
 
-libxszmq_la_SOURCES = xszmq.cpp
-libxszmq_la_CPPFLAGS = -DXS_BUILDING_LIBXSZMQ
-libxszmq_la_LIBADD = libxs.la
+if BUILD_LIBZMQ
+libzmq_la_SOURCES = xszmq.cpp
+libzmq_la_CPPFLAGS = -DXS_BUILDING_LIBXSZMQ
+libzmq_la_LIBADD = libxs.la
 
 if ON_MINGW
-libxszmq_la_LDFLAGS = -no-undefined -avoid-version -version-info @LIBXSZMQ_ABI_VERSION@
+libzmq_la_LDFLAGS = -no-undefined -avoid-version -version-info @LIBZMQ_ABI_VERSION@
 else
-libxszmq_la_LDFLAGS = -version-info @LIBXSZMQ_ABI_VERSION@
+libzmq_la_LDFLAGS = -version-info @LIBZMQ_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
deleted file mode 100644
index 9c631ad..0000000
--- a/src/libxszmq.pc.in
+++ /dev/null
@@ -1,10 +0,0 @@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@
-
-Name: libxszmq
-Description: Crossroads libxszmq compatibility library
-Version: @VERSION@
-Libs: -L${libdir} -lxszmq
-Cflags: -I${includedir}
diff --git a/src/xszmq.cpp b/src/xszmq.cpp
index 6b3930c..350929d 100644
--- a/src/xszmq.cpp
+++ b/src/xszmq.cpp
@@ -19,8 +19,8 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "../include/xszmq.h"
-#include "../include/xszmq_utils.h"
+#include "../include/zmq.h"
+#include "../include/zmq_utils.h"
 
 #include "../include/xs.h"
 #include "../include/xs_utils.h"