#
#
# patch "Makefile.am"
#  from [5ee498d0f56c6b46fc4eb23929432b79e56b09e2]
#    to [c5e30b4ffd7833c2d1dd64720e97ef272b993cce]
# 
# patch "m4/botan.m4"
#  from [c3b115c9be716601db0f21612a5a6b1e4ac720ab]
#    to [e9cd9dc87a81965e626353055f6c58c86a63d947]
#
============================================================
--- Makefile.am	5ee498d0f56c6b46fc4eb23929432b79e56b09e2
+++ Makefile.am	c5e30b4ffd7833c2d1dd64720e97ef272b993cce
@@ -336,7 +336,7 @@ EXTRA_DIST = $(PDF_FIGURES) $(PNG_FIGURE
 	contrib/colorize contrib/color-logs.sh contrib/color-logs.conf	\
 	contrib/get_stdio.pl contrib/ciabot_monotone_hookversion.py	\
 	contrib/Monotone.pm $(wildcard $(srcdir)/contrib/*.lua)		\
-	$(wildcard $(srcdir)/contrib/command/*.lua)			\	
+	$(wildcard $(srcdir)/contrib/command/*.lua)			\
 	contrib/command/README $(wildcard $(srcdir)/examples/*)		\
 	win32/monotone.iss win32/modpath.iss $(wildcard			\
 	$(srcdir)/debian/*) mac/monotone-pkg-logo.gif			\
============================================================
--- m4/botan.m4	c3b115c9be716601db0f21612a5a6b1e4ac720ab
+++ m4/botan.m4	e9cd9dc87a81965e626353055f6c58c86a63d947
@@ -43,13 +43,14 @@ AC_DEFUN([MTN_FIND_BOTAN],
 #endif],
     [botan_version_match=yes],
     [botan_version_match=no])
-    if test $botan_version_match = no; then
-      AC_MSG_WARN([Your botan library version ($BOTAN_VERSION) is newer than expected. Monotone might not build cleanly.])
-    fi
 
     CPPFLAGS="$save_CPPFLAGS"
     AC_MSG_RESULT([yes (version $BOTAN_VERSION)])
 
+    if test $botan_version_match = no; then
+      AC_MSG_WARN([Your botan library version ($BOTAN_VERSION) is newer than expected. Monotone might not build cleanly.])
+    fi
+
     # AC_MSG_NOTICE([using botan compile flags: "$BOTAN_CPPFLAGS"])
     # AC_MSG_NOTICE([using botan link flags: "$BOTAN_LIBS"])