Kelson has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/295038 )
Change subject: Update zimwriterfs makefiles. ...................................................................... Update zimwriterfs makefiles. Change-Id: Ic0f93e19eb3e07d86c115bd15f47ef5fbc74f954 --- M zimwriterfs/Makefile.am M zimwriterfs/README.md M zimwriterfs/configure.ac 3 files changed, 22 insertions(+), 49 deletions(-) Approvals: Kelson: Verified; Looks good to me, approved diff --git a/zimwriterfs/Makefile.am b/zimwriterfs/Makefile.am index 308149d..e52da96 100644 --- a/zimwriterfs/Makefile.am +++ b/zimwriterfs/Makefile.am @@ -1,5 +1,3 @@ AUTOMAKE_OPTIONS=subdir-objects bin_PROGRAMS=zimwriterfs zimwriterfs_SOURCES= zimwriterfs.cpp gumbo/utf8.c gumbo/string_buffer.c gumbo/parser.c gumbo/error.c gumbo/string_piece.c gumbo/tag.c gumbo/vector.c gumbo/tokenizer.c gumbo/util.c gumbo/char_ref.c gumbo/attribute.c -zimwriterfs_CXXFLAGS=$(LIBZIM_CFLAGS) $(LIBLZMA_CFLAGS) $(LIBZ_CFLAGS) $(LIBMAGIC_CFLAGS) $(LIBPTHREAD_CFLAGS) $(CFLAGS) $(CXXFLAGS) -zimwriterfs_LDFLAGS=$(LIBZIM_LDFLAGS) $(LIBLZMA_LDFLAGS) $(LIBZ_LDFLAGS) $(LIBMAGIC_LDFLAGS) $(LIBPTHREAD_LDFLAGS) \ No newline at end of file diff --git a/zimwriterfs/README.md b/zimwriterfs/README.md index 797f6fb..db8a01d 100644 --- a/zimwriterfs/README.md +++ b/zimwriterfs/README.md @@ -29,10 +29,16 @@ packaged), resp. for the mimeType detection * libz (http://www.zlib.net/), resp. for unpack compressed HTML files +On Debian, you can ensure these are installed with: +``` +sudo apt-get install liblzma-dev libmagic-dev zlib1g-dev +cd ../zimlib && ./autogen.sh && ./configure && make && cd ../zimwriterfs +``` + Once the dependencies are in place, to build: ``` ./autogen.sh -./configure +./configure CXXFLAGS=-I../zimlib/include LDFLAGS=-L../zimlib/src/.libs make ``` diff --git a/zimwriterfs/configure.ac b/zimwriterfs/configure.ac index 5a01142..9c80493 100644 --- a/zimwriterfs/configure.ac +++ b/zimwriterfs/configure.ac @@ -33,70 +33,39 @@ AC_MSG_ERROR([[cannot find pkg-config]]) fi -# Check if the liblzma is available +# Set up CXXFLAGS/LDFLAGS and ensure they are substituted +AC_ARG_VAR(CXXFLAGS, [C++ compiler flags]) +AC_ARG_VAR(LDFLAGS, linker flags) +CFLAGS="-O3 -std=gnu99 -std=c99 $CFLAGS" +CXXFLAGS="-O3 -Igumbo $CXXFLAGS" + +# Check if the liblzma library is available AC_CHECK_HEADER([lzma.h],, [AC_MSG_ERROR([[cannot find lzma header]])]) AC_CHECK_LIB([lzma], [lzma_version_string],, [AC_MSG_ERROR([[cannot find lzma]])]) -# Check if the libzim is available +# Check if the libzim library is available AC_CHECK_HEADER([zim/zim.h],, [AC_MSG_ERROR([[cannot find libzim header]])]) AC_CHECK_LIB([zim], [zim_MD5Init],, [AC_MSG_ERROR([[cannot find libzim]])]) -# Check if the libmagic is available +# Check if the libz library is available +AC_CHECK_HEADER([zlib.h],, [AC_MSG_ERROR([[cannot find libz header]])]) +AC_CHECK_LIB([z], [deflate],, [AC_MSG_ERROR([[cannot find libz]])]) + +# Check if the libmagic library is available AC_CHECK_HEADER([magic.h],, [AC_MSG_ERROR([[cannot find libmagic header]])]) AC_CHECK_LIB([magic], [magic_file],, [AC_MSG_ERROR([[cannot find libmagic]])]) -# Check if the libpthread is available +# Check if the libpthread library is available AC_CHECK_HEADER([pthread.h],, [AC_MSG_ERROR([[cannot find libpthread header]])]) AC_CHECK_LIB([pthread], [pthread_exit],, [AC_MSG_ERROR([[cannot find libpthread]])]) -# Set current language to C++ -AC_LANG(C++) - # Check the existence of stat64 (to handle file >2GB) in the libc AC_CHECK_FUNCS([stat64]) - -# cxxflags -CXXFLAGS="-O3 -Igumbo $CXXFLAGS" -CFLAGS="-O3 -std=gnu99 -std=c99" - -# liblzma -LIBLZMA_CFLAGS="" -LIBLZMA_LDFLAGS=" -llzma" - -# libzim -LIBZIM_CFLAGS="" -LIBZIM_LDFLAGS=" -lzim" - -# libz -LIBZ_CFLAGS="" -LIBZ_LDFLAGS=" -lz" - -# libmagic -LIBMAGIC_CFLAGS="" -LIBMAGIC_LDFLAGS=" -lmagic" - -# libpthread -LIBPTHREAD_CFLAGS="" -LIBPTHREAD_LDFLAGS=" -lpthread" AC_DEFINE_UNQUOTED(CLUSTER_CACHE_SIZE, 16, [set zim cluster cache size to number of cached chunks]) AC_DEFINE_UNQUOTED(DIRENT_CACHE_SIZE, 512, [set zim dirent cache size to number of cached chunks]) AC_DEFINE_UNQUOTED(LZMA_MEMORY_SIZE, 128, [set lzma uncompress memory size to number of MB]) AC_DEFINE(ENABLE_LZMA, [1], [defined if lzma compression is enabled]) - -# export variables -AC_SUBST(CXXFLAGS) -AC_SUBST(CFLAGS) -AC_SUBST(LIBLZMA_CFLAGS) -AC_SUBST(LIBLZMA_LDFLAGS) -AC_SUBST(LIBZIM_CFLAGS) -AC_SUBST(LIBZIM_LDFLAGS) -AC_SUBST(LIBZ_CFLAGS) -AC_SUBST(LIBZ_LDFLAGS) -AC_SUBST(LIBMAGIC_CFLAGS) -AC_SUBST(LIBMAGIC_LDFLAGS) -AC_SUBST(LIBPTHREAD_CFLAGS) -AC_SUBST(LIBPTHREAD_LDFLAGS) # Configure the output files AC_CONFIG_FILES([ @@ -104,4 +73,4 @@ ]) AC_PROG_INSTALL -AC_OUTPUT \ No newline at end of file +AC_OUTPUT -- To view, visit https://gerrit.wikimedia.org/r/295038 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ic0f93e19eb3e07d86c115bd15f47ef5fbc74f954 Gerrit-PatchSet: 2 Gerrit-Project: openzim Gerrit-Branch: master Gerrit-Owner: C. Scott Ananian <canan...@wikimedia.org> Gerrit-Reviewer: Kelson <kel...@kiwix.org> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
