OSX zimlib. Use CPPFLAGS instead of CFLAGS
Merge branch 'master' of ssh://git.code.sf.net/p/kiwix/kiwix