On Thu, Oct 09, 2008 at 11:08:40AM +0200, Markus Wanner wrote:
> Hi,
>
> Jack Lloyd wrote:
> > OK, if I change in botan.m4
> >
> > - CFLAGS="$CFLAGS $BOTAN_CPPFLAGS"
> > + CPPFLAGS="$CPPFLAGS $BOTAN_CPPFLAGS"
>
> Ah! Thank you very much for pointing this out.
>
> Looks like configure on my system simply picked the system installed
> botan during that stage, but then continued to use the provided botan :-(
>
> I've removed my system wide botan and can confirm that the issue is
> solved now. (As of e5f6d85442972da43d641bd3d7bf5d6667bbd23a).
>
I've attached some changes to botan.m4
Use "quotes" around #error messages - I saw spurious GCC errors that
popped up about the use of unmatched single quotes and punct - these
errors might be confusing to someone trying to debug a build problem.
Accept versions up to 1.7.17 (which is basically just ticking the
sover up on mainline post-1.7.16, nothing substantial so far). [It
Works For Me (tm)]
Print the found version of Botan (perhaps mildly informative to the
user, and the version is already in a variable for us).
-Jack
#
# old_revision [e5f6d85442972da43d641bd3d7bf5d6667bbd23a]
#
# patch "m4/botan.m4"
# from [f6702730c3d9eb82ccc969d705d200dfa34f5581]
# to [910876c2b7187e564deb220e01b953d36cb55cc8]
#
============================================================
--- m4/botan.m4 f6702730c3d9eb82ccc969d705d200dfa34f5581
+++ m4/botan.m4 910876c2b7187e564deb220e01b953d36cb55cc8
@@ -1,6 +1,6 @@
# Currently we accept botan version 1.7.8 and newer, limited to the
# development branch 1.7, emitting a warning if the found botan is
-# newer than 1.7.16.
+# newer than 1.7.17.
AC_DEFUN([MTN_FIND_BOTAN],
[
@@ -25,11 +25,11 @@ AC_DEFUN([MTN_FIND_BOTAN],
#include <botan/build.h>
#ifndef BOTAN_VERSION_MAJOR
-#error Botan didn't define version macros?!?
+#error "Botan did not define version macros"
#endif
#if BOTAN_VERSION_MAJOR != 1
-#error Botan major version mismatch.
+#error "Botan major version mismatch"
#endif],
[botan_version_match=yes],
[botan_version_match=no])
@@ -43,7 +43,7 @@ AC_DEFUN([MTN_FIND_BOTAN],
#include <botan/build.h>
#if BOTAN_VERSION_PATCH < 8
-#error Botan is too old
+#error "Botan is too old"
#endif],
[botan_version_match=yes],
[botan_version_match=no])
@@ -56,7 +56,7 @@ AC_DEFUN([MTN_FIND_BOTAN],
AC_PREPROC_IFELSE([
#include <botan/build.h>
-#if BOTAN_VERSION_PATCH > 16
+#if BOTAN_VERSION_PATCH > 17
#error Botan from the future
#endif],
[botan_version_match=yes],
@@ -66,7 +66,7 @@ AC_DEFUN([MTN_FIND_BOTAN],
fi
CPPFLAGS="$save_CPPFLAGS"
- AC_MSG_RESULT([yes])
+ AC_MSG_RESULT([yes ($BOTAN_VERSION)])
AC_MSG_NOTICE([using botan compile flags: "$BOTAN_CPPFLAGS"])
AC_MSG_NOTICE([using botan link flags: "$BOTAN_LIBS"])
_______________________________________________
Monotone-devel mailing list
Monotone-devel@nongnu.org
http://lists.nongnu.org/mailman/listinfo/monotone-devel
