3party/libzmq
0
0
Fork 0
mirror of https://github.com/zeromq/libzmq.git synced 2025-03-10 07:56:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Cleaning up more PGM cruft

Browse Source
This commit is contained in:
Martin Lucina 2010-02-15 23:51:05 +01:00
parent 635e314643
commit 80c820d758
4 changed files with 37 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile.am
View File

@ -14,3 +14,6 @@ $(top_srcdir)/foreign/xmlParser/xmlParser.hpp
dist-hook: dist-hook:
-rm -rf $(distdir)/foreign/openpgm/@pgm2_basename@ -rm -rf $(distdir)/foreign/openpgm/@pgm2_basename@
distclean-local:
-rm -rf $(distdir)/foreign/openpgm/@pgm2_basename@

65
configure.in
View File

@ -62,7 +62,7 @@ AC_CHECK_LIB(stdc++, malloc)
LIBZMQ_EXTRA_CXXFLAGS="" LIBZMQ_EXTRA_CXXFLAGS=""
# Extra LDFLAGS are appended at the end of LDFLAGS for libzmq. # Extra LDFLAGS are appended at the end of LDFLAGS for libzmq.
LIBZMQ_EXTRA_LDFLAFS="" LIBZMQ_EXTRA_LDFLAGS=""
# By default compiling with -pedantic except QNX and OSX. # By default compiling with -pedantic except QNX and OSX.
pedantic="yes" pedantic="yes"
@ -408,33 +408,29 @@ else
fi fi
# PGM extension # PGM extension
pgm2_ext="no" pgm_ext="no"
pgm2_basename="libpgm-2.0.23rc8" pgm_basename="libpgm-2.0.23rc8"
AC_SUBST(pgm2_basename) AC_SUBST(pgm_basename)
pgm_basename=""
AC_ARG_WITH([pgm], [AS_HELP_STRING([--with-pgm], AC_ARG_WITH([pgm], [AS_HELP_STRING([--with-pgm],
[build libzmq with PGM extension [default=no]])], [build libzmq with PGM extension [default=no]])],
[with_pgm2_ext=yes], [with_pgm2_ext=no]) [with_pgm_ext=yes], [with_pgm_ext=no])
AC_ARG_WITH([pgm-examples], [AS_HELP_STRING([--with-pgm-examples], AC_ARG_WITH([pgm-examples], [AS_HELP_STRING([--with-pgm-examples],
[build PGM examples [default=no]])], [build PGM examples [default=no]])],
[with_pgm2_examples=yes], [with_pgm2_examples=no]) [with_pgm_examples=yes], [with_pgm_examples=no])
if test "x$with_pgm2_ext" = "xno" -a "x$with_pgm2_examples" = "xyes"; then if test "x$with_pgm_ext" = "xno" -a "x$with_pgm_examples" = "xyes"; then
AC_MSG_ERROR([cannot configure --with-pgm2-examples without --with-pgm2.]); AC_MSG_ERROR([cannot configure --with-pgm-examples without --with-pgm.]);
fi fi
if test "x$c" = "xno" -a "x$with_pgm2_examples" = "xyes"; then if test "x$c" = "xno" -a "x$with_pgm_examples" = "xyes"; then
AC_MSG_ERROR([cannot configure --with-pgm2-examples without --with-c.]); AC_MSG_ERROR([cannot configure --with-pgm-examples without --with-c.]);
fi fi
if test "x$with_pgm2_ext" != "xno"; then if test "x$with_pgm_ext" != "xno"; then
pgm_basename=${pgm2_basename}
AC_MSG_CHECKING([if the PGM extension is supported on this platform]) AC_MSG_CHECKING([if the PGM extension is supported on this platform])
# OpenPGM is only supported by the vendor on x86 and AMD64 platforms... # OpenPGM is only supported by the vendor on x86 and AMD64 platforms...
@ -484,39 +480,24 @@ if test "x$with_pgm2_ext" != "xno"; then
fi fi
fi fi
# Unpack libpgm2 # Unpack libpgm
AC_MSG_NOTICE([Unpacking ${pgm_basename}.tar.bz2]) AC_MSG_NOTICE([Unpacking ${pgm_basename}.tar.bz2])
if ! bunzip2 -c foreign/openpgm/${pgm_basename}.tar.bz2 | tar -xf - -C foreign/openpgm/; then if ! bunzip2 -c foreign/openpgm/${pgm_basename}.tar.bz2 | tar -xf - -C foreign/openpgm/; then
AC_MSG_ERROR([cannot unpack the foreign/openpgm/${pgm_basename}.tar.bz2 file.]) AC_MSG_ERROR([cannot unpack the foreign/openpgm/${pgm_basename}.tar.bz2 file.])
fi fi
# Generate galois_tables.c
AC_CONFIG_COMMANDS([galois_tables2.c],
[perl foreign/openpgm/libpgm-2.0.23rc8/openpgm/pgm/galois_generator.pl > \
foreign/openpgm/libpgm-2.0.23rc8/openpgm/pgm/galois_tables.c])
# Generate version.c
AC_CONFIG_COMMANDS([version2.c],
[python foreign/openpgm/libpgm-2.0.23rc8/openpgm/pgm/version_generator.py > \
foreign/openpgm/libpgm-2.0.23rc8/openpgm/pgm/version.c])
# Success! # Success!
AC_DEFINE(ZMQ_HAVE_OPENPGM, 1, [Have OpenPGM extension]) AC_DEFINE(ZMQ_HAVE_OPENPGM, 1, [Have OpenPGM extension])
pgm2_ext="yes" pgm_ext="yes"
else
# Fallback for make dist.
pgm_basename=${pgm2_basename}
fi fi
AC_SUBST(pgm_basename)
# If not on QNX nor OSX nor PGM add -pedantic into LIBZMQ_EXTRA_CXXFLAGS. # If not on QNX nor OSX nor PGM add -pedantic into LIBZMQ_EXTRA_CXXFLAGS.
if test "x$pedantic" = "xyes" -a "x$pgm2_ext" = "xno"; then if test "x$pedantic" = "xyes" -a "x$pgm_ext" = "xno"; then
LIBZMQ_EXTRA_CXXFLAGS="${LIBZMQ_EXTRA_CXXFLAGS} -pedantic" LIBZMQ_EXTRA_CXXFLAGS="${LIBZMQ_EXTRA_CXXFLAGS} -pedantic"
fi fi
# If not on QNX nor --with-pgm2 add -Werror into LIBZMQ_EXTRA_CXXFLAGS. # If not on QNX nor PGM add -Werror into LIBZMQ_EXTRA_CXXFLAGS.
if test "x$werror" = "xyes" -a "x$pgm2_ext" = "xno"; then if test "x$werror" = "xyes" -a "x$pgm_ext" = "xno"; then
LIBZMQ_EXTRA_CXXFLAGS="${LIBZMQ_EXTRA_CXXFLAGS} -Werror" LIBZMQ_EXTRA_CXXFLAGS="${LIBZMQ_EXTRA_CXXFLAGS} -Werror"
fi fi
@ -561,7 +542,7 @@ if test "x$with_perf" != "xno"; then
fi fi
fi fi
if test "x$with_perf" = "xno" -a "x$with_pgm2_examples" = "xyes"; then if test "x$with_perf" = "xno" -a "x$with_pgm_examples" = "xyes"; then
AC_MSG_ERROR([cannot configure --with-pgm-examples without --with-perf.]); AC_MSG_ERROR([cannot configure --with-pgm-examples without --with-perf.]);
fi fi
@ -578,15 +559,15 @@ AM_CONDITIONAL(BUILD_PYTHON, test "x$pyzmq" = "xyes")
AM_CONDITIONAL(BUILD_RUBY, test "x$rbzmq" = "xyes") AM_CONDITIONAL(BUILD_RUBY, test "x$rbzmq" = "xyes")
AM_CONDITIONAL(BUILD_C, test "x$czmq" = "xyes") AM_CONDITIONAL(BUILD_C, test "x$czmq" = "xyes")
AM_CONDITIONAL(BUILD_CPP, test "x$cppzmq" = "xyes") AM_CONDITIONAL(BUILD_CPP, test "x$cppzmq" = "xyes")
AM_CONDITIONAL(BUILD_PGM2, test "x$pgm2_ext" = "xyes") AM_CONDITIONAL(BUILD_PGM, test "x$pgm_ext" = "xyes")
AM_CONDITIONAL(BUILD_NO_PGM, test "x$pgm2_ext" = "xno") AM_CONDITIONAL(BUILD_NO_PGM, test "x$pgm_ext" = "xno")
AM_CONDITIONAL(BUILD_FORWARDER, test "x$forwarder" = "xyes") AM_CONDITIONAL(BUILD_FORWARDER, test "x$forwarder" = "xyes")
AM_CONDITIONAL(BUILD_STREAMER, test "x$streamer" = "xyes") AM_CONDITIONAL(BUILD_STREAMER, test "x$streamer" = "xyes")
AM_CONDITIONAL(BUILD_QUEUE, test "x$queue" = "xyes") AM_CONDITIONAL(BUILD_QUEUE, test "x$queue" = "xyes")
AM_CONDITIONAL(BUILD_PERF, test "x$perf" = "xyes") AM_CONDITIONAL(BUILD_PERF, test "x$perf" = "xyes")
AM_CONDITIONAL(BUILD_CHAT, test "x$chat" = "xyes") AM_CONDITIONAL(BUILD_CHAT, test "x$chat" = "xyes")
AM_CONDITIONAL(ON_MINGW, test "x$on_mingw32" = "xyes") AM_CONDITIONAL(ON_MINGW, test "x$on_mingw32" = "xyes")
AM_CONDITIONAL(BUILD_PGM2_EXAMPLES, test "x$with_pgm2_examples" = "xyes") AM_CONDITIONAL(BUILD_PGM_EXAMPLES, test "x$with_pgm_examples" = "xyes")
AM_CONDITIONAL(INSTALL_MAN, test "x$install_man" = "xyes") AM_CONDITIONAL(INSTALL_MAN, test "x$install_man" = "xyes")
AM_CONDITIONAL(BUILD_DOC, test "x$build_doc" = "xyes") AM_CONDITIONAL(BUILD_DOC, test "x$build_doc" = "xyes")
@ -595,7 +576,7 @@ AC_SUBST(inttypes)
# Subst LIBZMQ_EXTRA_CXXFLAGS & LDFLAGS # Subst LIBZMQ_EXTRA_CXXFLAGS & LDFLAGS
AC_SUBST(LIBZMQ_EXTRA_CXXFLAGS) AC_SUBST(LIBZMQ_EXTRA_CXXFLAGS)
AC_SUBST(LIBZMQ_EXTRA_LDFLAFS) AC_SUBST(LIBZMQ_EXTRA_LDFLAGS)
# Checks for library functions. # Checks for library functions.
@ -643,8 +624,8 @@ AC_MSG_RESULT([ Ruby library install dir: $rubydir])
fi fi
AC_MSG_RESULT([ Transports:]) AC_MSG_RESULT([ Transports:])
AC_MSG_RESULT([ tcp: yes]) AC_MSG_RESULT([ tcp: yes])
AC_MSG_RESULT([ udp: $pgm2_ext]) AC_MSG_RESULT([ udp: $pgm_ext])
AC_MSG_RESULT([ pgm: $pgm2_ext]) AC_MSG_RESULT([ pgm: $pgm_ext])
AC_MSG_RESULT([ inproc: yes]) AC_MSG_RESULT([ inproc: yes])
AC_MSG_RESULT([ Devices:]) AC_MSG_RESULT([ Devices:])
AC_MSG_RESULT([ Forwarder: $forwarder]) AC_MSG_RESULT([ Forwarder: $forwarder])

4
perf/c/Makefile.am
View File

@ -1,6 +1,6 @@
INCLUDES = -I$(top_builddir)/bindings/c INCLUDES = -I$(top_builddir)/bindings/c
if BUILD_PGM2_EXAMPLES if BUILD_PGM_EXAMPLES
PGM_EXAMPLES_BINS = pgmsend pgmrecv PGM_EXAMPLES_BINS = pgmsend pgmrecv
endif endif
@ -22,7 +22,7 @@ remote_thr_LDADD = $(top_builddir)/src/libzmq.la
remote_thr_SOURCES = remote_thr.c remote_thr_SOURCES = remote_thr.c
remote_thr_CXXFLAGS = -Wall -pedantic -Werror remote_thr_CXXFLAGS = -Wall -pedantic -Werror
if BUILD_PGM2_EXAMPLES if BUILD_PGM_EXAMPLES
if ON_MINGW if ON_MINGW
pgmexamples_diff_flags = \ pgmexamples_diff_flags = \

12
src/Makefile.am
View File

@ -15,7 +15,7 @@ include_HEADERS = ../bindings/c/zmq.h
endif endif
endif endif
if BUILD_PGM2 if BUILD_PGM
pgm_sources = ../foreign/openpgm/@pgm_basename@/openpgm/pgm/packet.c \ pgm_sources = ../foreign/openpgm/@pgm_basename@/openpgm/pgm/packet.c \
../foreign/openpgm/@pgm_basename@/openpgm/pgm/time.c \ ../foreign/openpgm/@pgm_basename@/openpgm/pgm/time.c \
../foreign/openpgm/@pgm_basename@/openpgm/pgm/if.c \ ../foreign/openpgm/@pgm_basename@/openpgm/pgm/if.c \
@ -49,6 +49,12 @@ pgm_sources = ../foreign/openpgm/@pgm_basename@/openpgm/pgm/packet.c \
../foreign/openpgm/@pgm_basename@/openpgm/pgm/log.c \ ../foreign/openpgm/@pgm_basename@/openpgm/pgm/log.c \
../foreign/openpgm/@pgm_basename@/openpgm/pgm/sockaddr.c \ ../foreign/openpgm/@pgm_basename@/openpgm/pgm/sockaddr.c \
../foreign/openpgm/@pgm_basename@/openpgm/pgm/version.c ../foreign/openpgm/@pgm_basename@/openpgm/pgm/version.c
../foreign/openpgm/@pgm_basename@/openpgm/pgm/version.c: ../foreign/openpgm/@pgm_basename@/openpgm/pgm/version_generator.py
python ../foreign/openpgm/@pgm_basename@/openpgm/pgm/version_generator.py > $@
../foreign/openpgm/@pgm_basename@/openpgm/pgm/galois_tables.c: ../foreign/openpgm/@pgm_basename@/openpgm/pgm/galois_generator.pl
perl ../foreign/openpgm/@pgm_basename@/openpgm/pgm/galois_generator.pl > $@
endif endif
nodist_libzmq_la_SOURCES = $(pgm_sources) nodist_libzmq_la_SOURCES = $(pgm_sources)
@ -171,9 +177,9 @@ libzmq_la_SOURCES = app_thread.hpp \
zmq_init.cpp \ zmq_init.cpp \
zmq_listener.cpp zmq_listener.cpp
libzmq_la_LDFLAGS = -version-info @LTVER@ @LIBZMQ_EXTRA_LDFLAFS@ libzmq_la_LDFLAGS = -version-info @LTVER@ @LIBZMQ_EXTRA_LDFLAGS@
if BUILD_PGM2 if BUILD_PGM
if ON_MINGW if ON_MINGW
libpgm_diff_flags = \ libpgm_diff_flags = \