configure script fixes; compile fix

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

diff --git a/ChangeLog b/ChangeLog
index 7150087a5d7095cce6db415052d42d5e4c438427..5b55bef07de384ccac7f1e4bb7410a01ad73f7df 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2002-07-18  Jean-Marc Lasgouttes  <lasgouttes@freesurf.fr>
+
+       * configure.in: try (again) to fix EOF handling in VERSION_INFO
+
 2002-07-17  Jean-Marc Lasgouttes  <lasgouttes@freesurf.fr>
 
        * acconfig.h: do not include broken_headers.h; remove descriptions

diff --git a/configure.in b/configure.in
index 7b4b2c2b88346a0fa2d488ba042cc3157b662eeb..410dcf0463238c233b0203ac976f580e0f3774b0 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -178,8 +178,8 @@ case "$lyx_use_frontend" in
        esac
        FRONTEND_INFO=`cat <<EOF
     libXpm version:               ${XPM_VERSION}\n\
-    libforms version:             ${XFORMS_VERSION}\n
-`
+    libforms version:             ${XFORMS_VERSION}\n\
+EOF`
        ;;
   gnome)
     PKG_CHECK_MODULES(GNOME_FRONTEND, gtkmm-2.0 libglademm-2.0)
@@ -286,7 +286,7 @@ Configuration\n\
   Frontend:                       ${lyx_use_frontend}\n\
 ${FRONTEND_INFO}\
   LyX binary dir:                 ${real_bindir}\n\
-  LyX files dir:                  ${real_datadir}\n
+  LyX files dir:                  ${real_datadir}\n\
 EOF`
 
 AC_SUBST(VERSION_INFO)

diff --git a/src/graphics/ChangeLog b/src/graphics/ChangeLog
index 671055c217670db2364650b1bf1fe6738852c570..bb99b481187e4b30a56f4951e2ef8dd3d9ee000a 100644 (file)
--- a/src/graphics/ChangeLog
+++ b/src/graphics/ChangeLog
@@ -1,3 +1,8 @@
+2002-07-18  Jean-Marc Lasgouttes  <lasgouttes@freesurf.fr>
+
+       * GraphicsCacheItem.C (reset): use erase() instead of clear() for
+       strings 
+
 2002-07-18  Angus Leeming  <leeming@lyx.org>
 
        * GraphicsCacheItem.[Ch]: add a FileMonitor variable to the the Impl

diff --git a/src/graphics/GraphicsCacheItem.C b/src/graphics/GraphicsCacheItem.C
index 95092e42d13ef411a144da260858e7417347654b..f2e5c3686580704b6a3768ecd6414dccc12ccba0 100644 (file)
--- a/src/graphics/GraphicsCacheItem.C
+++ b/src/graphics/GraphicsCacheItem.C
@@ -210,12 +210,12 @@ void CacheItem::Impl::reset()
        zipped_ = false;
        if (!unzipped_filename_.empty())
                lyx::unlink(unzipped_filename_);
-       unzipped_filename_.clear();
+       unzipped_filename_.erase();
 
        if (remove_loaded_file_ && !file_to_load_.empty())
                lyx::unlink(file_to_load_);
        remove_loaded_file_ = false;
-       file_to_load_.clear();
+       file_to_load_.erase();
 
        if (image_.get())
                image_.reset();