mirror of
https://git.lyx.org/repos/lyx.git
synced 2024-12-04 22:32:19 +00:00
Fix config for xforms 1.0
Please test with your weird and wonderful xforms versions git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH-1_2_X@4316 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
John Levon
parent
25f70a826e
commit
1a494becc3
@ -1,3 +1,11 @@
|
||||
2002-06-02 John Levon <moz@compsoc.man.ac.uk>
|
||||
|
||||
* acconfig.h: add FORMS_IMAGE_H_LOCATION
|
||||
|
||||
* autogen.sh: add xforms.m4
|
||||
|
||||
* configure.in: use XFORMS_IMAGE_LIB
|
||||
|
||||
2002-05-29 John Levon <moz@compsoc.man.ac.uk>
|
||||
|
||||
* INSTALL: document that frontends are not supported,
|
||||
|
||||
@ -22,6 +22,10 @@
|
||||
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
|
||||
|
||||
@ -6,7 +6,7 @@ AUTOMAKE="automake -a -c --foreign"
|
||||
AUTOCONF=autoconf
|
||||
GNUM4=
|
||||
|
||||
ACINCLUDE_FILES="lyxinclude.m4 libtool.m4 codeset.m4 gettext.m4 glibc21.m4 iconv.m4 isc-posix.m4 lcmessage.m4 progtest.m4 sigc++.m4 qt2.m4 gtk--.m4 gnome--.m4 gnome.m4 pspell.m4"
|
||||
ACINCLUDE_FILES="lyxinclude.m4 xforms.m4 libtool.m4 codeset.m4 gettext.m4 glibc21.m4 iconv.m4 isc-posix.m4 lcmessage.m4 progtest.m4 sigc++.m4 qt2.m4 gtk--.m4 gnome--.m4 gnome.m4 pspell.m4"
|
||||
SIGCPP_ACINCLUDE_FILES="libtool.m4"
|
||||
|
||||
echo -n "Locating GNU m4... "
|
||||
|
||||
@ -1,3 +1,9 @@
|
||||
2002-06-02 John Levon <moz@compsoc.man.ac.uk>
|
||||
|
||||
* xforms.m4: move from lyxinclude.m4, and add
|
||||
a search for flimage.h for xforms 1.0, and
|
||||
don't complain about 1.0
|
||||
|
||||
2002-04-17 Rob Lahaye <lahaye@users.sourceforge.net>
|
||||
|
||||
* cvsignore: add Makefile.
|
||||
|
||||
@ -559,99 +559,6 @@ changequote([,])
|
||||
fi])
|
||||
|
||||
|
||||
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 flag.
|
||||
AC_DEFUN(LYX_PATH_XFORMS,[
|
||||
### Check for xforms library
|
||||
AC_CHECK_LIB(forms, fl_initialize, XFORMS_LIB="-lforms",
|
||||
[AC_CHECK_LIB(xforms, fl_initialize, XFORMS_LIB="-lxforms",
|
||||
[LYX_LIB_ERROR(libforms or libxforms,xforms)])])
|
||||
AC_SUBST(XFORMS_LIB)
|
||||
### Check for xforms headers
|
||||
lyx_cv_forms_h_location="<forms.h>"
|
||||
AC_CHECK_HEADER(X11/forms.h,[
|
||||
ac_cv_header_forms_h=yes
|
||||
lyx_cv_forms_h_location="<X11/forms.h>"],[
|
||||
AC_CHECK_HEADER(forms.h,[],[
|
||||
LYX_LIB_ERROR(forms.h,forms)])])
|
||||
AC_DEFINE_UNQUOTED(FORMS_H_LOCATION,$lyx_cv_forms_h_location)
|
||||
if test $ac_cv_header_forms_h = yes; then
|
||||
AC_CACHE_CHECK([xforms header version],lyx_cv_xfversion,
|
||||
[ cat > conftest.$ac_ext <<EOF
|
||||
#line __oline__ "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#include FORMS_H_LOCATION
|
||||
#if ! defined(FL_INCLUDE_VERSION)
|
||||
"%%%"(unknown)"%%%"
|
||||
#else
|
||||
"%%%"FL_VERSION.FL_REVISION.FL_FIXLEVEL"%%%"
|
||||
#endif
|
||||
EOF
|
||||
lyx_cv_xfversion=`(eval "$ac_cpp conftest.$ac_ext") 2>&5 | \
|
||||
grep '^"%%%"' 2>/dev/null | \
|
||||
sed -e 's/^"%%%"\(.*\)"%%%"/\1/' -e 's/ //g'`
|
||||
rm -f conftest*])
|
||||
XFORMS_VERSION=$lyx_cv_xfversion
|
||||
case "$lyx_cv_xfversion" in
|
||||
"(unknown)"|0.8[1-7]*)
|
||||
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
|
||||
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*) ;;
|
||||
*) 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])
|
||||
|
||||
|
||||
dnl Check whether the xforms library has a viable image loader
|
||||
AC_DEFUN(LYX_USE_XFORMS_IMAGE_LOADER,
|
||||
[
|
||||
save_LIBS=$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"
|
||||
### 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)
|
||||
])
|
||||
|
||||
|
||||
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
|
||||
save_LIBS=$LIBS
|
||||
LIBS="$XFORMS_LIB $LIBS"
|
||||
AC_TRY_LINK([#include <forms.h>],
|
||||
[jpeg_abort(0);],
|
||||
[lyx_need_jpeg=no],[lyx_need_jpeg=yes])
|
||||
LIBS=$save_LIBS
|
||||
AC_LANG_RESTORE
|
||||
AC_MSG_RESULT($lyx_need_jpeg)
|
||||
if test "$lyx_need_jpeg" = "yes" ; then
|
||||
LIBS="-ljpeg $LIBS"
|
||||
fi
|
||||
fi
|
||||
])
|
||||
|
||||
|
||||
dnl Usage: LYX_HPUX Checks for HP-UX and update CXXFLAGS accordingly
|
||||
AC_DEFUN(LYX_HPUX,
|
||||
[#It seems that HPUX requires using -fpcc-struct-return with gcc.
|
||||
|
||||
@ -31,12 +31,13 @@ AC_DEFUN(CHECK_WITH_PSPELL,
|
||||
pspell_lib_found="Setting to $pspell_use_lib"
|
||||
else
|
||||
pspell_libs="/usr/lib /usr/lib/pspell /usr/local/lib /usr/local/lib/pspell"
|
||||
AC_CHECK_LIB(pspell, main, [LIBCRYPT="-lcrypt"])
|
||||
AC_FIND_FILE(libpspell.a,$pspell_libs,pspell_use_lib)
|
||||
pspell_lib_found="yes"
|
||||
fi
|
||||
|
||||
if test "$pspell_use_include" = "NO" || \
|
||||
test "$pspell_use_include" = "NO"; then
|
||||
test "$pspell_use_lib" = "NO"; then
|
||||
if test "$USE_PSPELL" = "yes"; then
|
||||
USE_PSPELL="not found"
|
||||
fi
|
||||
|
||||
106
config/xforms.m4
Normal file
106
config/xforms.m4
Normal file
@ -0,0 +1,106 @@
|
||||
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
|
||||
AC_DEFUN(LYX_PATH_XFORMS,[
|
||||
|
||||
LIBS="$XPM_LIB $LIBS"
|
||||
|
||||
AC_CHECK_LIB(forms, fl_initialize, XFORMS_LIB="-lforms",
|
||||
[AC_CHECK_LIB(xforms, fl_initialize, XFORMS_LIB="-lxforms",
|
||||
[LYX_LIB_ERROR(libforms or libxforms,xforms)])])
|
||||
AC_SUBST(XFORMS_LIB)
|
||||
|
||||
### Check for xforms headers
|
||||
lyx_cv_forms_h_location="<forms.h>"
|
||||
AC_CHECK_HEADER(X11/forms.h,[
|
||||
ac_cv_header_forms_h=yes
|
||||
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_CHECK_HEADER(flimage.h,[],[
|
||||
LYX_LIB_ERROR(flimage.h,forms)])])
|
||||
AC_DEFINE_UNQUOTED(FORMS_IMAGE_H_LOCATION,$lyx_cv_flimage_h_location)
|
||||
|
||||
AC_DEFINE_UNQUOTED(FORMS_H_LOCATION,$lyx_cv_forms_h_location)
|
||||
|
||||
if test $ac_cv_header_forms_h = yes; then
|
||||
AC_CACHE_CHECK([xforms header version],lyx_cv_xfversion,
|
||||
[ cat > conftest.$ac_ext <<EOF
|
||||
#line __oline__ "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#include FORMS_H_LOCATION
|
||||
#if ! defined(FL_INCLUDE_VERSION)
|
||||
"%%%"(unknown)"%%%"
|
||||
#else
|
||||
"%%%"FL_VERSION.FL_REVISION.FL_FIXLEVEL"%%%"
|
||||
#endif
|
||||
EOF
|
||||
lyx_cv_xfversion=`(eval "$ac_cpp conftest.$ac_ext") 2>&5 | \
|
||||
grep '^"%%%"' 2>/dev/null | \
|
||||
sed -e 's/^"%%%"\(.*\)"%%%"/\1/' -e 's/ //g'`
|
||||
rm -f conftest*])
|
||||
|
||||
XFORMS_VERSION=$lyx_cv_xfversion
|
||||
case "$lyx_cv_xfversion" in
|
||||
"(unknown)"|0.8[1-7]*)
|
||||
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
|
||||
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*) ;;
|
||||
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])
|
||||
|
||||
|
||||
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"
|
||||
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
|
||||
AC_SUBST(XFORMS_IMAGE_LIB)
|
||||
### 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)
|
||||
])
|
||||
|
||||
|
||||
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
|
||||
])
|
||||
@ -191,7 +191,7 @@ case "$lyx_use_frontend" in
|
||||
FRONTEND="xforms"
|
||||
FRONTEND_GUILIB="xforms/*.lo"
|
||||
FRONTEND_INCLUDES="-I\$(srcdir)/xforms"
|
||||
FRONTEND_LIBS="@XFORMS_LIB@ @XPM_LIB@"
|
||||
FRONTEND_LIBS="@XFORMS_IMAGE_LIB@ @XFORMS_LIB@ @XPM_LIB@"
|
||||
FRONTEND_INFO=`cat <<EOF
|
||||
libXpm version: ${XPM_VERSION}\n\
|
||||
libforms version: ${XFORMS_VERSION}\n
|
||||
|
||||
@ -31,14 +31,6 @@
|
||||
|
||||
using std::endl;
|
||||
|
||||
// I keep these here so that it will be processed as early in
|
||||
// the compilation process as possible.
|
||||
#if !defined(FL_REVISION) || FL_REVISION < 88 || FL_VERSION != 0
|
||||
#error LyX will not compile with this version of XForms.\
|
||||
Please get version 0.89.\
|
||||
If you want to try to compile anyway, delete this test in src/frontends/gnome/GUIRunTime.C.
|
||||
#endif
|
||||
|
||||
extern bool finished;
|
||||
|
||||
namespace {
|
||||
|
||||
@ -34,14 +34,6 @@ using std::endl;
|
||||
|
||||
// For now we need this here as long as we use xforms components!
|
||||
|
||||
// I keep these here so that it will be processed as early in
|
||||
// the compilation process as possible.
|
||||
#if !defined(FL_REVISION) || FL_REVISION < 88 || FL_VERSION != 0
|
||||
#error LyX will not compile with this version of XForms.\
|
||||
Please get version 0.89.\
|
||||
If you want to try to compile anyway, delete this test in src/frontends/qt2/GUIRunTime.C.
|
||||
#endif
|
||||
|
||||
extern bool finished;
|
||||
|
||||
int GUIRunTime::initApplication(int & argc, char * argv[])
|
||||
|
||||
@ -1,3 +1,7 @@
|
||||
2002-06-02 John Levon <moz@compsoc.man.ac.uk>
|
||||
|
||||
* xformsGImage.h: use FORMS_IMAGE_H_LOCATION
|
||||
|
||||
2002-06-02 John Levon <moz@compsoc.man.ac.uk>
|
||||
|
||||
* GUIRunTime.C:
|
||||
|
||||
@ -21,8 +21,7 @@
|
||||
#include "graphics/GraphicsImage.h"
|
||||
#include FORMS_H_LOCATION
|
||||
#if FL_VERSION > 0
|
||||
// FIXME: need FORMS_IMAGE_H_LOCATION I suppose
|
||||
#include <flimage.h>
|
||||
#include FORMS_IMAGE_H_LOCATION
|
||||
#endif
|
||||
|
||||
namespace grfx {
|
||||
|
||||
Loading…
Reference in New Issue
Block a user