From 75a5a8732cd5be1bb3bff608e352bf4ac624ffd4 Mon Sep 17 00:00:00 2001 From: Martin Sustrik Date: Wed, 2 Sep 2009 10:59:31 +0200 Subject: --disable-shared & C perf tests: a better way --- configure.in | 1 + perf/c/Makefile.am | 8 ++++---- src/platform.hpp.in | 3 +++ 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/configure.in b/configure.in index 0cd28a5..f1789b6 100644 --- a/configure.in +++ b/configure.in @@ -18,6 +18,7 @@ AC_PROG_LIBTOOL # Checks for libraries. AC_CHECK_LIB(pthread, pthread_create) +AC_CHECK_LIB(stdc++, malloc) # Host speciffic checks AC_CANONICAL_HOST diff --git a/perf/c/Makefile.am b/perf/c/Makefile.am index 8a88ede..6762e66 100644 --- a/perf/c/Makefile.am +++ b/perf/c/Makefile.am @@ -2,19 +2,19 @@ INCLUDES = -I$(top_builddir)/include bin_PROGRAMS = local_lat remote_lat local_thr remote_thr -local_lat_LDADD = $(top_builddir)/src/libzmq.la -lstdc++ +local_lat_LDADD = $(top_builddir)/src/libzmq.la local_lat_SOURCES = local_lat.c local_lat_CXXFLAGS = -Wall -pedantic -Werror -remote_lat_LDADD = $(top_builddir)/src/libzmq.la -lstdc++ +remote_lat_LDADD = $(top_builddir)/src/libzmq.la remote_lat_SOURCES = remote_lat.c remote_lat_CXXFLAGS = -Wall -pedantic -Werror -local_thr_LDADD = $(top_builddir)/src/libzmq.la -lstdc++ +local_thr_LDADD = $(top_builddir)/src/libzmq.la local_thr_SOURCES = local_thr.c local_thr_CXXFLAGS = -Wall -pedantic -Werror -remote_thr_LDADD = $(top_builddir)/src/libzmq.la -lstdc++ +remote_thr_LDADD = $(top_builddir)/src/libzmq.la remote_thr_SOURCES = remote_thr.c remote_thr_CXXFLAGS = -Wall -pedantic -Werror diff --git a/src/platform.hpp.in b/src/platform.hpp.in index 9968758..5feeed4 100644 --- a/src/platform.hpp.in +++ b/src/platform.hpp.in @@ -36,6 +36,9 @@ /* Define to 1 if you have the `socket' library (-lsocket). */ #undef HAVE_LIBSOCKET +/* Define to 1 if you have the `stdc++' library (-lstdc++). */ +#undef HAVE_LIBSTDC__ + /* Define to 1 if you have the `uuid' library (-luuid). */ #undef HAVE_LIBUUID -- cgit v1.2.3