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

more work

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@4927 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Lars Gullik Bjønnes 2002-08-10 12:26:23 +00:00
parent 9c54f354ce
commit e483de1c7e
7 changed files with 23 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
config/ChangeLog
View File

@ -1,3 +1,7 @@
2002-08-10 Lars Gullik Bjønnes <larsbj@gullik.net>
* some more updates and removal of obsolete macros.
2002-08-08 Lars Gullik Bjønnes <larsbj@birdstep.com>
* further work on 2.53 stuff.

12
config/configure.ac
View File

@ -12,7 +12,6 @@ VERSION="1.3.0cvs"
LYX_CHECK_VERSION
AC_CANONICAL_TARGET
# AC_VALIDATE_CACHE_SYSTEM_TYPE
LYX_VERSION_SUFFIX
@ -55,9 +54,6 @@ AC_PROG_CC
AC_ISC_POSIX
AC_AIX
### Check for program extensions (.exe or nothing)
# AC_EXEEXT
### check which frontend we want to use
LYX_USE_FRONTEND
@ -215,7 +211,7 @@ LYX_USE_XFORMS_IMAGE_LOADER
### Setup GNU gettext
dnl GNU gettext is written in C
AC_LANG(C)
AC_LANG_PUSH(C)
# Some tests that may be useful for gettext
AC_C_CONST
AC_C_INLINE
@ -228,7 +224,7 @@ esac
AC_SUBST(LINGUAS)
AC_LANG(C++)
AC_LANG_POP(C)
# some standard header files
AC_HEADER_DIRENT
@ -256,9 +252,9 @@ dnl This is a slight hack: the tests generated by autoconf 2.52 do not
dnl work correctly because of some conflict with stdlib.h with g++ 2.96
dnl We aim to remove this eventually, since we should test as much as
dnl possible with the compiler which will use the functions (JMarc)
AC_LANG(C)
AC_LANG_PUSH(C)
AC_CHECK_FUNCS(memmove memset strchr putenv setenv mkfifo mkstemp mktemp)
AC_LANG(C++)
AC_LANG_POP(C)
dnl Until this is fixed in autoconf we provide our own version
LYX_FUNC_SELECT_ARGTYPES

11
config/configure.in
View File

@ -12,7 +12,6 @@ VERSION="1.3.0cvs"
LYX_CHECK_VERSION
AC_CANONICAL_SYSTEM
AC_VALIDATE_CACHE_SYSTEM_TYPE
LYX_VERSION_SUFFIX
@ -66,7 +65,7 @@ LYX_USE_FRONTEND
### Check for a C++ compiler
LYX_PROG_CXX
### Some checks on what the C++ compiler can(not) do
AC_LANG_CPLUSPLUS
AC_LANG(C++)
dnl we do not need that currently (and probably all our supported
dnl compiler allow that)
dnl LYX_CXX_PARTIAL
@ -215,7 +214,7 @@ LYX_USE_XFORMS_IMAGE_LOADER
### Setup GNU gettext
dnl GNU gettext is written in C
AC_LANG_C
AC_LANG(C)
# Some tests that may be useful for gettext
AC_C_CONST
AC_C_INLINE
@ -228,7 +227,7 @@ esac
AC_SUBST(LINGUAS)
AC_LANG_CPLUSPLUS
AC_LANG(C++)
# some standard header files
AC_HEADER_DIRENT
@ -256,9 +255,9 @@ dnl This is a slight hack: the tests generated by autoconf 2.52 do not
dnl work correctly because of some conflict with stdlib.h with g++ 2.96
dnl We aim to remove this eventually, since we should test as much as
dnl possible with the compiler which will use the functions (JMarc)
AC_LANG_C
AC_LANG(C)
AC_CHECK_FUNCS(memmove memset strchr putenv setenv mkfifo mkstemp mktemp)
AC_LANG_CPLUSPLUS
AC_LANG(C++)
dnl Until this is fixed in autoconf we provide our own version
LYX_FUNC_SELECT_ARGTYPES

10
config/gnome.m4
View File

@ -276,9 +276,9 @@ dnl AC_DEFINE(HAS_CURSES, 1, [dummy])
dnl has_curses=true
dnl AC_DEFINE(USE_BSD_CURSES, 1, [dummy])
dnl AC_MSG_RESULT(Please note that some screen refreshs may fail)
dnl AC_WARN(Use of the bsdcurses extension has some)
dnl AC_WARN(display/input problems.)
dnl AC_WARN(Reconsider using xcurses)
dnl AC_MSG_WARN(Use of the bsdcurses extension has some)
dnl AC_MSG_WARN(display/input problems.)
dnl AC_MSG_WARN(Reconsider using xcurses)
dnl)
@ -303,7 +303,7 @@ AC_DEFUN(AC_NCURSES, [
])
AC_DEFUN(AC_SEARCH_NCURSES, [
AC_CHECKING("location of ncurses.h file")
AC_MSG_NOTICE("checking location of ncurses.h file")
AC_NCURSES(/usr/include, ncurses.h, -lncurses,, "ncurses on /usr/include")
AC_NCURSES(/usr/include/ncurses, ncurses.h, -lncurses, -I/usr/include/ncurses, "ncurses on /usr/include/ncurses")
@ -776,7 +776,7 @@ AC_MSG_ERROR([could not determine how to read list of mounted filesystems])
# Can't build mountlist.c or anything that needs its functions
fi
AC_CHECKING(how to get filesystem space usage)
AC_MSG_NOTICE(checking how to get filesystem space usage)
space=no
# Perform only the link test since it seems there are no variants of the

24
config/lyxinclude.m4
View File

@ -650,30 +650,6 @@ rm -f conftest*])
])
### end of LYX_PATH_HEADER
dnl AC_VALIDATE_CACHE_SYSTEM_TYPE[(cmd)]
dnl if the cache file is inconsistent with the current host,
dnl target and build system types, execute CMD or print a default
dnl error message.
AC_DEFUN(AC_VALIDATE_CACHE_SYSTEM_TYPE, [
AC_REQUIRE([AC_CANONICAL_SYSTEM])
AC_MSG_CHECKING([config.cache system type])
if { test x"${ac_cv_host_system_type+set}" = x"set" &&
test x"$ac_cv_host_system_type" != x"$host"; } ||
{ test x"${ac_cv_build_system_type+set}" = x"set" &&
test x"$ac_cv_build_system_type" != x"$build"; } ||
{ test x"${ac_cv_target_system_type+set}" = x"set" &&
test x"$ac_cv_target_system_type" != x"$target"; }; then
AC_MSG_RESULT([different])
ifelse($#, 1, [$1],
[AC_MSG_ERROR(["you must remove config.cache and restart configure"])])
else
AC_MSG_RESULT([same])
fi
ac_cv_host_system_type="$host"
ac_cv_build_system_type="$build"
ac_cv_target_system_type="$target"
])
dnl We use this until autoconf fixes its version.
AC_DEFUN(LYX_FUNC_SELECT_ARGTYPES,
[AC_MSG_CHECKING([types of arguments for select()])

3
config/relyx_configure.ac
View File

@ -1,5 +1,6 @@
dnl Process with autoconf to generate configure script -*- sh -*-
AC_INIT(reLyX.in)
AC_INIT
AC_CONFIG_SRCDIR(reLyX.in)
AC_PREREQ(2.53)
AC_CONFIG_AUX_DIR(../../config)

5
config/xforms.m4
View File

@ -69,8 +69,7 @@ AC_DEFUN(LYX_USE_XFORMS_IMAGE_LOADER,
save_LIBS=$LIBS
LIBS="$XFORMS_LIB $LIBS"
lyx_use_xforms_image_loader=no
AC_LANG_SAVE
AC_LANG(C)
AC_LANG_PUSH(C)
AC_CHECK_LIB(jpeg, jpeg_read_header,
[XFORMS_IMAGE_LIB=-ljpeg
@ -95,5 +94,5 @@ fi
### very simple one in graphics/GraphicsImageXPM.[Ch]
AM_CONDITIONAL(USE_BASIC_IMAGE_LOADER,
test $lyx_use_xforms_image_loader = no)
AC_LANG_RESTORE
AC_LANG_POP(C)
LIBS=$save_LIBS])