diff options
120 files changed, 1258 insertions, 1250 deletions
@@ -0,0 +1,3 @@ +*.o +*.lo +*.la diff --git a/Makefile.am b/Makefile.am index cc77307..156c97e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,4 +1,4 @@ -include_HEADERS = include/zs.h include/zs.hpp +include_HEADERS = include/zmq.h include/zmq.hpp SUBDIRS = src examples DIST_SUBDIRS = src examples diff --git a/configure.in b/configure.in index e75ab11..932b4dd 100644 --- a/configure.in +++ b/configure.in @@ -1,7 +1,7 @@ # -*- Autoconf -*- # Process this file with autoconf to produce a configure script. AC_PREREQ(2.61) -AC_INIT([zsock],[dev]) +AC_INIT([zeromq],[dev]) AC_CONFIG_AUX_DIR(config) AM_CONFIG_HEADER(src/platform.hpp) AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION) @@ -20,7 +20,7 @@ AC_CANONICAL_HOST case "${host_os}" in *linux*) - AC_DEFINE(ZS_HAVE_LINUX, 1, [Have Linux OS]) + AC_DEFINE(ZMQ_HAVE_LINUX, 1, [Have Linux OS]) CPPFLAGS="-D_REENTRANT $CPPFLAGS" sed < libtool > libtool-2 \ 's/^hardcode_libdir_flag_spec.*$'/'hardcode_libdir_flag_spec=" "/' @@ -29,7 +29,7 @@ case "${host_os}" in AC_CHECK_LIB(uuid, uuid_generate) ;; *solaris*) - AC_DEFINE(ZS_HAVE_SOLARIS, 1, [Have Solaris OS]) + AC_DEFINE(ZMQ_HAVE_SOLARIS, 1, [Have Solaris OS]) AC_CHECK_LIB(socket, main) AC_CHECK_LIB(nsl, main) AC_CHECK_LIB(rt, main) @@ -45,37 +45,37 @@ case "${host_os}" in AC_MSG_RESULT([$solaris_has_atomic]) # Solaris 8 does not have atomic operations exported to user space. if test "x$solaris_has_atomic" = "xno"; then - AC_DEFINE(ZS_FORCE_MUTEXES, 1, [Force to use mutexes]) + AC_DEFINE(ZMQ_FORCE_MUTEXES, 1, [Force to use mutexes]) fi ;; *freebsd*) - AC_DEFINE(ZS_HAVE_FREEBSD, 1, [Have FreeBSD OS]) + AC_DEFINE(ZMQ_HAVE_FREEBSD, 1, [Have FreeBSD OS]) CPPFLAGS="-D_THREAD_SAFE $CPPFLAGS" LIBS="-pthread" ;; *darwin*) - AC_DEFINE(ZS_HAVE_OSX, 1, [Have DarwinOSX OS]) + AC_DEFINE(ZMQ_HAVE_OSX, 1, [Have DarwinOSX OS]) LIBS="-pthread" - ZS_EXTRA_CXXFLAGS+="-Wno-uninitialized" + ZMQ_EXTRA_CXXFLAGS+="-Wno-uninitialized" ;; *openbsd*) - AC_DEFINE(ZS_HAVE_OPENBSD, 1, [Have OpenBSD OS]) + AC_DEFINE(ZMQ_HAVE_OPENBSD, 1, [Have OpenBSD OS]) CPPFLAGS="-pthread $CPPFLAGS" LIBS="-pthread" ;; *nto-qnx*) - AC_DEFINE(ZS_HAVE_QNXNTO, 1, [Have QNX Neutrino OS]) + AC_DEFINE(ZMQ_HAVE_QNXNTO, 1, [Have QNX Neutrino OS]) CPPFLAGS="-D_THREAD_SAFE $CPPFLAGS" AC_CHECK_LIB(socket,main) ;; *aix*) - AC_DEFINE(ZS_HAVE_AIX, 1, [Have AIX OS]) + AC_DEFINE(ZMQ_HAVE_AIX, 1, [Have AIX OS]) if test "x$GXX" = "xyes"; then CPPFLAGS="-D_THREAD_SAFE $CPPFLAGS" fi ;; *hpux*) - AC_DEFINE(ZS_HAVE_HPUX, 1, [Have HPUX OS]) + AC_DEFINE(ZMQ_HAVE_HPUX, 1, [Have HPUX OS]) if test "x$GXX" = "xyes"; then CPPFLAGS="-D_THREAD_SAFE $CPPFLAGS" fi @@ -86,8 +86,8 @@ case "${host_os}" in chmod 755 libtool ;; *mingw32*) - AC_DEFINE(ZS_HAVE_WINDOWS, 1, [Have Windows OS]) - AC_DEFINE(ZS_HAVE_MINGW32, 1, [Have MinGW32]) + AC_DEFINE(ZMQ_HAVE_WINDOWS, 1, [Have Windows OS]) + AC_DEFINE(ZMQ_HAVE_MI |