summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile.am7
-rw-r--r--configure.in15
-rw-r--r--src/Makefile.am11
3 files changed, 21 insertions, 12 deletions
diff --git a/Makefile.am b/Makefile.am
index 1100eb2..fe0f1f0 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -5,12 +5,13 @@ endif
SUBDIRS = src $(DIR_PERF) devices bindings
DIST_SUBDIRS = src perf devices bindings
-EXTRA_DIST = $(top_srcdir)/foreign/openpgm/@pgm_basename@.tar.bz2 \
+EXTRA_DIST = $(top_srcdir)/foreign/openpgm/@pgm1_basename@.tar.bz2 \
+$(top_srcdir)/foreign/openpgm/@pgm2_basename@ \
$(top_srcdir)/foreign/openpgm/lost_data_tsi.patch \
$(top_srcdir)/foreign/openpgm/create_custom_gsi_1.patch \
$(top_srcdir)/foreign/xmlParser/xmlParser.cpp \
$(top_srcdir)/foreign/xmlParser/xmlParser.hpp
dist-hook:
- -rm -rf $(distdir)/foreign/openpgm/@pgm_basename@
-
+ -rm -rf $(distdir)/foreign/openpgm/@pgm1_basename@
+ -rm -rf $(distdir)/foreign/openpgm/@pgm2_basename@/openpgm/pgm/ref/debug
diff --git a/configure.in b/configure.in
index 42178d2..7f192d1 100644
--- a/configure.in
+++ b/configure.in
@@ -1,10 +1,10 @@
# -*- Autoconf -*-
# Process this file with autoconf to produce a configure script.
AC_PREREQ(2.61)
-AC_INIT([zeromq],[dev])
+AC_INIT([zeromq],[dev],[http://www.zeromq.org])
AC_CONFIG_AUX_DIR(config)
AM_CONFIG_HEADER(src/platform.hpp)
-AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION)
+AM_INIT_AUTOMAKE(tar-ustar)
# libzmq -version-info
LTVER="0:0:0"
@@ -22,6 +22,7 @@ AM_PROG_CC_C_O
# Checks for programs.
AC_PROG_CXX
+AC_LIBTOOL_WIN32_DLL
AC_PROG_LIBTOOL
AC_PROG_SED
AC_PROG_AWK
@@ -356,6 +357,12 @@ fi
pgm1_ext="no"
pgm2_ext="no"
+pgm1_basename="libpgm-1.2.14"
+pgm2_basename="libpgm-dev"
+
+AC_SUBST(pgm1_basename)
+AC_SUBST(pgm2_basename)
+
pgm_basename=""
AC_ARG_WITH([pgm], [AS_HELP_STRING([--with-pgm],
@@ -372,7 +379,7 @@ fi
if test "x$with_pgm1_ext" != "xno"; then
- pgm_basename="libpgm-1.2.14"
+ pgm_basename=${pgm1_basename}
# Test if we have pkg-config
if test "x$have_pkg_config" != "xyes"; then
@@ -466,7 +473,7 @@ fi
if test "x$with_pgm2_ext" != "xno"; then
- pgm_basename="libpgm-dev"
+ pgm_basename=${pgm2_basename}
# Test if we have pkg-config
if test "x$have_pkg_config" != "xyes"; then
diff --git a/src/Makefile.am b/src/Makefile.am
index 75838ff..807a9c8 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -16,7 +16,7 @@ endif
endif
if BUILD_PGM1
-nodist_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/timer.c \
../foreign/openpgm/@pgm_basename@/openpgm/pgm/if.c \
../foreign/openpgm/@pgm_basename@/openpgm/pgm/gsi.c \
@@ -33,7 +33,7 @@ nodist_pgm_sources = ../foreign/openpgm/@pgm_basename@/openpgm/pgm/packet.c \
endif
if BUILD_PGM2
-nodist_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/if.c \
../foreign/openpgm/@pgm_basename@/openpgm/pgm/getifaddrs.c \
@@ -64,8 +64,9 @@ nodist_pgm_sources = ../foreign/openpgm/@pgm_basename@/openpgm/pgm/packet.c \
../foreign/openpgm/@pgm_basename@/openpgm/pgm/glib-compat.c
endif
-libzmq_la_SOURCES = $(pgm_sources) \
- app_thread.hpp \
+nodist_libzmq_la_SOURCES = $(pgm_sources)
+
+libzmq_la_SOURCES = app_thread.hpp \
atomic_bitmap.hpp \
atomic_counter.hpp \
atomic_ptr.hpp \
@@ -269,6 +270,6 @@ libzmq_la_CXXFLAGS = -Wall @LIBZMQ_EXTRA_CXXFLAGS@
endif
dist-hook:
- -rm $(distdir)/src/platform.hpp
+ -rm $(distdir)/platform.hpp