The unified diff between revisions [850c20aa..] and [a80e1661..] is displayed below. It can also be downloaded as a raw diff.

This diff has been restricted to the following files: 'Makefile.am'

#
#
# patch "Makefile.am"
#  from [f64733542ba308ba4047d2e7cfc8a18f95d0eb4c]
#    to [5f3e4aae1a4f7f3de4b7336190009b720b04432c]
#
============================================================
--- Makefile.am	f64733542ba308ba4047d2e7cfc8a18f95d0eb4c
+++ Makefile.am	5f3e4aae1a4f7f3de4b7336190009b720b04432c
@@ -49,7 +49,7 @@ MOST_SOURCES =								\
 	 netio.hh smap.hh gettext.h					\
          package_revision.c package_revision.h				\
          package_full_revision.c package_full_revision.h options.hh     \
-         i18n.h
+         i18n.h hash_map.hh

 NETXX_SOURCES =									\
 	netxx/accept.cxx netxx/accept.h netxx/address.cxx			\
@@ -145,7 +145,7 @@ BOTAN_SOURCES =
         botan/data_src.h botan/es_egd.h botan/look_add.h botan/ofb.h	\
         botan/pk_util.h botan/ui.h botan/blinding.h botan/defalloc.h	\
         botan/es_file.h botan/look_pk.h botan/oids.h botan/pubkey.h	\
-        botan/util.h
+        botan/util.h botan/charset.h botan/hash_id.h


 BOOST_SANDBOX_SOURCES = \
@@ -231,8 +231,8 @@ AM_CPPFLAGS =
 # flags

 AM_CPPFLAGS =
-AM_CFLAGS = $(AM_CPPFLAGS) -DTEMP_STORE=1 -DNDEBUG -DBOOST_DISABLE_THREADS -DSQLITE_OMIT_CURSOR $(SQLITE_CPPFLAGS)
-AM_CXXFLAGS = $(AM_CPPFLAGS) -DNDEBUG -DBOOST_DISABLE_THREADS
+AM_CFLAGS = $(AM_CPPFLAGS) -DTEMP_STORE=1 -DNDEBUG -DBOOST_DISABLE_THREADS -DBOOST_SP_DISABLE_THREADS -DSQLITE_OMIT_CURSOR $(SQLITE_CPPFLAGS)
+AM_CXXFLAGS = $(AM_CPPFLAGS) -DNDEBUG -DBOOST_DISABLE_THREADS -DBOOST_SP_DISABLE_THREADS
 AM_LDFLAGS =

 lib3rdparty_a_CPPFLAGS =