mirror of
https://git.lyx.org/repos/lyx.git
synced 2024-12-04 22:32:19 +00:00
rework configuration stuff for xforms
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH-1_2_X@4345 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Jean-Marc Lasgouttes
parent
d0c49fdb18
commit
4432936da2
@ -1,3 +1,7 @@
|
||||
2002-06-06 Jean-Marc Lasgouttes <lasgouttes@freesurf.fr>
|
||||
|
||||
* acconfig.h: remove FORMS_IMAGE_H_LOCATION and FORMS_H_LOCATION
|
||||
|
||||
2002-06-02 John Levon <moz@compsoc.man.ac.uk>
|
||||
|
||||
* acconfig.h: add FORMS_IMAGE_H_LOCATION
|
||||
|
||||
@ -18,14 +18,6 @@
|
||||
|
||||
@TOP@
|
||||
|
||||
/* define this to the location of forms.h to be used with #include,
|
||||
e.g. <forms.h> */
|
||||
#undef FORMS_H_LOCATION
|
||||
|
||||
/* define this to the location of flimage.h to be used with #include,
|
||||
e.g. <flimage.h> */
|
||||
#undef FORMS_IMAGE_H_LOCATION
|
||||
|
||||
/* define this to the location of xpm.h to be used with #include,
|
||||
e.g. <xpm.h> */
|
||||
#undef XPM_H_LOCATION
|
||||
|
||||
@ -1,3 +1,12 @@
|
||||
2002-06-06 Jean-Marc Lasgouttes <lasgouttes@freesurf.fr>
|
||||
|
||||
* xforms.m4 (LYX_USE_XFORMS_IMAGE_LOADER): complete rewrite. Now
|
||||
simpler and hopefully better. Please test.
|
||||
(LYX_PATH_XFORMS): move test for flimage.h in
|
||||
LYX_USE_XFORMS_IMAGE_LOADER.
|
||||
(LYX_XFORMS_IMAGE_LOADER_NEEDS_JPEG): killed. Now just a couple
|
||||
lines in LYX_USE_XFORMS_IMAGE_LOADER.
|
||||
|
||||
2002-06-03 John Levon <moz@compsoc.man.ac.uk>
|
||||
|
||||
* xforms.m4: wallpaper coding ... only try to link
|
||||
|
||||
109
config/xforms.m4
109
config/xforms.m4
@ -1,6 +1,6 @@
|
||||
dnl Usage LYX_PATH_XFORMS: Checks for xforms library and flags
|
||||
dnl If it is found, the variable XFORMS_LIB is set to the relevant -l flags,
|
||||
dnl and FORMS_H_LOCATION / FORMS_IMAGE_H_LOCATION is also set
|
||||
dnl and FORMS_H_LOCATION / FLIMAGE_H_LOCATION is also set
|
||||
AC_DEFUN(LYX_PATH_XFORMS,[
|
||||
|
||||
LIBS="$XPM_LIB $LIBS"
|
||||
@ -17,15 +17,9 @@ AC_CHECK_HEADER(X11/forms.h,[
|
||||
lyx_cv_forms_h_location="<X11/forms.h>"],[
|
||||
AC_CHECK_HEADER(forms.h,[],[
|
||||
LYX_LIB_ERROR(forms.h,forms)])])
|
||||
|
||||
lyx_cv_flimage_h_location="<flimage.h>"
|
||||
AC_CHECK_HEADER(X11/flimage.h,[
|
||||
ac_cv_header_flimage_h=yes
|
||||
lyx_cv_flimage_h_location="<X11/flimage.h>"],)
|
||||
AC_DEFINE_UNQUOTED(FORMS_IMAGE_H_LOCATION,$lyx_cv_flimage_h_location)
|
||||
|
||||
AC_DEFINE_UNQUOTED(FORMS_H_LOCATION,$lyx_cv_forms_h_location)
|
||||
|
||||
AC_DEFINE_UNQUOTED(FORMS_H_LOCATION,$lyx_cv_forms_h_location,
|
||||
[define this to the location of forms.h to be used with #include, e.g. <forms.h>])
|
||||
|
||||
if test $ac_cv_header_forms_h = yes; then
|
||||
AC_CACHE_CHECK([xforms header version],lyx_cv_xfversion,
|
||||
[ cat > conftest.$ac_ext <<EOF
|
||||
@ -56,74 +50,63 @@ LyX should work ok with version $lyx_cv_xfversion of xforms[,] but
|
||||
it is an unproven version and might still have some bugs. You should
|
||||
probably use version 0.89.6 (or 0.88) instead) ;;
|
||||
0.89*) ;;
|
||||
0.9999*) ;;
|
||||
1.0*) ;;
|
||||
*) LYX_WARNING(dnl
|
||||
Version $lyx_cv_xfversion of xforms might not be compatible with LyX[,]
|
||||
since it is newer than 0.89. You might have slight problems with it.);;
|
||||
esac
|
||||
fi])
|
||||
fi
|
||||
])
|
||||
|
||||
|
||||
|
||||
dnl Check whether the xforms library has a viable image loader
|
||||
AC_DEFUN(LYX_USE_XFORMS_IMAGE_LOADER,
|
||||
[
|
||||
save_LIBS=$LIBS
|
||||
LIBS="-lflimage $XFORMS_LIB -ljpeg $LIBS"
|
||||
LIBS="$XFORMS_LIB $LIBS"
|
||||
lyx_use_xforms_image_loader=no
|
||||
AC_CHECK_FUNCS(flimage_dup,[
|
||||
AC_CHECK_FUNCS(flimage_to_pixmap,[
|
||||
lyx_use_xforms_image_loader=yes
|
||||
AC_CHECK_FUNCS(flimage_enable_ps)])])
|
||||
LIBS=$save_LIBS
|
||||
test $lyx_use_xforms_image_loader = yes && lyx_flags="$lyx_flags xforms-image-loader" && XFORMS_IMAGE_LIB=-lflimage
|
||||
|
||||
# try without flimage
|
||||
if test $lyx_use_xforms_image_loader = no ; then
|
||||
LIBS="$XFORMS_LIB -ljpeg $LIBS"
|
||||
lyx_use_xforms_image_loader=no
|
||||
AC_CHECK_FUNCS(flimage_dup,[
|
||||
AC_CHECK_FUNCS(flimage_to_pixmap,[
|
||||
lyx_use_xforms_image_loader=yes
|
||||
AC_CHECK_FUNCS(flimage_enable_ps)])])
|
||||
LIBS=$save_LIBS
|
||||
|
||||
# try without -ljpeg
|
||||
if test $lyx_use_xforms_image_loader = no ; then
|
||||
LIBS="$XFORMS_LIB $LIBS"
|
||||
lyx_use_xforms_image_loader=no
|
||||
AC_CHECK_FUNCS(flimage_dup,[
|
||||
AC_CHECK_FUNCS(flimage_to_pixmap,[
|
||||
lyx_use_xforms_image_loader=yes
|
||||
AC_CHECK_FUNCS(flimage_enable_ps)])])
|
||||
LIBS=$save_LIBS
|
||||
fi
|
||||
|
||||
fi
|
||||
|
||||
AC_LANG_SAVE
|
||||
AC_LANG_C
|
||||
AC_SEARCH_LIBS(flimage_dup, flimage,
|
||||
[lyx_use_xforms_image_loader=yes
|
||||
if test "$ac_cv_search_flimage_dup" != "none required" ; then
|
||||
XFORMS_IMAGE_LIB="-flimage"
|
||||
fi])
|
||||
AC_SUBST(XFORMS_IMAGE_LIB)
|
||||
|
||||
|
||||
if test $lyx_use_xforms_image_loader = yes ; then
|
||||
lyx_flags="$lyx_flags xforms-image-loader"
|
||||
AC_DEFINE(USE_XFORMS_IMAGE_LOADER, 1,
|
||||
[Define if you want to use xforms built-in image loader])
|
||||
AC_CHECK_FUNCS(flimage_enable_ps)
|
||||
AC_SEARCH_LIBS(flimage_enable_jpeg, jpeg,
|
||||
[if test "$ac_cv_search_flimage_enable_jpeg" != "none required" ; then
|
||||
save_LIBS="-ljpeg $save_LIBS"
|
||||
XFORMS_IMAGE_LIB="-ljpeg $XFORMS_IMAGE_LIB"
|
||||
fi
|
||||
AC_DEFINE(HAVE_FLIMAGE_ENABLE_JPEG, 1,
|
||||
[Define if you have the flimage_enable_jpeg function and the jpeg library available.])])
|
||||
AC_CHECK_HEADER(flimage.h,[
|
||||
ac_cv_header_flimage_h=yes
|
||||
lyx_cv_flimage_h_location="<flimage.h>"],
|
||||
[AC_CHECK_HEADER(X11/flimage.h,[
|
||||
ac_cv_header_flimage_h=yes
|
||||
lyx_cv_flimage_h_location="<X11/flimage.h>"],
|
||||
ac_cv_header_flimage_h=no)])
|
||||
if test ac_cv_header_flimage_h = yes ; then
|
||||
AC_DEFINE(HAVE_FLIMAGE_H, 1, [Define if you have the <flimage.h> header file.])
|
||||
AC_DEFINE_UNQUOTED(FLIMAGE_H_LOCATION, $lyx_cv_flimage_h_location,
|
||||
[define this to the location of flimage.h to be used with #include, e.g. <flimage.h>
|
||||
])
|
||||
fi
|
||||
fi
|
||||
|
||||
### If the gui cannot load images itself, then we default to the
|
||||
### very simple one in graphics/GraphicsImageXPM.[Ch]
|
||||
AM_CONDITIONAL(USE_BASIC_IMAGE_LOADER,
|
||||
test $lyx_use_xforms_image_loader = no)
|
||||
])
|
||||
AC_LANG_RESTORE
|
||||
LIBS=$save_LIBS])
|
||||
|
||||
|
||||
dnl Check if the image loader needs libjpeg
|
||||
AC_DEFUN(LYX_XFORMS_IMAGE_LOADER_NEEDS_JPEG,
|
||||
[
|
||||
if test "$lyx_use_xforms_image_loader" = "yes" ; then
|
||||
AC_MSG_CHECKING([whether libjpeg is needed])
|
||||
AC_LANG_SAVE
|
||||
AC_LANG_C
|
||||
AC_TRY_LINK([#include FORMS_H_LOCATION
|
||||
#include FORMS_IMAGE_H_LOCATION],
|
||||
[jpeg_abort(0);],
|
||||
[lyx_need_jpeg=no],[lyx_need_jpeg=yes])
|
||||
AC_LANG_RESTORE
|
||||
AC_MSG_RESULT($lyx_need_jpeg)
|
||||
if test "$lyx_need_jpeg" = "yes" ; then
|
||||
LIBS="-ljpeg $LIBS"
|
||||
fi
|
||||
fi
|
||||
])
|
||||
|
||||
@ -257,7 +257,6 @@ fi
|
||||
### For now, run this test always so config.h is unchanged by a change in
|
||||
### frontend
|
||||
LYX_USE_XFORMS_IMAGE_LOADER
|
||||
LYX_XFORMS_IMAGE_LOADER_NEEDS_JPEG
|
||||
|
||||
### Setup GNU gettext
|
||||
dnl GNU gettext is written in C
|
||||
|
||||
@ -1,3 +1,7 @@
|
||||
2002-06-06 Jean-Marc Lasgouttes <lasgouttes@freesurf.fr>
|
||||
|
||||
* buffer.C (sgmlError): enclose #warning in WITH_WARNINGS
|
||||
|
||||
2002-06-02 John Levon <moz@compsoc.man.ac.uk>
|
||||
|
||||
* lyx_gui.C: hope to generate some stats on xforms 1.0
|
||||
|
||||
@ -3190,12 +3190,14 @@ void Buffer::simpleLinuxDocOnePar(ostream & os,
|
||||
void Buffer::sgmlError(Paragraph * /*par*/, int /*pos*/,
|
||||
string const & /*message*/) const
|
||||
{
|
||||
#ifdef WITH_WARNINGS
|
||||
#warning This is wrong we cannot insert an inset like this!!!
|
||||
// I guess this was Jose' so I explain you more or less why this
|
||||
// is wrong. This way you insert something in the paragraph and
|
||||
// don't tell it to LyXText (row rebreaking and undo handling!!!)
|
||||
// I deactivate this code, have a look at BufferView::insertErrors
|
||||
// how you should do this correctly! (Jug 20020315)
|
||||
#endif
|
||||
#if 0
|
||||
// insert an error marker in text
|
||||
InsetError * new_inset = new InsetError(message);
|
||||
|
||||
@ -1,3 +1,15 @@
|
||||
2002-06-06 Jean-Marc Lasgouttes <lasgouttes@freesurf.fr>
|
||||
|
||||
* GUIRunTime.C (initialiseGraphics): condition on
|
||||
USE_XFORMS_IMAGE_LOADER
|
||||
|
||||
* xformsGImage.C (init_graphics): do not initialize jpeg support
|
||||
if not available
|
||||
|
||||
2002-06-05 Jean-Marc Lasgouttes <lasgouttes@freesurf.fr>
|
||||
|
||||
* xformsGImage.h: use FLIMAGE_H_LOCATION instead
|
||||
|
||||
2002-06-02 John Levon <moz@compsoc.man.ac.uk>
|
||||
|
||||
* xformsGImage.h: use FORMS_IMAGE_H_LOCATION
|
||||
|
||||
@ -18,7 +18,7 @@
|
||||
#include "XFormsView.h"
|
||||
#include "debug.h"
|
||||
|
||||
#if defined(HAVE_FLIMAGE_DUP) && defined(HAVE_FLIMAGE_TO_PIXMAP)
|
||||
#ifdef USE_XFORMS_IMAGE_LOADER
|
||||
#include "xformsGImage.h"
|
||||
#else
|
||||
#include "graphics/GraphicsImageXPM.h"
|
||||
@ -129,7 +129,7 @@ void GUIRunTime::initialiseGraphics()
|
||||
using namespace grfx;
|
||||
using SigC::slot;
|
||||
|
||||
#if defined(HAVE_FLIMAGE_DUP) && defined(HAVE_FLIMAGE_TO_PIXMAP)
|
||||
#ifdef USE_XFORMS_IMAGE_LOADER
|
||||
// connect the image loader based on the xforms library
|
||||
GImage::newImage.connect(slot(&xformsGImage::newImage));
|
||||
GImage::loadableFormats.connect(slot(&xformsGImage::loadableFormats));
|
||||
|
||||
@ -402,8 +402,10 @@ void init_graphics()
|
||||
flimage_enable_bmp();
|
||||
flimage_enable_fits();
|
||||
flimage_enable_gif();
|
||||
#ifdef HAVE_FLIMAGE_ENABLE_JPEG
|
||||
flimage_enable_jpeg();
|
||||
|
||||
#endif
|
||||
|
||||
// xforms itself uses pngtopnm to convert to a loadable format.
|
||||
// We prefer to use our own conversion mechanism, therefore.
|
||||
// flimage_enable_png();
|
||||
|
||||
@ -20,8 +20,8 @@
|
||||
|
||||
#include "graphics/GraphicsImage.h"
|
||||
#include FORMS_H_LOCATION
|
||||
#if FL_VERSION > 0
|
||||
#include FORMS_IMAGE_H_LOCATION
|
||||
#if HAVE_FLIMAGE_H
|
||||
#include FLIMAGE_H_LOCATION
|
||||
#endif
|
||||
|
||||
namespace grfx {
|
||||
|
||||
@ -46,6 +46,8 @@ What's new
|
||||
- make sure to use the graphicx package with the RasterBitmap and XFig
|
||||
external templates.
|
||||
|
||||
- fix rotation angle of images to be the same as in latex output
|
||||
|
||||
- do not ignore zero-length vertical spacing with 'keep' flag.
|
||||
|
||||
- fix interaction between sixpack and LyX via lyxserver
|
||||
|
||||
Loading…
Reference in New Issue
Block a user