some more compression stuff

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@7433 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/ChangeLog b/ChangeLog
index 5562248fff4326a7fa0b47645996f65a1ee64672..3f63e9b59ea3a6d4796b443072ae37dad032ff44 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2003-07-29  Lars Gullik Bjønnes  <larsbj@gullik.net>
+
+       * configure.ac: compression support
+
 2003-07-28  Lars Gullik Bjønnes  <larsbj@gullik.net>
 
        * configure.ac: check for zlib.

diff --git a/config/ChangeLog b/config/ChangeLog
index 468392ac3a84b7f79988b8a702541f1338f19591..b0a9fcf37cc3e4a23793ac0bc80b007b4fb75b27 100644 (file)
--- a/config/ChangeLog
+++ b/config/ChangeLog
@@ -1,3 +1,7 @@
+2003-07-29  Lars Gullik Bjønnes  <larsbj@gullik.net>
+
+       * lyxinclude.m4: use AC_HELP_STRING
+
 2003-07-27  Lars Gullik Bjønnes  <larsbj@gullik.net>
 
        * configure.ac,configure.in,lyxinclude213.m4,relyx_configure.ac,relyx_configure.in: delete file

diff --git a/config/lyxinclude.m4 b/config/lyxinclude.m4
index f37f8f9c6b7813fb3eabe3466d7bd8956f5979ab..45fcc0f489d2088b26dce2ddf9a7335a48d1fa9d 100644 (file)
--- a/config/lyxinclude.m4
+++ b/config/lyxinclude.m4
@@ -162,7 +162,7 @@ AC_PROG_CXX
 
 ### We might want to get or shut warnings.
 AC_ARG_ENABLE(warnings,
-  [  --enable-warnings       tell the compiler to display more warnings],,
+  AC_HELP_STRING([--enable-warnings],[tell the compiler to display more warnings]),,
   [ if test $lyx_devel_version = yes -o $lyx_prerelease = yes && test $ac_cv_prog_gxx = yes ; then
        enable_warnings=yes;
     else
@@ -177,7 +177,7 @@ fi
 
 ### We might want to disable debug
 AC_ARG_ENABLE(debug,
-  [  --enable-debug          enable debug information],,
+  AC_HELP_STRING([--enable-debug],[enable debug information]),,
   [ if test $lyx_devel_version = yes -o $lyx_prerelease = yes && test $ac_cv_prog_gxx = yes ; then
        enable_debug=yes;
     else
@@ -186,7 +186,7 @@ AC_ARG_ENABLE(debug,
 
 ### set up optimization
 AC_ARG_ENABLE(optimization,
-  [  --enable-optimization[=value]   enable compiler optimisation],,
+  AC_HELP_STRING([--enable-optimization[=value]],[enable compiler optimisation]),,
        enable_optimization=yes;)
 case $enable_optimization in
   yes) lyx_opt=-O;;

diff --git a/configure.ac b/configure.ac
index 20ee16626847430ce2f342475ebdf39521d9943d..865ee9413e34174c5b4c21b981c185b06c9435cf 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -78,7 +78,7 @@ LYX_CXX_STL_MODERN_STREAMS
 
 ### and now some special lyx flags.
 AC_ARG_ENABLE(assertions,
-  [  --enable-assertions     add runtime sanity checks in the program],,
+  AC_HELP_STRING([--enable-assertions],[add runtime sanity checks in the program]),,
   [if test $lyx_devel_version = yes -o $lyx_prerelease = yes ; then
        enable_assertions=yes;
     else
@@ -246,8 +246,25 @@ LYX_CHECK_DECL(vsnprintf, stdio.h)
 LYX_CHECK_DECL(istreambuf_iterator, iterator)
 LYX_CHECK_DECL(mkstemp,[unistd.h stdlib.h])
 
-AC_CHECK_HEADERS(zlib.h)
-AC_CHECK_LIB(z, gzopen)
+AC_ARG_ENABLE(compression-support, AC_HELP_STRING([--enable-compression-support],[Support for compressed files.]),[
+    case "${enableval}" in
+       yes) use_compression=true ;;
+       no) use_compression=false ;;
+       *) AC_MSG_ERROR(bad value ${enableval} for --enable-compression-support) ;;
+    esac
+],[use_compression=true])
+if test $use_compression=true ; then
+       AC_CHECK_HEADERS(zlib.h, use_compression=true, use_compression=false)
+       AC_CHECK_LIB(z, gzopen,[use_compression=true;LIBS="$LIBS -lz"], use_compression=false)
+       if test $use_compression = true ; then
+               AC_DEFINE(USE_COMRESSION, 1, [Define as 1 if you want to supprot compressed files.])
+               lyx_flags="$lyx_flags compression"
+       fi
+fi
+AM_CONDITIONAL(USE_COMPRESSION, test x$use_compression = xtrue)
+AC_MSG_CHECKING([whether to support compressed files])
+AC_MSG_RESULT($use_compression)
+
 
 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

diff --git a/src/buffer.C b/src/buffer.C
index 3c82bc2f4845c3562e290b73b968cfaba156a061..eea4099fed1e050636079027c6dd84ea76ef55a4 100644 (file)
--- a/src/buffer.C
+++ b/src/buffer.C
@@ -483,6 +483,8 @@ bool Buffer::readFile(LyXLex & lex, string const & filename,
 
        // the first token _must_ be...
        if (token != "\\lyxformat") {
+               lyxerr << "Token: " << token << endl;
+
                Alert::error(_("Document format failure"),
                        _("The specified document is not a LyX document."));
                return false;
@@ -522,7 +524,7 @@ bool Buffer::readFile(LyXLex & lex, string const & filename,
                                return false;
                        }
                        command += " -t"
-                               +tostr(LYX_FORMAT) + ' '
+                               + tostr(LYX_FORMAT) + ' '
                                + QuoteName(filename);
                        lyxerr[Debug::INFO] << "Running '"
                                            << command << '\''

diff --git a/src/support/ChangeLog b/src/support/ChangeLog
index f8f3627e328ed2618c0f76c41d6daf48e085b90e..a593ccdd367925a90b385a979bd6f1e6475846af 100644 (file)
--- a/src/support/ChangeLog
+++ b/src/support/ChangeLog
@@ -1,3 +1,7 @@
+2003-07-29  Lars Gullik Bjønnes  <larsbj@gullik.net>
+
+       * Makefile.am: contidionalize USE_COMPRESSION
+
 2003-07-28  Lars Gullik Bjønnes  <larsbj@gullik.net>
 
        * filetools.C (getExtFromContents): correct magic for gzip and

diff --git a/src/support/Makefile.am b/src/support/Makefile.am
index fa803b8d81bb89003be6afda3262d2c3c7f0384f..5aad3bc1fb8f06b3081822a8378271f1bf518b43 100644 (file)
--- a/src/support/Makefile.am
+++ b/src/support/Makefile.am
@@ -14,6 +14,10 @@ if USE_LYXSTRING
 LYXSTRING = lyxstring.C lyxstring.h
 endif
 
+if USE_COMPRESSION
+COMPRESSION = gzstream.C gzstream.C
+endif
+
 BUILT_SOURCES = path_defines.C
 
 libsupport_la_SOURCES = \
@@ -46,9 +50,7 @@ libsupport_la_SOURCES = \
        forkedcontr.C \
        forkedcontr.h \
        getcwd.C \
-       gzstream.C \
-       gzstream.h \
-       kill.C \
+       $(COMPRESSION) kill.C \
        limited_stack.h \
        lstrings.C \
        lstrings.h \
@@ -66,6 +68,7 @@ libsupport_la_SOURCES = \
        path.C \
        path.h \
        path_defines.C \
+       path_defines.h \
        putenv.C \
        rename.C \
        rmdir.C \