mirror of
https://git.FreeBSD.org/ports.git
synced 2024-12-23 04:23:08 +00:00
Remove the files, that should've removed in the previous commit. As
usual, I rm-ed them locally, ran the test-built, and committed without cvs-deleting first. Reminded by: KATO Tsuguru
This commit is contained in:
Mikhail Teterin
parent
d18de910c8
commit
e605a333e0
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=74006
@ -1,32 +0,0 @@
|
||||
--- autogen.sh Thu Apr 18 22:11:28 2002
|
||||
+++ autogen.sh Fri Jun 28 21:55:35 2002
|
||||
@@ -1,9 +1,9 @@
|
||||
#!/bin/sh
|
||||
|
||||
ACLOCAL=aclocal
|
||||
-AUTOHEADER=autoheader
|
||||
+AUTOHEADER=autoheader213
|
||||
AUTOMAKE="automake -a -c --foreign"
|
||||
-AUTOCONF=autoconf
|
||||
+AUTOCONF=autoconf213
|
||||
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"
|
||||
@@ -31,7 +31,7 @@
|
||||
echo "done."
|
||||
|
||||
# Generate the Makefiles and configure files
|
||||
-if ( aclocal --version ) </dev/null > /dev/null 2>&1; then
|
||||
+if ( $ACLOCAL --version ) </dev/null > /dev/null 2>&1; then
|
||||
echo "Building macros..."
|
||||
for dir in . lib/reLyX sigc++ ; do
|
||||
echo " $dir"
|
||||
@@ -43,7 +43,7 @@
|
||||
exit
|
||||
fi
|
||||
|
||||
-if ( autoheader --version ) </dev/null > /dev/null 2>&1; then
|
||||
+if ( $AUTOHEADER --version ) </dev/null > /dev/null 2>&1; then
|
||||
echo "Building config header template..."
|
||||
for dir in . sigc++ ; do
|
||||
echo " $dir"
|
||||
@ -1,20 +0,0 @@
|
||||
--- config/pspell.m4.orig Thu Jun 20 21:03:56 2002
|
||||
+++ config/pspell.m4 Wed Oct 2 22:10:21 2002
|
||||
@@ -12,7 +12,7 @@
|
||||
fi
|
||||
])
|
||||
|
||||
- AC_ARG_WITH(pspell-includes, [ --with-pspell-include where the pspell.h is located],
|
||||
+ AC_ARG_WITH(pspell-include, [ --with-pspell-include where the pspell.h is located],
|
||||
pspell_use_include="$withval",
|
||||
pspell_use_include=NONE)
|
||||
|
||||
@@ -22,7 +22,7 @@
|
||||
AC_FIND_FILE(pspell/pspell.h,$pspell_includes,pspell_use_include)
|
||||
fi
|
||||
|
||||
- AC_ARG_WITH(pspell-libs, [ --with-pspell-lib where the libpspell.a is located],
|
||||
+ AC_ARG_WITH(pspell-lib, [ --with-pspell-lib where the libpspell.a is located],
|
||||
pspell_use_lib="$withval",
|
||||
pspell_use_lib=NONE)
|
||||
|
||||
@ -1,12 +0,0 @@
|
||||
--- src/FontLoader.C.orig Fri Mar 22 02:25:07 2002
|
||||
+++ src/FontLoader.C Fri Aug 23 03:38:09 2002
|
||||
@@ -300,7 +300,8 @@
|
||||
if (font == "fixed") {
|
||||
lyxerr << "We're doomed. Can't get 'fixed' font." << endl;
|
||||
} else {
|
||||
- lyxerr << "Could not get font. Using 'fixed'." << endl;
|
||||
+ lyxerr << "Could not get font '" << font.c_str() <<
|
||||
+ "'. Using 'fixed'." << endl;
|
||||
fs = XLoadQueryFont(GUIRunTime::x11Display(), "fixed");
|
||||
}
|
||||
} else if (lyxerr.debugging(Debug::FONT)) {
|
||||
@ -1,98 +0,0 @@
|
||||
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 / FLIMAGE_H_LOCATION is also set
|
||||
AC_DEFUN(LYX_PATH_XFORMS,[
|
||||
AC_REQUIRE([LYX_PATH_XPM])
|
||||
|
||||
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)], $XPM_LIB)], $XPM_LIB)
|
||||
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,
|
||||
[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
|
||||
#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*) ;;
|
||||
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
|
||||
])
|
||||
|
||||
|
||||
|
||||
dnl Check whether the xforms library has a viable image loader
|
||||
AC_DEFUN(LYX_USE_XFORMS_IMAGE_LOADER,
|
||||
[AC_REQUIRE([LYX_PATH_XFORMS])
|
||||
save_LIBS=$LIBS
|
||||
LIBS="$XFORMS_LIB $XPM_LIB $LIBS"
|
||||
lyx_use_xforms_image_loader=no
|
||||
AC_LANG_SAVE
|
||||
AC_LANG_C
|
||||
|
||||
AC_CHECK_LIB(jpeg, jpeg_read_header,
|
||||
[XFORMS_IMAGE_LIB=-ljpeg
|
||||
LIBS="$LIBS -ljpeg"])
|
||||
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"
|
||||
LIBS="$XFORMS_IMAGE_LIB $LIBS"
|
||||
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 flimage_enable_jpeg)
|
||||
AC_CHECK_HEADERS(flimage.h X11/flimage.h, break)
|
||||
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])
|
||||
@ -1,32 +0,0 @@
|
||||
--- autogen.sh Thu Apr 18 22:11:28 2002
|
||||
+++ autogen.sh Fri Jun 28 21:55:35 2002
|
||||
@@ -1,9 +1,9 @@
|
||||
#!/bin/sh
|
||||
|
||||
ACLOCAL=aclocal
|
||||
-AUTOHEADER=autoheader
|
||||
+AUTOHEADER=autoheader213
|
||||
AUTOMAKE="automake -a -c --foreign"
|
||||
-AUTOCONF=autoconf
|
||||
+AUTOCONF=autoconf213
|
||||
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"
|
||||
@@ -31,7 +31,7 @@
|
||||
echo "done."
|
||||
|
||||
# Generate the Makefiles and configure files
|
||||
-if ( aclocal --version ) </dev/null > /dev/null 2>&1; then
|
||||
+if ( $ACLOCAL --version ) </dev/null > /dev/null 2>&1; then
|
||||
echo "Building macros..."
|
||||
for dir in . lib/reLyX sigc++ ; do
|
||||
echo " $dir"
|
||||
@@ -43,7 +43,7 @@
|
||||
exit
|
||||
fi
|
||||
|
||||
-if ( autoheader --version ) </dev/null > /dev/null 2>&1; then
|
||||
+if ( $AUTOHEADER --version ) </dev/null > /dev/null 2>&1; then
|
||||
echo "Building config header template..."
|
||||
for dir in . sigc++ ; do
|
||||
echo " $dir"
|
||||
@ -1,20 +0,0 @@
|
||||
--- config/pspell.m4.orig Thu Jun 20 21:03:56 2002
|
||||
+++ config/pspell.m4 Wed Oct 2 22:10:21 2002
|
||||
@@ -12,7 +12,7 @@
|
||||
fi
|
||||
])
|
||||
|
||||
- AC_ARG_WITH(pspell-includes, [ --with-pspell-include where the pspell.h is located],
|
||||
+ AC_ARG_WITH(pspell-include, [ --with-pspell-include where the pspell.h is located],
|
||||
pspell_use_include="$withval",
|
||||
pspell_use_include=NONE)
|
||||
|
||||
@@ -22,7 +22,7 @@
|
||||
AC_FIND_FILE(pspell/pspell.h,$pspell_includes,pspell_use_include)
|
||||
fi
|
||||
|
||||
- AC_ARG_WITH(pspell-libs, [ --with-pspell-lib where the libpspell.a is located],
|
||||
+ AC_ARG_WITH(pspell-lib, [ --with-pspell-lib where the libpspell.a is located],
|
||||
pspell_use_lib="$withval",
|
||||
pspell_use_lib=NONE)
|
||||
|
||||
@ -1,12 +0,0 @@
|
||||
--- src/FontLoader.C.orig Fri Mar 22 02:25:07 2002
|
||||
+++ src/FontLoader.C Fri Aug 23 03:38:09 2002
|
||||
@@ -300,7 +300,8 @@
|
||||
if (font == "fixed") {
|
||||
lyxerr << "We're doomed. Can't get 'fixed' font." << endl;
|
||||
} else {
|
||||
- lyxerr << "Could not get font. Using 'fixed'." << endl;
|
||||
+ lyxerr << "Could not get font '" << font.c_str() <<
|
||||
+ "'. Using 'fixed'." << endl;
|
||||
fs = XLoadQueryFont(GUIRunTime::x11Display(), "fixed");
|
||||
}
|
||||
} else if (lyxerr.debugging(Debug::FONT)) {
|
||||
@ -1,98 +0,0 @@
|
||||
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 / FLIMAGE_H_LOCATION is also set
|
||||
AC_DEFUN(LYX_PATH_XFORMS,[
|
||||
AC_REQUIRE([LYX_PATH_XPM])
|
||||
|
||||
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)], $XPM_LIB)], $XPM_LIB)
|
||||
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,
|
||||
[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
|
||||
#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*) ;;
|
||||
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
|
||||
])
|
||||
|
||||
|
||||
|
||||
dnl Check whether the xforms library has a viable image loader
|
||||
AC_DEFUN(LYX_USE_XFORMS_IMAGE_LOADER,
|
||||
[AC_REQUIRE([LYX_PATH_XFORMS])
|
||||
save_LIBS=$LIBS
|
||||
LIBS="$XFORMS_LIB $XPM_LIB $LIBS"
|
||||
lyx_use_xforms_image_loader=no
|
||||
AC_LANG_SAVE
|
||||
AC_LANG_C
|
||||
|
||||
AC_CHECK_LIB(jpeg, jpeg_read_header,
|
||||
[XFORMS_IMAGE_LIB=-ljpeg
|
||||
LIBS="$LIBS -ljpeg"])
|
||||
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"
|
||||
LIBS="$XFORMS_IMAGE_LIB $LIBS"
|
||||
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 flimage_enable_jpeg)
|
||||
AC_CHECK_HEADERS(flimage.h X11/flimage.h, break)
|
||||
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])
|
||||
@ -1,32 +0,0 @@
|
||||
--- autogen.sh Thu Apr 18 22:11:28 2002
|
||||
+++ autogen.sh Fri Jun 28 21:55:35 2002
|
||||
@@ -1,9 +1,9 @@
|
||||
#!/bin/sh
|
||||
|
||||
ACLOCAL=aclocal
|
||||
-AUTOHEADER=autoheader
|
||||
+AUTOHEADER=autoheader213
|
||||
AUTOMAKE="automake -a -c --foreign"
|
||||
-AUTOCONF=autoconf
|
||||
+AUTOCONF=autoconf213
|
||||
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"
|
||||
@@ -31,7 +31,7 @@
|
||||
echo "done."
|
||||
|
||||
# Generate the Makefiles and configure files
|
||||
-if ( aclocal --version ) </dev/null > /dev/null 2>&1; then
|
||||
+if ( $ACLOCAL --version ) </dev/null > /dev/null 2>&1; then
|
||||
echo "Building macros..."
|
||||
for dir in . lib/reLyX sigc++ ; do
|
||||
echo " $dir"
|
||||
@@ -43,7 +43,7 @@
|
||||
exit
|
||||
fi
|
||||
|
||||
-if ( autoheader --version ) </dev/null > /dev/null 2>&1; then
|
||||
+if ( $AUTOHEADER --version ) </dev/null > /dev/null 2>&1; then
|
||||
echo "Building config header template..."
|
||||
for dir in . sigc++ ; do
|
||||
echo " $dir"
|
||||
@ -1,20 +0,0 @@
|
||||
--- config/pspell.m4.orig Thu Jun 20 21:03:56 2002
|
||||
+++ config/pspell.m4 Wed Oct 2 22:10:21 2002
|
||||
@@ -12,7 +12,7 @@
|
||||
fi
|
||||
])
|
||||
|
||||
- AC_ARG_WITH(pspell-includes, [ --with-pspell-include where the pspell.h is located],
|
||||
+ AC_ARG_WITH(pspell-include, [ --with-pspell-include where the pspell.h is located],
|
||||
pspell_use_include="$withval",
|
||||
pspell_use_include=NONE)
|
||||
|
||||
@@ -22,7 +22,7 @@
|
||||
AC_FIND_FILE(pspell/pspell.h,$pspell_includes,pspell_use_include)
|
||||
fi
|
||||
|
||||
- AC_ARG_WITH(pspell-libs, [ --with-pspell-lib where the libpspell.a is located],
|
||||
+ AC_ARG_WITH(pspell-lib, [ --with-pspell-lib where the libpspell.a is located],
|
||||
pspell_use_lib="$withval",
|
||||
pspell_use_lib=NONE)
|
||||
|
||||
@ -1,12 +0,0 @@
|
||||
--- src/FontLoader.C.orig Fri Mar 22 02:25:07 2002
|
||||
+++ src/FontLoader.C Fri Aug 23 03:38:09 2002
|
||||
@@ -300,7 +300,8 @@
|
||||
if (font == "fixed") {
|
||||
lyxerr << "We're doomed. Can't get 'fixed' font." << endl;
|
||||
} else {
|
||||
- lyxerr << "Could not get font. Using 'fixed'." << endl;
|
||||
+ lyxerr << "Could not get font '" << font.c_str() <<
|
||||
+ "'. Using 'fixed'." << endl;
|
||||
fs = XLoadQueryFont(GUIRunTime::x11Display(), "fixed");
|
||||
}
|
||||
} else if (lyxerr.debugging(Debug::FONT)) {
|
||||
@ -1,98 +0,0 @@
|
||||
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 / FLIMAGE_H_LOCATION is also set
|
||||
AC_DEFUN(LYX_PATH_XFORMS,[
|
||||
AC_REQUIRE([LYX_PATH_XPM])
|
||||
|
||||
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)], $XPM_LIB)], $XPM_LIB)
|
||||
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,
|
||||
[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
|
||||
#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*) ;;
|
||||
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
|
||||
])
|
||||
|
||||
|
||||
|
||||
dnl Check whether the xforms library has a viable image loader
|
||||
AC_DEFUN(LYX_USE_XFORMS_IMAGE_LOADER,
|
||||
[AC_REQUIRE([LYX_PATH_XFORMS])
|
||||
save_LIBS=$LIBS
|
||||
LIBS="$XFORMS_LIB $XPM_LIB $LIBS"
|
||||
lyx_use_xforms_image_loader=no
|
||||
AC_LANG_SAVE
|
||||
AC_LANG_C
|
||||
|
||||
AC_CHECK_LIB(jpeg, jpeg_read_header,
|
||||
[XFORMS_IMAGE_LIB=-ljpeg
|
||||
LIBS="$LIBS -ljpeg"])
|
||||
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"
|
||||
LIBS="$XFORMS_IMAGE_LIB $LIBS"
|
||||
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 flimage_enable_jpeg)
|
||||
AC_CHECK_HEADERS(flimage.h X11/flimage.h, break)
|
||||
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])
|
||||
@ -1,32 +0,0 @@
|
||||
--- autogen.sh Thu Apr 18 22:11:28 2002
|
||||
+++ autogen.sh Fri Jun 28 21:55:35 2002
|
||||
@@ -1,9 +1,9 @@
|
||||
#!/bin/sh
|
||||
|
||||
ACLOCAL=aclocal
|
||||
-AUTOHEADER=autoheader
|
||||
+AUTOHEADER=autoheader213
|
||||
AUTOMAKE="automake -a -c --foreign"
|
||||
-AUTOCONF=autoconf
|
||||
+AUTOCONF=autoconf213
|
||||
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"
|
||||
@@ -31,7 +31,7 @@
|
||||
echo "done."
|
||||
|
||||
# Generate the Makefiles and configure files
|
||||
-if ( aclocal --version ) </dev/null > /dev/null 2>&1; then
|
||||
+if ( $ACLOCAL --version ) </dev/null > /dev/null 2>&1; then
|
||||
echo "Building macros..."
|
||||
for dir in . lib/reLyX sigc++ ; do
|
||||
echo " $dir"
|
||||
@@ -43,7 +43,7 @@
|
||||
exit
|
||||
fi
|
||||
|
||||
-if ( autoheader --version ) </dev/null > /dev/null 2>&1; then
|
||||
+if ( $AUTOHEADER --version ) </dev/null > /dev/null 2>&1; then
|
||||
echo "Building config header template..."
|
||||
for dir in . sigc++ ; do
|
||||
echo " $dir"
|
||||
@ -1,20 +0,0 @@
|
||||
--- config/pspell.m4.orig Thu Jun 20 21:03:56 2002
|
||||
+++ config/pspell.m4 Wed Oct 2 22:10:21 2002
|
||||
@@ -12,7 +12,7 @@
|
||||
fi
|
||||
])
|
||||
|
||||
- AC_ARG_WITH(pspell-includes, [ --with-pspell-include where the pspell.h is located],
|
||||
+ AC_ARG_WITH(pspell-include, [ --with-pspell-include where the pspell.h is located],
|
||||
pspell_use_include="$withval",
|
||||
pspell_use_include=NONE)
|
||||
|
||||
@@ -22,7 +22,7 @@
|
||||
AC_FIND_FILE(pspell/pspell.h,$pspell_includes,pspell_use_include)
|
||||
fi
|
||||
|
||||
- AC_ARG_WITH(pspell-libs, [ --with-pspell-lib where the libpspell.a is located],
|
||||
+ AC_ARG_WITH(pspell-lib, [ --with-pspell-lib where the libpspell.a is located],
|
||||
pspell_use_lib="$withval",
|
||||
pspell_use_lib=NONE)
|
||||
|
||||
@ -1,12 +0,0 @@
|
||||
--- src/FontLoader.C.orig Fri Mar 22 02:25:07 2002
|
||||
+++ src/FontLoader.C Fri Aug 23 03:38:09 2002
|
||||
@@ -300,7 +300,8 @@
|
||||
if (font == "fixed") {
|
||||
lyxerr << "We're doomed. Can't get 'fixed' font." << endl;
|
||||
} else {
|
||||
- lyxerr << "Could not get font. Using 'fixed'." << endl;
|
||||
+ lyxerr << "Could not get font '" << font.c_str() <<
|
||||
+ "'. Using 'fixed'." << endl;
|
||||
fs = XLoadQueryFont(GUIRunTime::x11Display(), "fixed");
|
||||
}
|
||||
} else if (lyxerr.debugging(Debug::FONT)) {
|
||||
@ -1,98 +0,0 @@
|
||||
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 / FLIMAGE_H_LOCATION is also set
|
||||
AC_DEFUN(LYX_PATH_XFORMS,[
|
||||
AC_REQUIRE([LYX_PATH_XPM])
|
||||
|
||||
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)], $XPM_LIB)], $XPM_LIB)
|
||||
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,
|
||||
[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
|
||||
#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*) ;;
|
||||
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
|
||||
])
|
||||
|
||||
|
||||
|
||||
dnl Check whether the xforms library has a viable image loader
|
||||
AC_DEFUN(LYX_USE_XFORMS_IMAGE_LOADER,
|
||||
[AC_REQUIRE([LYX_PATH_XFORMS])
|
||||
save_LIBS=$LIBS
|
||||
LIBS="$XFORMS_LIB $XPM_LIB $LIBS"
|
||||
lyx_use_xforms_image_loader=no
|
||||
AC_LANG_SAVE
|
||||
AC_LANG_C
|
||||
|
||||
AC_CHECK_LIB(jpeg, jpeg_read_header,
|
||||
[XFORMS_IMAGE_LIB=-ljpeg
|
||||
LIBS="$LIBS -ljpeg"])
|
||||
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"
|
||||
LIBS="$XFORMS_IMAGE_LIB $LIBS"
|
||||
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 flimage_enable_jpeg)
|
||||
AC_CHECK_HEADERS(flimage.h X11/flimage.h, break)
|
||||
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])
|
||||
@ -1,32 +0,0 @@
|
||||
--- autogen.sh Thu Apr 18 22:11:28 2002
|
||||
+++ autogen.sh Fri Jun 28 21:55:35 2002
|
||||
@@ -1,9 +1,9 @@
|
||||
#!/bin/sh
|
||||
|
||||
ACLOCAL=aclocal
|
||||
-AUTOHEADER=autoheader
|
||||
+AUTOHEADER=autoheader213
|
||||
AUTOMAKE="automake -a -c --foreign"
|
||||
-AUTOCONF=autoconf
|
||||
+AUTOCONF=autoconf213
|
||||
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"
|
||||
@@ -31,7 +31,7 @@
|
||||
echo "done."
|
||||
|
||||
# Generate the Makefiles and configure files
|
||||
-if ( aclocal --version ) </dev/null > /dev/null 2>&1; then
|
||||
+if ( $ACLOCAL --version ) </dev/null > /dev/null 2>&1; then
|
||||
echo "Building macros..."
|
||||
for dir in . lib/reLyX sigc++ ; do
|
||||
echo " $dir"
|
||||
@@ -43,7 +43,7 @@
|
||||
exit
|
||||
fi
|
||||
|
||||
-if ( autoheader --version ) </dev/null > /dev/null 2>&1; then
|
||||
+if ( $AUTOHEADER --version ) </dev/null > /dev/null 2>&1; then
|
||||
echo "Building config header template..."
|
||||
for dir in . sigc++ ; do
|
||||
echo " $dir"
|
||||
@ -1,20 +0,0 @@
|
||||
--- config/pspell.m4.orig Thu Jun 20 21:03:56 2002
|
||||
+++ config/pspell.m4 Wed Oct 2 22:10:21 2002
|
||||
@@ -12,7 +12,7 @@
|
||||
fi
|
||||
])
|
||||
|
||||
- AC_ARG_WITH(pspell-includes, [ --with-pspell-include where the pspell.h is located],
|
||||
+ AC_ARG_WITH(pspell-include, [ --with-pspell-include where the pspell.h is located],
|
||||
pspell_use_include="$withval",
|
||||
pspell_use_include=NONE)
|
||||
|
||||
@@ -22,7 +22,7 @@
|
||||
AC_FIND_FILE(pspell/pspell.h,$pspell_includes,pspell_use_include)
|
||||
fi
|
||||
|
||||
- AC_ARG_WITH(pspell-libs, [ --with-pspell-lib where the libpspell.a is located],
|
||||
+ AC_ARG_WITH(pspell-lib, [ --with-pspell-lib where the libpspell.a is located],
|
||||
pspell_use_lib="$withval",
|
||||
pspell_use_lib=NONE)
|
||||
|
||||
@ -1,12 +0,0 @@
|
||||
--- src/FontLoader.C.orig Fri Mar 22 02:25:07 2002
|
||||
+++ src/FontLoader.C Fri Aug 23 03:38:09 2002
|
||||
@@ -300,7 +300,8 @@
|
||||
if (font == "fixed") {
|
||||
lyxerr << "We're doomed. Can't get 'fixed' font." << endl;
|
||||
} else {
|
||||
- lyxerr << "Could not get font. Using 'fixed'." << endl;
|
||||
+ lyxerr << "Could not get font '" << font.c_str() <<
|
||||
+ "'. Using 'fixed'." << endl;
|
||||
fs = XLoadQueryFont(GUIRunTime::x11Display(), "fixed");
|
||||
}
|
||||
} else if (lyxerr.debugging(Debug::FONT)) {
|
||||
@ -1,98 +0,0 @@
|
||||
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 / FLIMAGE_H_LOCATION is also set
|
||||
AC_DEFUN(LYX_PATH_XFORMS,[
|
||||
AC_REQUIRE([LYX_PATH_XPM])
|
||||
|
||||
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)], $XPM_LIB)], $XPM_LIB)
|
||||
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,
|
||||
[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
|
||||
#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*) ;;
|
||||
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
|
||||
])
|
||||
|
||||
|
||||
|
||||
dnl Check whether the xforms library has a viable image loader
|
||||
AC_DEFUN(LYX_USE_XFORMS_IMAGE_LOADER,
|
||||
[AC_REQUIRE([LYX_PATH_XFORMS])
|
||||
save_LIBS=$LIBS
|
||||
LIBS="$XFORMS_LIB $XPM_LIB $LIBS"
|
||||
lyx_use_xforms_image_loader=no
|
||||
AC_LANG_SAVE
|
||||
AC_LANG_C
|
||||
|
||||
AC_CHECK_LIB(jpeg, jpeg_read_header,
|
||||
[XFORMS_IMAGE_LIB=-ljpeg
|
||||
LIBS="$LIBS -ljpeg"])
|
||||
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"
|
||||
LIBS="$XFORMS_IMAGE_LIB $LIBS"
|
||||
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 flimage_enable_jpeg)
|
||||
AC_CHECK_HEADERS(flimage.h X11/flimage.h, break)
|
||||
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])
|
||||
Loading…
Reference in New Issue
Block a user