anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-22 01:59:02 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

configure cleanups

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@2186 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Jean-Marc Lasgouttes 2001-07-05 14:00:36 +00:00
parent d937d3459d
commit 15da5b5fbc
7 changed files with 60 additions and 79 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -1,3 +1,11 @@
2001-07-05 Jean-Marc Lasgouttes <Jean-Marc.Lasgouttes@inria.fr>
* INSTALL: update various requirements
* configure.in: do not test for namespace, mutable
* acconfig.h: remove entry for USE_PSPELL
2001-07-04 Jean-Marc Lasgouttes <Jean-Marc.Lasgouttes@inria.fr> 2001-07-04 Jean-Marc Lasgouttes <Jean-Marc.Lasgouttes@inria.fr>
* ABOUT-NLS: updated from gettext 0.10.38 * ABOUT-NLS: updated from gettext 0.10.38

31
INSTALL
View File

@ -35,11 +35,12 @@ You will need to have both an Xforms library and Xpm library to compile
LyX. It is imperative that you have the correct versions of these LyX. It is imperative that you have the correct versions of these
libraries, and their associated header files. libraries, and their associated header files.
As of LyX version 1.1.5, you will need to have Xforms library and header As of LyX version 1.1.5, you will need to have Xforms library and
version 0.88 or 0.89. Version 0.88 is a stable release and the header version 0.88 or 0.89. Version 0.88 is a stable release and the
recommended version. On some systems, such as linux ELF, there are shared recommended version, but 0.89.6 seems to be work very well too. On
library versions of the Xforms library, which require an installation step some systems, such as linux ELF, there are shared library versions of
to configure the system. the Xforms library, which require an installation step to configure
the system.
Xforms is available (free) only in binary format, source code is not Xforms is available (free) only in binary format, source code is not
available. If it is not available for your machine, contact the Xforms available. If it is not available for your machine, contact the Xforms
@ -61,23 +62,23 @@ libXpm can be found at:
(or similar locations at other sunsites like sunsite.unc.edu) (or similar locations at other sunsites like sunsite.unc.edu)
You will also need a recent C++ compiler, where recent means that the You will also need a recent C++ compiler, where recent means that the
compilers are close to C++ standard conforming. Compilers that are compilers are close to C++ standard conforming. Compilers that are
known to compile LyX are gcc 2.8.1 and 2.95.x, the various versions of known to compile LyX are egcs 1.1.x, gcc 2.95.x and later, and Digital
egcs and Digital C++ version 6.1. Please tell us your experience with C++ version 6.1 and later. Please tell us your experience with other
other compilers. It is _not_ possible to compile LyX with gcc 2.7.x, compilers. It is _not_ possible to compile LyX with gcc 2.7.x and
and this is not likely to change in the future. 2.8.x, and this is not likely to change in the future.
Note that, contrary to LyX 1.0.x, LyX 1.1.x makes great use of C++ Note that, contrary to LyX 1.0.x, LyX 1.1.x makes great use of C++
Standard Template Library (STL); this means that gcc users will have Standard Template Library (STL); this means that gcc users will have
to install the relevant libstdc++ library to be able to compile this to install the relevant libstdc++ library to be able to compile this
version. version.
If you make modifications to files in src/ (for example by applying a If you make modifications to files in src/ (for example by applying a
patch), you will need to have the GNU gettext package installed, due to patch), you will need to have the GNU gettext package installed, due
some dependencies in the makefiles. You can find the latest (alpha) to some dependencies in the makefiles. You can find the latest version
version from: from:
ftp://alpha.gnu.org/gnu/gettext-0.10.xx.tar.gz. ftp://ftp.gnu.org/gnu/gettext-0.10.xx.tar.gz.
LyX contains a hack to work around this, but you should not rely too LyX contains a hack to work around this, but you should not rely too
much on it. much on it.

2
acconfig.h
View File

@ -28,8 +28,6 @@
#undef HAVE_LIBSM #undef HAVE_LIBSM
#undef USE_PSPELL
/* Define as 1 if the MKSTEMP function is declared */ /* Define as 1 if the MKSTEMP function is declared */
#undef HAVE_DECL_MKSTEMP #undef HAVE_DECL_MKSTEMP

9
config/ChangeLog
View File

@ -1,3 +1,12 @@
2001-07-05 Jean-Marc Lasgouttes <Jean-Marc.Lasgouttes@inria.fr>
* lyxinclude.m4: remove LYX_CXX_NAMESPACE, LYX_CXX_MUTABLE
(LYX_PROG_CXX_WORKS): check for namespace support, mutable keyword
(LYX_PATH_XFORMS): do not warn against xforms 0.89.6
* pspell.m4 (CHECK_WITH_PSPELL): add the documentation for the
USE_PSPELL define.
2001-07-04 Jean-Marc Lasgouttes <Jean-Marc.Lasgouttes@inria.fr> 2001-07-04 Jean-Marc Lasgouttes <Jean-Marc.Lasgouttes@inria.fr>
* codeset.m4: * codeset.m4:

76
config/lyxinclude.m4
View File

@ -138,7 +138,19 @@ done
AC_DEFUN(LYX_PROG_CXX_WORKS, AC_DEFUN(LYX_PROG_CXX_WORKS,
[AC_LANG_SAVE [AC_LANG_SAVE
AC_LANG_CPLUSPLUS AC_LANG_CPLUSPLUS
AC_TRY_COMPILER([class foo { int bar; }; int main(){return(0);}], ac_cv_prog_cxx_works, ac_cv_prog_cxx_cross) AC_TRY_COMPILER(
[class foo {
// we require the mutable keyword
mutable int bar;
};
// we require namespace support
namespace baz {
int bar;
}
int main() {
return(0);
}
], ac_cv_prog_cxx_works, ac_cv_prog_cxx_cross)
AC_LANG_RESTORE AC_LANG_RESTORE
if test $ac_cv_prog_cxx_works = no; then if test $ac_cv_prog_cxx_works = no; then
CXX= CXX=
@ -238,6 +250,7 @@ fi
])dnl ])dnl
dnl NOT USED CURRENTLY*************************************
dnl Usage: LYX_CXX_RTTI : checks whether the C++ compiler dnl Usage: LYX_CXX_RTTI : checks whether the C++ compiler
dnl supports RTTI dnl supports RTTI
AC_DEFUN(LYX_CXX_RTTI,[ AC_DEFUN(LYX_CXX_RTTI,[
@ -295,6 +308,7 @@ if test $lyx_cv_explicit = no ; then
fi]) fi])
dnl NOT USED CURRENTLY*************************************
dnl Usage: LYX_CXX_STL_STACK : checks whether the C++ compiler dnl Usage: LYX_CXX_STL_STACK : checks whether the C++ compiler
dnl has a working stl stack template dnl has a working stl stack template
AC_DEFUN(LYX_CXX_STL_STACK,[ AC_DEFUN(LYX_CXX_STL_STACK,[
@ -361,7 +375,8 @@ AC_DEFUN(LYX_CXX_STL_STRING,[
AC_MSG_CHECKING(whether the included std::string should be used) AC_MSG_CHECKING(whether the included std::string should be used)
AC_ARG_WITH(included-string, AC_ARG_WITH(included-string,
[ --with-included-string use LyX string class instead of STL string], [ --with-included-string use LyX string class instead of STL string],
[lyx_cv_with_included_string=$withval], [lyx_cv_with_included_string=$withval
AC_MSG_RESULT([$with_included_string])],
[AC_CACHE_CHECK([],lyx_cv_with_included_string, [AC_CACHE_CHECK([],lyx_cv_with_included_string,
[AC_TRY_COMPILE([ [AC_TRY_COMPILE([
#include <string> #include <string>
@ -442,33 +457,7 @@ AC_DEFUN(LYX_REGEX,[
AM_CONDITIONAL(USE_REGEX, test x$lyx_regex = xyes) AM_CONDITIONAL(USE_REGEX, test x$lyx_regex = xyes)
]) ])
dnl NOT USED CURRENTLY*************************************
dnl LYX_CXX_MUTABLE
AC_DEFUN(LYX_CXX_MUTABLE, [
AC_REQUIRE([LYX_PROG_CXX])
AC_CACHE_CHECK([if C++ compiler supports mutable],
lyx_cv_cxx_mutable,[
AC_TRY_COMPILE(
[
class k {
mutable char *c;
public:
void foo() const { c=0; }
};
],[
],[
lyx_cv_cxx_mutable=yes
],[
lyx_cv_cxx_mutable=no
])
])
if test $lyx_cv_cxx_mutable = yes ; then
AC_DEFINE(HAVE_MUTABLE, 1,
[Defined if your compiler suports 'mutable'.])
fi
])
dnl LYX_CXX_PARTIAL dnl LYX_CXX_PARTIAL
AC_DEFUN(LYX_CXX_PARTIAL, [ AC_DEFUN(LYX_CXX_PARTIAL, [
AC_REQUIRE([LYX_PROG_CXX]) AC_REQUIRE([LYX_PROG_CXX])
@ -497,28 +486,6 @@ AC_DEFUN(LYX_CXX_PARTIAL, [
]) ])
dnl Usage: LYX_CXX_NAMESPACES : checks whether the C++ compiler
dnl has a correct namespace handling and define CXX_WORKING_NAMESPACES
dnl if true. This macro does not do a thourough test, but it should be
dnl good enough to suit our needs.
AC_DEFUN(LYX_CXX_NAMESPACES,[
AC_CACHE_CHECK(for correct namespaces support,lyx_cv_cxx_namespace,
[AC_TRY_COMPILE([
namespace foo {
int bar;
}
],[
foo::bar = 0;
return 0;
],lyx_cv_cxx_namespace=yes,lyx_cv_cxx_namespace=no)
])
if test x$lyx_cv_cxx_namespace = xyes ; then
AC_DEFINE(CXX_WORKING_NAMESPACES, 1,
[Define if your C++ compiler has correct support for namespaces])
fi
])
dnl Usage: LYX_CXX_CHEADERS : checks whether the C++ compiler dnl Usage: LYX_CXX_CHEADERS : checks whether the C++ compiler
dnl provides wrappers for C headers and use our alternate version otherwise. dnl provides wrappers for C headers and use our alternate version otherwise.
AC_DEFUN(LYX_CXX_CHEADERS,[ AC_DEFUN(LYX_CXX_CHEADERS,[
@ -642,10 +609,11 @@ case "$lyx_cv_xfversion" in
Version $lyx_cv_xfversion of xforms is not compatible with LyX. Version $lyx_cv_xfversion of xforms is not compatible with LyX.
This version of LyX works best with versions 0.88 (recommended) and later.) ;; This version of LyX works best with versions 0.88 (recommended) and later.) ;;
0.88*) ;; 0.88*) ;;
0.89*) LYX_WARNING(dnl 0.89[012345]) LYX_WARNING(dnl
LyX should work ok with version $lyx_cv_xfversion of xforms[,] but LyX should work ok with version $lyx_cv_xfversion of xforms[,] but
it is an unproven version and might still have some bugs. If you it is an unproven version and might still have some bugs. You should
have problems[,] please use version 0.88 instead.) ;; probably use version 0.89.6 (or 0.88) instead) ;;
0.89*) ;;
*) LYX_WARNING(dnl *) LYX_WARNING(dnl
Version $lyx_cv_xfversion of xforms might not be compatible with LyX[,] Version $lyx_cv_xfversion of xforms might not be compatible with LyX[,]
since it is newer than 0.88. You might have slight problems with it.);; since it is newer than 0.88. You might have slight problems with it.);;

4
config/pspell.m4
View File

@ -1,4 +1,4 @@
# Macro to add for using pspell spellchecker libraries! # Macro to add for using pspell spellchecker libraries! -*- sh -*-
# @author@: Jürgen Vigna # @author@: Jürgen Vigna
AC_DEFUN(CHECK_WITH_PSPELL, AC_DEFUN(CHECK_WITH_PSPELL,
@ -43,7 +43,7 @@ AC_DEFUN(CHECK_WITH_PSPELL,
fi fi
if test "$USE_PSPELL" = "yes"; then if test "$USE_PSPELL" = "yes"; then
AC_DEFINE(USE_PSPELL) AC_DEFINE(USE_PSPELL, 1, [Define as 1 to use the pspell library])
PSPELL_INCLUDES="-I$pspell_use_include" PSPELL_INCLUDES="-I$pspell_use_include"
PSPELL_LIBS="-L$pspell_use_lib -lpspell" PSPELL_LIBS="-L$pspell_use_lib -lpspell"
USE_PSPELL="yes ($pspell_use_include $pspell_use_lib)" USE_PSPELL="yes ($pspell_use_include $pspell_use_lib)"

9
configure.in
View File

@ -80,15 +80,12 @@ AC_LIBTOOL_WIN32_DLL
LYX_PROG_LIBTOOL LYX_PROG_LIBTOOL
### Some checks on what the C++ compiler can(not) do ### Some checks on what the C++ compiler can(not) do
LYX_CXX_MUTABLE dnl we do not need that currently (and probably all our supported
LYX_CXX_PARTIAL dnl compiler allow that)
dnl LYX_CXX_PARTIAL
LYX_CXX_EXPLICIT LYX_CXX_EXPLICIT
dnl we do not use stl stack, or at least not on gcc 2.7, which was the
dnl cause for this test.
dnl LYX_CXX_STL_STACK
LYX_CXX_STL_STRING LYX_CXX_STL_STRING
LYX_CXX_GOOD_STD_STRING LYX_CXX_GOOD_STD_STRING
LYX_CXX_NAMESPACES
LYX_CXX_CHEADERS LYX_CXX_CHEADERS
LYX_CXX_GLOBAL_CSTD LYX_CXX_GLOBAL_CSTD
LYX_STD_COUNT LYX_STD_COUNT