#
# patch "ChangeLog"
#  from [3c0d9acb484749034419b0a50eaeb9a1bb38ce03]
#    to [309fcedff867ffaedd26129b1fdf647f7bbf16a5]
#
# patch "Makefile.am"
#  from [acaae1ea3c764b2412d2cb206a6aefec9117b307]
#    to [31beedd49804a4b036c3eb3248965eae4870a109]
#
# patch "configure.ac"
#  from [07406e7a6627f265e35c0cdb094dcd8c32a7f9b7]
#    to [ffbe2607f289d15629f1b168438a3ee1b98d3771]
#
========================================================================
--- ChangeLog	3c0d9acb484749034419b0a50eaeb9a1bb38ce03
+++ ChangeLog	309fcedff867ffaedd26129b1fdf647f7bbf16a5
@@ -1,3 +1,8 @@
+2005-10-10  Matt Johnston  <address@hidden>
+
+	* configure.ac, Makefile.am: add {MONOTONE,LIB3RDPARTY}_C{,XX}FLAGS
+	variables.
+
 2005-10-10  Benoît Dejean <address@hidden>

 	* commands.cc: s/key store/keystore/g.
========================================================================
--- Makefile.am	acaae1ea3c764b2412d2cb206a6aefec9117b307
+++ Makefile.am	31beedd49804a4b036c3eb3248965eae4870a109
@@ -230,8 +230,6 @@
 			$(NETXX_SOURCES) \
 			$(LUA_SOURCES) \
 			$(SQLITE_SOURCES)
-# We want to be able to throw exceptions through the Lua interpreter
-lib3rdparty_a_CFLAGS = $(AM_CFLAGS)

 # flags

@@ -241,9 +239,13 @@
 AM_LDFLAGS =

 lib3rdparty_a_CPPFLAGS =
+lib3rdparty_a_CFLAGS = $(AM_CFLAGS) $(LIB3RDPARTY_CFLAGS)
+lib3rdparty_a_CXXFLAGS = $(AM_CXXFLAGS) $(LIB3RDPARTY_CXXFLAGS)

 monotone_LDFLAGS =
 monotone_CPPFLAGS = -I$(top_srcdir)/lua -I$(top_srcdir)/sqlite
+monotone_CFLAGS = $(AM_CFLAGS) $(MONOTONE_CFLAGS)
+monotone_CXXFLAGS = $(AM_CXXFLAGS) $(MONOTONE_CXXFLAGS)

 unit_tests_LDFLAGS =
 unit_tests_CPPFLAGS = -DBUILD_UNIT_TESTS -I$(top_srcdir)/lua -I$(top_srcdir)/sqlite
========================================================================
--- configure.ac	07406e7a6627f265e35c0cdb094dcd8c32a7f9b7
+++ configure.ac	ffbe2607f289d15629f1b168438a3ee1b98d3771
@@ -422,6 +422,13 @@
 AC_CHECK_FUNC(getaddrinfo, [AM_CONDITIONAL(MISSING_GETADDRINFO, false)],
 			   [AM_CONDITIONAL(MISSING_GETADDRINFO, true)])

+# allow compiling with different flags/optimisation
+# for monotone versus libs, useful for testing.
+# only makes sense if CFLAGS="" or CXXFLAGS=""
+AC_SUBST(MONOTONE_CFLAGS)
+AC_SUBST(MONOTONE_CXXFLAGS)
+AC_SUBST(LIB3RDPARTY_CFLAGS)
+AC_SUBST(LIB3RDPARTY_CXXFLAGS)

 AC_CONFIG_FILES([Makefile tests/atlocal po/Makefile.in])
 AC_OUTPUT