The unified diff between revisions [9af6e795..] and [594720f0..] is displayed below. It can also be downloaded as a raw diff.

This diff has been restricted to the following files: 'configure.ac'

#
#
# patch "configure.ac"
#  from [f43ff3f89e46fbc86684dc6a2008b90cfd7c9355]
#    to [7099114251fbf1712393a6ec463554fb3edb63df]
#
============================================================
--- configure.ac	f43ff3f89e46fbc86684dc6a2008b90cfd7c9355
+++ configure.ac	7099114251fbf1712393a6ec463554fb3edb63df
@@ -1,4 +1,4 @@
-AC_INIT(monotone-viz, 0.14)
+AC_INIT(monotone-viz, 0.15)

 AC_PROG_OCAML
 AC_PROG_OCAML_TOOLS
@@ -97,7 +97,7 @@ AC_ARG_WITH([shared-sqlite],
 	                   [use a system-wide shared sqlite library]),
             SHARED_SQLITE=$withval,
             SHARED_SQLITE=maybe)
-if test "$SHARED_SQLITE" = "yes" -o "$SHARED_SQLITE" = "maybe" ; then
+if test "$SHARED_SQLITE" = "yes" -o '(' "$SHARED_SQLITE" = "maybe" -a ! -d "$MONOTONE_DIR" ')' ; then
   # Actually we need at least 3.2.2 but the micro number isn't in the
   # pkgconfig file (sigh)
   PKG_CHECK_MODULES(SQLITE, sqlite3 >= 3.2,
@@ -126,8 +126,10 @@ AC_SUBST(MONOTONE_DIR)


 # Check for libcrypto using pkg-config, defaulting to /usr/lib
+AC_MSG_CHECKING(OpenSSL's crypto lib)
 CRYPTO_LIB_DIR="$(pkg-config openssl --variable=libdir)"
 CRYPTO_LIB="${CRYPTO_LIB_DIR:-/usr/lib}/libcrypto.a"
+AC_MSG_RESULT($CRYPTO_LIB)
 AC_SUBST(CRYPTO_LIB)