From 4b7d475eee8e833546eecaa9ba7874568278d58b Mon Sep 17 00:00:00 2001 From: Angus Leeming Date: Tue, 17 Dec 2002 12:31:27 +0000 Subject: [PATCH] Set configureation to reflect the new reality of xforms >= 0.89.5. git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@5839 a592a061-630c-0410-9148-cb99ea01b6c8 --- config/ChangeLog | 14 ++++++++ config/configure.ac | 8 ++--- config/configure.in | 15 ++++---- config/xforms.m4 | 58 +++++++++++++----------------- src/frontends/xforms/ChangeLog | 4 +++ src/frontends/xforms/xformsImage.C | 4 +-- 6 files changed, 53 insertions(+), 50 deletions(-) diff --git a/config/ChangeLog b/config/ChangeLog index 7cfbc4fdc7..4e6b739d83 100644 --- a/config/ChangeLog +++ b/config/ChangeLog @@ -1,3 +1,17 @@ +2002-12-16 Angus Leeming + + * configure.ac: replace LYX_USE_XFORMS_IMAGE_LOADER with + LYX_CHECK_XFORMS_IMAGE_LOADER. + Remove AM_CONDITIONAL(USE_BASIC_IMAGE_LOADER, ...) test. + + * configure.ac: As above. However, I have also found it necessary to + comment out some tests from the gnome block of case "$lyx_use_frontend" + otherwise they were replicated. No idea what is going wrong here. + + * xforms.m4 (XFORMS_VERSION): update warning/error messages. + (LYX_CHECK_XFORMS_IMAGE_LOADER): replaces LYX_USE_XFORMS_IMAGE_LOADER. + The function is far simpler as we don't have to worry about xforms < 0.89.5. + 2002-11-25 Jean-Marc Lasgouttes * Makefile.am (EXTRA_DIST): add lyxinclude25x.m4 and diff --git a/config/configure.ac b/config/configure.ac index 5d5b17b49a..c6036748b5 100644 --- a/config/configure.ac +++ b/config/configure.ac @@ -159,7 +159,7 @@ case "$lyx_use_frontend" in xforms) LYX_PATH_XPM LYX_PATH_XFORMS - LYX_USE_XFORMS_IMAGE_LOADER + LYX_CHECK_XFORMS_IMAGE_LOADER FRONTEND="xforms" FRONTEND_GUILIB="xforms/*.lo xforms/forms/*.lo" FRONTEND_INCLUDES="-I\$(srcdir)/xforms" @@ -177,7 +177,7 @@ case "$lyx_use_frontend" in gnome) LYX_PATH_XPM LYX_PATH_XFORMS - LYX_USE_XFORMS_IMAGE_LOADER + LYX_CHECK_XFORMS_IMAGE_LOADER PKG_CHECK_MODULES(GNOME_FRONTEND, gtkmm-2.0 libglademm-2.0) AC_SUBST(GNOME_FRONTEND_CFLAGS) AC_SUBST(GNOME_FRONTEND_LIBS) @@ -201,10 +201,6 @@ case "$lyx_use_frontend" in LYX_ERROR(Unknown frontend $lyx_use_frontend);; esac -# Do this here instead of in the LYX_USE_XFORMS_IMAGE_LOADER macro -AM_CONDITIONAL(USE_BASIC_IMAGE_LOADER, - test x$lyx_use_xforms_image_loader = xno) - ### Check for xforms and xpm (only if X has been found). if test "$have_x" = no ; then LYX_ERROR(dnl diff --git a/config/configure.in b/config/configure.in index 5805874483..4aba413089 100644 --- a/config/configure.in +++ b/config/configure.in @@ -162,7 +162,7 @@ case "$lyx_use_frontend" in xforms) LYX_PATH_XPM LYX_PATH_XFORMS - LYX_USE_XFORMS_IMAGE_LOADER + LYX_CHECK_XFORMS_IMAGE_LOADER FRONTEND="xforms" FRONTEND_GUILIB="xforms/*.lo xforms/forms/*.lo" FRONTEND_INCLUDES="-I\$(srcdir)/xforms" @@ -178,9 +178,12 @@ case "$lyx_use_frontend" in libforms version: ${XFORMS_VERSION}\n" ;; gnome) - LYX_PATH_XPM - LYX_PATH_XFORMS - LYX_USE_XFORMS_IMAGE_LOADER +# Leaving these tests in means that they are performed twice for the +# xforms frontend. No, I don't understand why :-( +# Angus 16 Dec 2002. +# LYX_PATH_XPM +# LYX_PATH_XFORMS +# LYX_CHECK_XFORMS_IMAGE_LOADER PKG_CHECK_MODULES(GNOME_FRONTEND, gtkmm-2.0 libglademm-2.0) AC_SUBST(GNOME_FRONTEND_CFLAGS) AC_SUBST(GNOME_FRONTEND_LIBS) @@ -203,10 +206,6 @@ case "$lyx_use_frontend" in LYX_ERROR(Unknown frontend $lyx_use_frontend);; esac -AM_CONDITIONAL(USE_BASIC_IMAGE_LOADER, - test x$lyx_use_xforms_image_loader = xno) - - ### Check for xforms and xpm (only if X has been found). if test "$have_x" = no ; then LYX_ERROR(dnl diff --git a/config/xforms.m4 b/config/xforms.m4 index 2f6d146484..22ba395e4e 100644 --- a/config/xforms.m4 +++ b/config/xforms.m4 @@ -41,59 +41,51 @@ rm -f conftest*]) XFORMS_VERSION=$lyx_cv_xfversion case "$lyx_cv_xfversion" in - "(unknown)"|0.8[1-7]*) - LYX_ERROR(dnl +"(unknown)"|0.8[[1-8]]*|0.89[[01234]]) + LYX_ERROR(dnl Version $lyx_cv_xfversion of xforms is not compatible with LyX. - This version of LyX works best with versions 0.88 (recommended) and later.) ;; - 0.88*) ;; - 0.89[01234]) LYX_WARNING(dnl + This version of LyX works best with version 1.0 (recommended) and later.) ;; +0.89*|0.9999*) + LYX_WARNING(dnl 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.);; + it contains many bugs that have been squashed in version 1.0. + You should consider upgrading.) ;; +1.0*) ;; esac fi ]) - -dnl Check whether the xforms library has a viable image loader -AC_DEFUN(LYX_USE_XFORMS_IMAGE_LOADER, +dnl Check the details of the xforms image loader +AC_DEFUN(LYX_CHECK_XFORMS_IMAGE_LOADER, [AC_REQUIRE([LYX_PATH_XFORMS]) save_LIBS=$LIBS LIBS="$XFORMS_LIB $XPM_LIB $LIBS" -lyx_use_xforms_image_loader=no +lyx_use_jpeg_image_loader=no + AC_LANG_SAVE AC_LANG_C -AC_CHECK_LIB(jpeg, jpeg_read_header, - [XFORMS_IMAGE_LIB=-ljpeg - LIBS="$LIBS -ljpeg"]) +dnl The image headers were split out of forms.h in xforms version 1.0. +AC_CHECK_HEADERS(flimage.h X11/flimage.h, break) 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="-lflimage $XFORMS_IMAGE_LIB" + [if test "$ac_cv_search_flimage_dup" != "none required" ; then + XFORMS_IMAGE_LIB="-lflimage" LIBS="$XFORMS_IMAGE_LIB $LIBS" fi]) + +dnl Only enable native loading of jpeg images if the jpeg library is installed. +AC_CHECK_LIB(jpeg, jpeg_read_header, + [lyx_use_jpeg_image_loader=yes + XFORMS_IMAGE_LIB="$XFORMS_IMAGE_LIB -ljpeg" + LIBS="$LIBS -ljpeg"]) AC_SUBST(XFORMS_IMAGE_LIB) -if test $lyx_use_xforms_image_loader = yes ; then +if test $lyx_use_jpeg_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 flimage_enable_jpeg) - AC_CHECK_HEADERS(flimage.h X11/flimage.h, break) + AC_DEFINE(USE_JPEG_IMAGE_LOADER, 1, + [Define if you want to be able to load jpeg images natively]) 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 x$lyx_use_xforms_image_loader = xno) - AC_LANG_RESTORE LIBS=$save_LIBS]) diff --git a/src/frontends/xforms/ChangeLog b/src/frontends/xforms/ChangeLog index e9940bc905..f15505d929 100644 --- a/src/frontends/xforms/ChangeLog +++ b/src/frontends/xforms/ChangeLog @@ -2,6 +2,10 @@ * XPainter.C: missed a #ifdef USE_XFORMS_IMAGE_LOADER. + * xformsImage.C (init_graphics): Use new #ifdef USE_JPEG_IMAGE_LOADER + rather than HAVE_FLIMAGE_ENABLE_JPEG. + Remove #ifdef HAVE_FLIMAGE_ENABLE_PS. + * FormPreferences.C: * forms/form_preferences.fd: remove override_x_deadkeys stuff. diff --git a/src/frontends/xforms/xformsImage.C b/src/frontends/xforms/xformsImage.C index 010abea3c1..959ff306f2 100644 --- a/src/frontends/xforms/xformsImage.C +++ b/src/frontends/xforms/xformsImage.C @@ -422,7 +422,7 @@ void init_graphics() flimage_enable_bmp(); flimage_enable_fits(); flimage_enable_gif(); -#ifdef HAVE_FLIMAGE_ENABLE_JPEG +#ifdef USE_JPEG_IMAGE_LOADER flimage_enable_jpeg(); #endif @@ -432,13 +432,11 @@ void init_graphics() flimage_enable_pnm(); -#ifdef HAVE_FLIMAGE_ENABLE_PS // xforms recognises PS but not EPS // It dies horribly with lots of older PostScript files. // Easiest, therefore, to disable PS support and insist that a PS-type // file is converted to a bitmap format. // flimage_enable_ps(); -#endif flimage_enable_sgi(); flimage_enable_tiff(); -- 2.39.2