# # # patch "Makefile" # from [cc524f60efa7e5797e956c0574071ff53188db89] # to [a08a3b88c66ad02fa99b951e989780617ce2a4da] # # patch "configure.ac" # from [f43ff3f89e46fbc86684dc6a2008b90cfd7c9355] # to [7099114251fbf1712393a6ec463554fb3edb63df] # ============================================================ --- Makefile cc524f60efa7e5797e956c0574071ff53188db89 +++ Makefile a08a3b88c66ad02fa99b951e989780617ce2a4da @@ -65,7 +65,7 @@ LIB3RDPARTY_OBJ = $(C_OBJ) ifdef SQLITE_LIBS LIB3RDPARTY_OBJ = $(C_OBJ) -SQLITE_LINK = -ccopt "$(SQLITE_LIBS)" +SQLITE_LINK = -cclib "$(SQLITE_LIBS)" else LIB3RDPARTY_OBJ = $(MONOTONE_DIR)/sqlite/lib3rdparty_a-*.o $(C_OBJ) endif ============================================================ --- 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)