>>>>> "Bo" == Bo Peng <[EMAIL PROTECTED]> writes:
Bo> BTW, can the attached patch go in (1.4.xsvn)? The only benefit is Bo> that current 1.5 scons can compile 1.4.x without having to add Bo> this macro, but this test is unnecessary anyway. I did see the patch, but I am a bit busy right now :) Here is the patch I intend to apply (the cleanup in configure.ac will go to 1.5 too). JMarc
Index: configure.ac =================================================================== --- configure.ac (revision 14098) +++ configure.ac (working copy) @@ -257,8 +257,8 @@ # 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 Index: src/support/gzstream.h =================================================================== --- src/support/gzstream.h (revision 14098) +++ src/support/gzstream.h (working copy) @@ -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
