diff --git a/Makefile-libostree.am b/Makefile-libostree.am index 192db36e..28126487 100644 --- a/Makefile-libostree.am +++ b/Makefile-libostree.am @@ -147,10 +147,11 @@ libostree_1_la_SOURCES += \ endif libostree_1_la_CFLAGS = $(AM_CFLAGS) -I$(srcdir)/bsdiff -I$(srcdir)/libglnx -I$(srcdir)/src/libotutil -I$(srcdir)/src/libostree -I$(builddir)/src/libostree \ - $(OT_INTERNAL_GIO_UNIX_CFLAGS) $(OT_INTERNAL_GPGME_CFLAGS) $(OT_DEP_LZMA_CFLAGS) $(OT_DEP_ZLIB_CFLAGS) \ + $(OT_INTERNAL_GIO_UNIX_CFLAGS) $(OT_INTERNAL_GPGME_CFLAGS) $(OT_DEP_LZMA_CFLAGS) $(OT_DEP_ZLIB_CFLAGS) $(OT_DEP_OPENSSL_CFLAGS) \ -fvisibility=hidden '-D_OSTREE_PUBLIC=__attribute__((visibility("default"))) extern' libostree_1_la_LDFLAGS = -version-number 1:0:0 -Bsymbolic-functions -Wl,--version-script=$(top_srcdir)/src/libostree/libostree.sym -libostree_1_la_LIBADD = libotutil.la libglnx.la libbsdiff.la libostree-kernel-args.la $(OT_INTERNAL_GIO_UNIX_LIBS) $(OT_INTERNAL_GPGME_LIBS) $(OT_DEP_LZMA_LIBS) $(OT_DEP_ZLIB_LIBS) +libostree_1_la_LIBADD = libotutil.la libglnx.la libbsdiff.la libostree-kernel-args.la $(OT_INTERNAL_GIO_UNIX_LIBS) $(OT_INTERNAL_GPGME_LIBS) \ + $(OT_DEP_LZMA_LIBS) $(OT_DEP_ZLIB_LIBS) $(OT_DEP_OPENSSL_LIBS) libostree_1_la_LIBADD += $(bupsplitpath) EXTRA_libostree_1_la_DEPENDENCIES = $(top_srcdir)/src/libostree/libostree.sym diff --git a/configure.ac b/configure.ac index 0afd87e1..d43536e3 100644 --- a/configure.ac +++ b/configure.ac @@ -298,10 +298,10 @@ AS_IF([ test x$with_smack = xyes], [ ]) AM_CONDITIONAL(USE_SMACK, test $with_smack != no) -dnl begin openssl -OPENSSL_DEPENDENCY="libselinux >= 1.0.1" +dnl begin openssl (really just libcrypto right now) +OPENSSL_DEPENDENCY="libcrypto >= 1.0.1" AC_ARG_WITH(openssl, -AS_HELP_STRING([--with-openssl], [Enable use of OpenSSL (checksums)]), +AS_HELP_STRING([--with-openssl], [Enable use of OpenSSL libcrypto (checksums)]), :, with_openssl=no) AS_IF([ test x$with_openssl != xno ], [ @@ -447,7 +447,7 @@ echo " HTTP backend: $fetcher_backend \"ostree trivial-httpd\": $enable_trivial_httpd_cmdline SELinux: $with_selinux - OpenSSL (checksums): $with_openssl + OpenSSL libcrypto (checksums): $with_openssl systemd: $have_libsystemd libmount: $with_libmount libarchive (parse tar files directly): $with_libarchive