diff --git a/ChangeLog b/ChangeLog index 7c73852d8a..34d4429e6c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,15 @@ 1999-12-14 Jean-Marc Lasgouttes + * src/broken_const.h, config/hack-gcc, config/README: removed + + * configure.in: remove --with-gcc-hack option; do not call + LYX_CXX_STL_STACK + + * INSTALL: remove documentation of --with-broken-const and + --with-gcc-hack + + * acconfig.h: remove all trace of BROKEN_CONST define + * src/buffer.C (makeDocBookFile): update version number in output file. (SimpleDocBookOnePar): fix an assert when trying to a character diff --git a/INSTALL b/INSTALL index 36e5ae3ef6..996e0c9483 100644 --- a/INSTALL +++ b/INSTALL @@ -194,13 +194,6 @@ desperate cases: latex. This detection is automatically disabled if latex cannot be found. If you find that you have to use this flag, please report it as a bug. - o --with-broken-const attempts to fix a bug in gcc 2.7.[012] (see the - section 'Problems'). - - o ---with-gcc-hack which provide a wrapper around gcc that tries to - compile without optimization after a compilation failed (see the - section 'Problems'). - o --without-liberty suppresses the detection of the -liberty library (see the section 'Problems'). @@ -332,9 +325,7 @@ notify us. more comments) and in lyxrc.C under Linux/Alpha or DEC OSF/1. In both cases, the solution is to recompile the offending file without optimization and resume the compilation process with - 'make'. To make things simpler, you can use the option - --with-gcc-hack of configure that will do that for you - automatically. + 'make'. o According to David Sundqvist , some changes are needed to compile with aCC on HP-UX 10.20. These are the @@ -347,40 +338,10 @@ notify us. LIBS = -lforms -lXpm -lSM -lICE -lc -lm -lX11 -lCsup # must link with Csup LDFLAGS = -L/opt/aCC/lib # perhaps not needed. - o There is a bug in gcc 2.7.[012] in the handling of const which can - cause various unpredictable problems. If you experience weird - crashes with a LyX compiled by gcc 2.7.[012], try to configure - with the --with-broken-const flag and recompile. If this improves - things, please report it to the mailing list. Note that this - compiler bug is fixed in gcc 2.7.2.1 and in several Linux - distributions of gcc 2.7.[012]. - - This bug is currently not autodetected, but any code to do so - would be welcome. A patch for gcc 2.7.2 is as follows: - -*** clean-ss-951203/expr.c Sun Nov 26 08:18:07 1995 ---- ss-951203/expr.c Mon Dec 4 11:41:18 1995 -*************** expand_expr (exp, target, tmode, modifie -*** 4582,4587 **** - through a pointer to const does not mean that the value there can - never change. Languages where it can never change should - also set TREE_STATIC. */ -! RTX_UNCHANGING_P (temp) = TREE_READONLY (exp) | TREE_STATIC (exp); - return temp; - } ---- 4582,4588 ---- - through a pointer to const does not mean that the value there can - never change. Languages where it can never change should - also set TREE_STATIC. */ -! RTX_UNCHANGING_P (temp) = TREE_READONLY (exp) & TREE_STATIC (exp); - return temp; - } - o On Digital Unix with gcc, you can get warnings like warning, LyXFamilyNames not found in original or external symbol tables, value defaults to 0 -warning, LyXSeriesNames not found in original or external symbol tables, value de These concern symbols beginning with an uppercase letter and seems to be harmless. Similarly, the compilation can end with the diff --git a/acconfig.h b/acconfig.h index 3e53433af6..9a99119de2 100644 --- a/acconfig.h +++ b/acconfig.h @@ -17,9 +17,6 @@ @TOP@ -/* Define to work around a bug with const handling in gcc 2.7.[012] */ -#undef BROKEN_CONST - /* Define on SunOS 4 and SCO, were some functions are missing from the headers */ #undef BROKEN_HEADERS @@ -108,28 +105,6 @@ extern "C" char * strerror(int n); #endif -/* -#ifndef HAVE_bool -#define bool int -#define true 1 -#define false 0 -#endif -*/ - -/* -#if SIZEOF_VOID_P == SIZEOF_INT -# define PTR_AS_INT(p) int(p) -#else -# define PTR_AS_INT(p) long(p) -#endif -*/ - -/* do we need this anymore?*/ -#ifdef BROKEN_CONST -#include -#include "broken_const.h" -#endif - #ifdef BROKEN_HEADERS #include "broken_headers.h" #endif diff --git a/config/README b/config/README deleted file mode 100644 index 797b6d654f..0000000000 --- a/config/README +++ /dev/null @@ -1,32 +0,0 @@ -README for LyX configure stuff -Author: Jean-Marc Lasgouttes (Jean-Marc.Lasgouttes@inria.fr) ------------------------------------------------------------------------ - -This directory contains the things used to build the configure -scripts. The file present here are the following: - -makefile a simple makefile to build configure script -acconfig.h template file describing src/config.h.in -aclocal.m4 local macros for configure.in -configure.in the template from which configure is built -lib_configure.m4 the template from which lib/configure is built -install-sh shell script used when no good install program - is found -mkinstalldirs shell script used to create installation dirs. -stamp-h.in file used by Makefile to check dependencies -hack-gcc a shell script to work around possible gcc bugs - -How to use the makefile ------------------------ - -When you make a modification to some configure component, just type -'make', with the config/ directory being current. This will create -configure, lib/configure and config.h.in. Do *not* try to run directly -autoconf or autoheader. Note that these scripts require autoconf 2.12 -or later. - -There is also a target 'clean' which delete backup files, etc. - -Note: please do not rename `makefile' to `Makefile'! This name was -chosen in order avoid being excluded from LyX patches... - diff --git a/config/hack-gcc b/config/hack-gcc deleted file mode 100755 index 26b23291fa..0000000000 --- a/config/hack-gcc +++ /dev/null @@ -1,21 +0,0 @@ -#!/bin/sh -# This is hack-gcc, an ugly hack to force gcc to recompile without -# optimization when an error occurs. It is meant as wrapper around gcc -# that works around compiler bugs when optimization is on . Do what -# you want with this code. - -# Author Jean-Marc Lasgouttes (Jean-Marc.Lasgouttes@inria.fr) - -ARGS=`echo "$*" | sed -e 's/\"/\\\"/g` - -if test "x$ARGS" = x ; then - echo "usage: $0 [gcc name] [normal gcc options]" - exit 0 -fi - -if eval "$ARGS" ; then - exit 0 -else - echo "$0: an error occurred, retrying without optimization." >&2 - eval `echo $ARGS | sed -e 's/-O[0-9]*//'` -fi diff --git a/configure.in b/configure.in index ee1b2ef808..96cc087288 100644 --- a/configure.in +++ b/configure.in @@ -65,7 +65,9 @@ AM_PROG_LIBTOOL LYX_CXX_MUTABLE LYX_CXX_PARTIAL LYX_CXX_EXPLICIT -LYX_CXX_STL_STACK +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_NAMESPACES LYX_CXX_CHEADERS @@ -80,16 +82,6 @@ dnl -lc and -lm as args to the compiler AC_CHECK_LIB(m, sin) AC_CHECK_LIB(c, fopen) -# A hack to work around gcc compiler errors -AC_ARG_WITH(gcc-hack,[ --with-gcc-hack add a wrapper around gcc]) -if test "x$with_gcc_hack" = xyes ; then - CXX_COMMAND='${top_srcdir}/config/hack-gcc ${CXX}' - lyx_flags="$lyx_flags gcc-hack" -else - CXX_COMMAND='${CXX}' -fi -AC_SUBST(CXX_COMMAND) - ### Add extra directories to check for libraries. LYX_WITH_DIR([extra-lib],[extra library directory],extra_lib, NONE) LYX_LOOP_DIR($lyx_cv_extra_lib,LYX_ADD_LIB_DIR(lyx_ldflags,$dir)) diff --git a/src/broken_const.h b/src/broken_const.h deleted file mode 100644 index 742e42accc..0000000000 --- a/src/broken_const.h +++ /dev/null @@ -1,20 +0,0 @@ -/* -*- C++ -*- */ -/* This file is part of -* ====================================================== -* -* LyX, the High Level Word Processor -* -* Copyright (C) 1995, 1996 Matthias Ettrich -* -* ====================================================== - broken_const.h -- inhibits the `const' keyword for compilation */ - -#ifdef const -#undef const -#endif /* const */ -#define const -#ifdef __CONSTVALUE2 -#undef __CONSTVALUE2 -#define __CONSTVALUE2 /* We don't want empty __attribute__ (()). */ -#endif /* __CONSTVALUE2 */ -