anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-22 10:00:33 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

configure script fixes; compile fix

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@4706 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Jean-Marc Lasgouttes 2002-07-18 21:24:47 +00:00
parent 98324cb046
commit 78c894f8ab
4 changed files with 14 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 @@
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

6
configure.in
View File

@ -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)

5
src/graphics/ChangeLog
View File

@ -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

4
src/graphics/GraphicsCacheItem.C
View File

@ -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();