updated Makefile.am; added container- and signalfunc

diff --git a/Makefile.am b/Makefile.am
index 2bcfce8..19d047c 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,4 @@
-AUTOMAKE_OPTIONS = foreign 1.10
+AUTOMAKE_OPTIONS = foreign 1.4
 ACLOCAL_AMFLAGS = -I m4macros
 
 if HAVE_LIBT2N

diff --git a/utils/Makefile.am b/utils/Makefile.am
index f56b227..7e4795c 100644 (file)
--- a/utils/Makefile.am
+++ b/utils/Makefile.am
@@ -1,10 +1,25 @@
+AUTOMAKEOPTIONS = foreign 1.4
+
 INCLUDES = @BOOST_CPPFLAGS@
 METASOURCES = AUTO
+
 lib_LTLIBRARIES = libasyncio_utils.la
+
+if HAVE_LIBI2NCOMMON
+compat_headers=
+compat_sources=
+else
+compat_headers= i2ncommon/containerfunc.hpp i2ncommon/signalfunc.hpp
+compat_sources= i2ncommon/containerfunc.cpp i2ncommon/signalfunc.cpp
+endif
+
 include_HEADERS = asyncio_ptr_list.hpp asyncio_utils.hpp asyncio_time_tools.hpp \
-       asyncio_pointer_func.hpp asyncio_system_tools.hpp
+       asyncio_pointer_func.hpp asyncio_system_tools.hpp \
+       asnycio_containerfunc.hpp asyncio_signalfunc.hpp \
+       $(compat_headers)
 libasyncio_utils_la_SOURCES = asyncio_time_tools.cpp asyncio_utils.cpp \
-       asyncio_system_tools.cpp
+       asyncio_system_tools.cpp \
+       $(compat_sources)
 
 libasyncio_utils_la_LDFLAGS = -version-info @LIBASYNCIO_LIB_VERSION@