# # patch "config.make.in" # from [0b9565fac383b2c3f5ff40ecdefbf84a04c36089] # to [a159f50289f1a1cb333ba6caf59d63cfc9ed38cc] # # patch "configure.ac" # from [491d04e192e312e6100f0c893e24da956c316e76] # to [e5b02da6f834e4f4e61b85f925a2b7ba87c7be9d] # ======================================================================== --- config.make.in 0b9565fac383b2c3f5ff40ecdefbf84a04c36089 +++ config.make.in a159f50289f1a1cb333ba6caf59d63cfc9ed38cc @@ -10,7 +10,7 @@ MONOTONE_DIR := @MONOTONE_DIR@ LABLGTK_DIR := @LABLGTK_DIR@ -CRYPTO_LIB := /usr/lib/libcrypto.a +CRYPTO_LIB := @CRYPTO_LIB@ SQLITE_CFLAGS := @SQLITE_CFLAGS@ SQLITE_LIBS := @SQLITE_LIBS@ CPPFLAGS := @CPPFLAGS@ ======================================================================== --- configure.ac 491d04e192e312e6100f0c893e24da956c316e76 +++ configure.ac e5b02da6f834e4f4e61b85f925a2b7ba87c7be9d @@ -56,7 +56,7 @@ SHARED_SQLITE=no) AC_MSG_CHECKING(sqlite) if test "$SHARED_SQLITE" = "yes" ; then - PKG_CHECK_MODULES(SQLITE, sqlite >= 3.0,,AC_MSG_ERROR([ + PKG_CHECK_MODULES(SQLITE, sqlite3 >= 3.0,,AC_MSG_ERROR([ Couldn't use the shared sqlite package.])) elif test -d "$MONOTONE_DIR" -a -r "$MONOTONE_DIR/sqlite/lib3rdparty_a-main.o" ; then AC_MSG_RESULT(found in $MONOTONE_DIR/sqlite) @@ -73,6 +73,13 @@ fi AC_SUBST(MONOTONE_DIR) + +# Check for libcrypto using pkg-config, defaulting to /usr/lib +CRYPTO_LIB_DIR=$(pkg-config openssl --variable=libdir) +CRYPTO_LIB=${CRYPTO_LIB_DIR:-/usr/lib}/libcrypto.a +AC_SUBST(CRYPTO_LIB) + + # Keep CPPFLAGS around, can be useful if caml headers are in a # non-standard location. AC_SUBST(CPPFLAGS)