From 3b1a9a5fc258f5d9b4faaa7a4bd5b6fe99530583 Mon Sep 17 00:00:00 2001 From: Jean-Marc Lasgouttes Date: Tue, 11 Jun 2002 14:44:05 +0000 Subject: [PATCH] fix configuration with xforms git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@4364 a592a061-630c-0410-9148-cb99ea01b6c8 --- ChangeLog | 9 +++ acconfig.h | 8 --- config/ChangeLog | 9 +++ config/xforms.m4 | 107 ++++++++++++---------------- configure.in | 12 ++-- src/frontends/xforms/ChangeLog | 12 ++++ src/frontends/xforms/GUIRunTime.C | 6 +- src/frontends/xforms/xformsGImage.C | 2 + src/frontends/xforms/xformsGImage.h | 4 +- 9 files changed, 86 insertions(+), 83 deletions(-) diff --git a/ChangeLog b/ChangeLog index b1a1d0c59a..7e3ee7665d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2002-06-07 Jean-Marc Lasgouttes + + * configure.in: move the test for xpm/xforms out of the frontends + case, to avoid code duplication + +2002-06-06 Jean-Marc Lasgouttes + + * acconfig.h: remove FORMS_IMAGE_H_LOCATION and FORMS_H_LOCATION + 2002-06-03 Lars Gullik Bjønnes * configure.in: remove LYX_REGEX call diff --git a/acconfig.h b/acconfig.h index 7afd814347..e63e271baf 100644 --- a/acconfig.h +++ b/acconfig.h @@ -18,14 +18,6 @@ @TOP@ -/* define this to the location of forms.h to be used with #include, - e.g. */ -#undef FORMS_H_LOCATION - -/* define this to the location of flimage.h to be used with #include, - e.g. */ -#undef FORMS_IMAGE_H_LOCATION - /* define this to the location of xpm.h to be used with #include, e.g. */ #undef XPM_H_LOCATION diff --git a/config/ChangeLog b/config/ChangeLog index 4afecb000a..8158c8dae0 100644 --- a/config/ChangeLog +++ b/config/ChangeLog @@ -1,3 +1,12 @@ +2002-06-07 Jean-Marc Lasgouttes + + * 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-10 Lars Gullik Bjønnes * lyxinclude.m4 (lyx_warning): turn off exceptions for 2.96 and 3.1 diff --git a/config/xforms.m4 b/config/xforms.m4 index f80267c9e1..382c2b743a 100644 --- a/config/xforms.m4 +++ b/config/xforms.m4 @@ -1,6 +1,8 @@ +dnl some macros to test for xforms-related functionality -*- sh -*- + 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 +19,9 @@ AC_CHECK_HEADER(X11/forms.h,[ lyx_cv_forms_h_location=""],[ AC_CHECK_HEADER(forms.h,[],[ LYX_LIB_ERROR(forms.h,forms)])]) - -lyx_cv_flimage_h_location="" -AC_CHECK_HEADER(X11/flimage.h,[ - ac_cv_header_flimage_h=yes - lyx_cv_flimage_h_location=""],) -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. ]) + if test $ac_cv_header_forms_h = yes; then AC_CACHE_CHECK([xforms header version],lyx_cv_xfversion, [ cat > conftest.$ac_ext < 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. + ]) + 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 -]) diff --git a/configure.in b/configure.in index 290ef284b1..538eab9468 100644 --- a/configure.in +++ b/configure.in @@ -168,14 +168,16 @@ CPPFLAGS="$CPPFLAGS $X_CFLAGS" AC_CHECK_FUNCS(XOpenIM) ### check which frontend we want to use +# We have to check for xforms anyway +LYX_PATH_XPM +LYX_PATH_XFORMS + #LYX_USE_FRONTEND dnl The code below is not in a macro, because this would cause big dnl problems with the AC_REQUIRE contained in KDE_DO_IT_ALL. case "$lyx_use_frontend" in xforms) # for now don't set it for xforms as this is always entered - LYX_PATH_XPM - LYX_PATH_XFORMS FRONTEND="xforms" FRONTEND_GUILIB="xforms/*.lo" FRONTEND_INCLUDES="-I\$(srcdir)/xforms" @@ -186,9 +188,6 @@ case "$lyx_use_frontend" in ` ;; gnome) - LYX_PATH_XPM - LYX_PATH_XFORMS - PKG_CHECK_MODULES(GNOME_FRONTEND, gtkmm-2.0 libglademm-2.0) AC_SUBST(GNOME_FRONTEND_CFLAGS) AC_SUBST(GNOME_FRONTEND_LIBS) @@ -199,8 +198,6 @@ case "$lyx_use_frontend" in FRONTEND_INCLUDES="-I\${srcdir}/gnome -I\${srcdir}/xforms ${GNOME_FRONTEND_CFLAGS} " FRONTEND_LIBS="@XPM_LIB@ @XFORMS_LIB@ ${GNOME_FRONTEND_LIBS}";; qt2) - LYX_PATH_XPM - LYX_PATH_XFORMS QT2_DO_IT_ALL FRONTEND="qt2" FRONTEND_GUILIB="qt2/*.lo qt2/ui/*.lo qt2/moc/*.lo qt2/ui/moc/*.lo qt2/xforms/*.lo" @@ -234,7 +231,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 diff --git a/src/frontends/xforms/ChangeLog b/src/frontends/xforms/ChangeLog index a8781ca703..6aac7882ac 100644 --- a/src/frontends/xforms/ChangeLog +++ b/src/frontends/xforms/ChangeLog @@ -1,3 +1,15 @@ +2002-06-06 Jean-Marc Lasgouttes + + * GUIRunTime.C (initialiseGraphics): condition the choice of + loader on USE_XFORMS_IMAGE_LOADER + + * xformsGImage.C (init_graphics): do not initialize jpeg support + if not available + +2002-06-05 Jean-Marc Lasgouttes + + * xformsGImage.h: use FLIMAGE_H_LOCATION to include flimage.h. + 2002-06-10 Lars Gullik Bjønnes * FormMathsPanel.C: do not include ButtonController.tmpl diff --git a/src/frontends/xforms/GUIRunTime.C b/src/frontends/xforms/GUIRunTime.C index 668fd830a5..b6613318b4 100644 --- a/src/frontends/xforms/GUIRunTime.C +++ b/src/frontends/xforms/GUIRunTime.C @@ -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" @@ -61,7 +61,7 @@ int GUIRunTime::initApplication(int &, char * []) "version of a dynamic XForms library\n" "or you have build LyX with conflicting header " "and library (different\n" - "versions of XForms. Sorry but there is no point " + "versions of XForms). Sorry but there is no point " "in continuing executing LyX!" << endl; return 1; } @@ -130,7 +130,7 @@ void GUIRunTime::initialiseGraphics() { using namespace grfx; -#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(boost::bind(&xformsGImage::newImage)); GImage::loadableFormats.connect(boost::bind(&xformsGImage::loadableFormats)); diff --git a/src/frontends/xforms/xformsGImage.C b/src/frontends/xforms/xformsGImage.C index 8afb32bc70..dd0f48df6d 100644 --- a/src/frontends/xforms/xformsGImage.C +++ b/src/frontends/xforms/xformsGImage.C @@ -402,7 +402,9 @@ 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. diff --git a/src/frontends/xforms/xformsGImage.h b/src/frontends/xforms/xformsGImage.h index dbcb883aee..0fbcce8738 100644 --- a/src/frontends/xforms/xformsGImage.h +++ b/src/frontends/xforms/xformsGImage.h @@ -20,8 +20,8 @@ #include "graphics/GraphicsImage.h" #include FORMS_H_LOCATION -#if FL_VERSION > 0 -#include FORMS_IMAGE_H_LOCATION +#ifdef HAVE_FLIMAGE_H +#include FLIMAGE_H_LOCATION #endif namespace grfx {