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

Fix compilation on Solaris 11.1 (bug #8783)

Browse Source 
Make sure that the configure script only checks features using the C++ compiler.

Also get rid of our last C files, since they are not compiled nor distributed anyway.
This commit is contained in:
Jean-Marc Lasgouttes 2013-09-06 11:12:09 +02:00
parent 631d019269
commit 56e2448546
4 changed files with 6 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
configure.ac
View File

@ -61,11 +61,9 @@ done
AM_PATH_PYTHON(2.4.0,, :) AM_PATH_PYTHON(2.4.0,, :)
AC_PROG_RANLIB AC_PROG_RANLIB
### we need to know the byte order for unicode conversions
AC_C_BIGENDIAN
### Check for a C++ compiler ### Check for a C++ compiler
LYX_PROG_CXX LYX_PROG_CXX
AC_LANG(C++)
### Objective-C compiler ### Objective-C compiler
AC_PROG_OBJC AC_PROG_OBJC
@ -97,6 +95,9 @@ AC_CHECK_LIB(gdi32, main)
LYX_USE_INCLUDED_BOOST LYX_USE_INCLUDED_BOOST
LYX_USE_INCLUDED_MYTHES LYX_USE_INCLUDED_MYTHES
### we need to know the byte order for unicode conversions
AC_C_BIGENDIAN
# Needed for our char_type # Needed for our char_type
AC_CHECK_SIZEOF(wchar_t) AC_CHECK_SIZEOF(wchar_t)
@ -181,7 +182,7 @@ AC_FUNC_SELECT_ARGTYPES
LYX_CHECK_SPELL_ENGINES LYX_CHECK_SPELL_ENGINES
lyx_client_subdir=true lyx_client_subdir=true
AC_LANG_PUSH(C) dnl AC_LANG_PUSH(C)
dnl LIBS already contains some X extra libs that may interfere. dnl LIBS already contains some X extra libs that may interfere.
save_LIBS="$LIBS" save_LIBS="$LIBS"
LIBS= LIBS=
@ -194,7 +195,7 @@ AC_CHECK_FUNCS(fcntl,
AC_SUBST(SOCKET_LIBS,$LIBS) AC_SUBST(SOCKET_LIBS,$LIBS)
LIBS="$save_LIBS" LIBS="$save_LIBS"
AM_CONDITIONAL(BUILD_CLIENT_SUBDIR, $lyx_client_subdir) AM_CONDITIONAL(BUILD_CLIENT_SUBDIR, $lyx_client_subdir)
AC_LANG_POP(C) dnl AC_LANG_POP(C)
lyx_win_res=false; lyx_win_res=false;
case ${host} in case ${host} in

2
src/support/CMakeLists.txt
View File

@ -27,8 +27,6 @@ list(REMOVE_ITEM support_sources
${TOP_SRC_DIR}/src/support/os_unix.cpp ${TOP_SRC_DIR}/src/support/os_unix.cpp
${TOP_SRC_DIR}/src/support/os_cygwin.cpp ${TOP_SRC_DIR}/src/support/os_cygwin.cpp
${TOP_SRC_DIR}/src/support/os_os2.C ${TOP_SRC_DIR}/src/support/os_os2.C
${TOP_SRC_DIR}/src/support/atexit.c
${TOP_SRC_DIR}/src/support/strerror.c
${TOP_SRC_DIR}/src/support/gettext.cpp) ${TOP_SRC_DIR}/src/support/gettext.cpp)
if(APPLE) if(APPLE)

18
src/support/atexit.c
View File

@ -1,18 +0,0 @@
/**
* \file atexit.c
* Wrapper to implement ANSI C's atexit using SunOS's on_exit.
*
* This function is in the public domain. --Mike Stump.
*/
#include <config.h>
#ifndef NEED_on_exit
int atexit(void (*f)())
{
/* If the system doesn't provide a definition for atexit, use on_exit
if the system provides that. */
on_exit (f, 0);
return 0;
}
#endif

24
src/support/strerror.c
View File

@ -1,24 +0,0 @@
/*****************************************************
* provides strerror()
* author Stephan Witt <stephan.witt@beusen.de>
*****************************************************/
#include <config.h>
/* $Id: strerror.c,v 1.3 2000/08/04 13:12:30 lasgouttes Exp $ */
#if !defined(lint) && !defined(WITH_WARNINGS)
static char vcid[] = "$Id: strerror.c,v 1.3 2000/08/04 13:12:30 lasgouttes Exp $";
#endif /* lint */
extern int sys_nerr ;
extern char * sys_errlist [] ;
char * strerror (int errnum)
{
static char * errtext = "unknown errno" ;
if ( errnum < sys_nerr )
return sys_errlist [errnum] ;
return errtext ;
}