From: Arvin Schnell Date: Mon, 8 Aug 2022 06:12:35 +0000 (+0200) Subject: - check for zlib X-Git-Tag: v0.10.3~6^2 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F739%2Fhead;p=thirdparty%2Fsnapper.git - check for zlib --- diff --git a/configure.ac b/configure.ac index 39def820..ff43b730 100644 --- a/configure.ac +++ b/configure.ac @@ -177,6 +177,7 @@ fi PKG_CHECK_MODULES(DBUS, dbus-1) PKG_CHECK_MODULES(XML2, libxml-2.0) PKG_CHECK_MODULES(JSONC, json-c, [], [AC_MSG_WARN([Cannot find json-c. Please install libjson-c-devel])]) +PKG_CHECK_MODULES(ZLIB, zlib) AC_CHECK_HEADER(acl/libacl.h,[],[AC_MSG_ERROR([Cannout find libacl headers. Please install libacl-devel])]) diff --git a/snapper/Makefile.am b/snapper/Makefile.am index c465ca21..fe7ab6d0 100644 --- a/snapper/Makefile.am +++ b/snapper/Makefile.am @@ -4,8 +4,6 @@ AM_CXXFLAGS = -D_FILE_OFFSET_BITS=64 -AM_CPPFLAGS = $(XML2_CFLAGS) - lib_LTLIBRARIES = libsnapper.la libsnapper_la_SOURCES = \ @@ -63,8 +61,9 @@ libsnapper_la_SOURCES += \ Selinux.cc Selinux.h endif +libsnapper_la_CPPFLAGS = $(XML2_CFLAGS) $(ZLIB_CFLAGS) libsnapper_la_LDFLAGS = -version-info @LIBVERSION_INFO@ -libsnapper_la_LIBADD = -lboost_thread -lboost_system $(XML2_LIBS) -lacl -lz +libsnapper_la_LIBADD = -lboost_thread -lboost_system $(XML2_LIBS) -lacl $(ZLIB_LIBS) if ENABLE_ROLLBACK libsnapper_la_LIBADD += -lmount endif