anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-13 17:20:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

tweaks to zlib support

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_4_X@14099 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Jean-Marc Lasgouttes 2006-06-14 13:57:46 +00:00
parent 8fa0d2ccb3
commit 54f6bcd13f
4 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,3 +1,7 @@
2006-06-14 Jean-Marc Lasgouttes <lasgouttes@lyx.org>
* configure.ac: improve test for zlib.
2006-05-16 Jean-Marc Lasgouttes <lasgouttes@lyx.org>
* configure.ac: improve check for shlwapi.

4
configure.ac
View File

@ -257,8 +257,8 @@ AC_FUNC_MKDIR
# check for compression support
AC_CHECK_HEADERS(zlib.h,
[AC_CHECK_LIB(z, gzopen, [LIBS="$LIBS -lz"], LYX_ERROR([zlib not found!]))],
[LYX_ERROR([zlib.h not found!])])
[AC_CHECK_LIB(z, gzopen, [LIBS="$LIBS -lz"], LYX_LIB_ERROR(libz,zlib))],
[LYX_LIB_ERROR(zlib.h,zlib)])
dnl This is a slight hack: the tests generated by autoconf 2.52 do not
dnl work correctly because of some conflict with stdlib.h with g++ 2.96

5
src/support/ChangeLog
View File

@ -1,3 +1,8 @@
2006-06-14 Jean-Marc Lasgouttes <lasgouttes@lyx.org>
* gzstream.h: do not test for HAVE_ZLIB_H, since we require it
anyway.
2006-05-29 Jean-Marc Lasgouttes <lasgouttes@lyx.org>
* os_unix.C (canAutoOpenFile, autoOpenFile): add support for Mac

4
src/support/gzstream.h
View File

@ -32,9 +32,7 @@
// standard C++ with new header file names and std:: namespace
#include <iostream>
#include <fstream>
#ifdef HAVE_ZLIB_H
# include <zlib.h>
#endif
#include <zlib.h>
// For LyX
#define GZSTREAM_NAMESPACE gz