From 13428ca1944c9afe9af258d788c1e815e42302b8 Mon Sep 17 00:00:00 2001
From: Jean-Marc Lasgouttes <lasgouttes@lyx.org>
Date: Tue, 7 Nov 2000 12:12:31 +0000
Subject: [PATCH] Configure tweaks

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/lyx-1_1_5@1204 a592a061-630c-0410-9148-cb99ea01b6c8
---
 ChangeLog              | 7 +++++++
 acinclude.m4           | 2 +-
 config/lyxinclude.m4   | 2 +-
 lib/reLyX/acinclude.m4 | 5 -----
 4 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index ae61199070..6d1a7bfc28 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2000-11-07  Jean-Marc Lasgouttes  <Jean-Marc.Lasgouttes@inria.fr>
+
+	* lib/reLyX/acinclude.m4 (RELYX_CHECK_ERRORS): remove useless message.
+
+	* config/lyxinclude.m4 (LYX_PROG_CXX): remove -fno-rtti for gcc
+	2.96 (RedHat 7.0).
+
 2000-10-27  Dekel Tsur  <dekelts@tau.ac.il>
 
 	* src/mathed/formulamacro.h (LyxCode) Return MATHMACRO_CODE instead
diff --git a/acinclude.m4 b/acinclude.m4
index b0526effdd..8339047bdf 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -185,7 +185,7 @@ dnl Check the version of g++
     case $gxx_version in
       2.95.1)  CXXFLAGS="-g $lyx_opt -fpermissive -fno-rtti -fno-exceptions";;
       2.95.*)  CXXFLAGS="-g $lyx_opt -fno-rtti -fno-exceptions";;
-      2.96*)  CXXFLAGS="-g $lyx_opt -fno-rtti -fno-exceptions";;
+      2.96*)  CXXFLAGS="-g $lyx_opt -fno-exceptions";;
       2.97*)   CXXFLAGS="-g $lyx_opt -fhonor-std -fvtable-thunks -ffunction-sections -fdata-sections";;
       *2.91.*) CXXFLAGS="-g $lyx_opt -fno-rtti -fno-exceptions";;
       *)       CXXFLAGS="-g $lyx_opt -fno-rtti -fno-exceptions";;
diff --git a/config/lyxinclude.m4 b/config/lyxinclude.m4
index 2f4d297318..01062315d7 100644
--- a/config/lyxinclude.m4
+++ b/config/lyxinclude.m4
@@ -185,7 +185,7 @@ dnl Check the version of g++
     case $gxx_version in
       2.95.1)  CXXFLAGS="-g $lyx_opt -fpermissive -fno-rtti -fno-exceptions";;
       2.95.*)  CXXFLAGS="-g $lyx_opt -fno-rtti -fno-exceptions";;
-      2.96*)  CXXFLAGS="-g $lyx_opt -fno-rtti -fno-exceptions";;
+      2.96*)  CXXFLAGS="-g $lyx_opt -fno-exceptions";;
       2.97*)   CXXFLAGS="-g $lyx_opt -fhonor-std -fvtable-thunks -ffunction-sections -fdata-sections";;
       *2.91.*) CXXFLAGS="-g $lyx_opt -fno-rtti -fno-exceptions";;
       *)       CXXFLAGS="-g $lyx_opt -fno-rtti -fno-exceptions";;
diff --git a/lib/reLyX/acinclude.m4 b/lib/reLyX/acinclude.m4
index c694681a20..f28857ac5c 100644
--- a/lib/reLyX/acinclude.m4
+++ b/lib/reLyX/acinclude.m4
@@ -90,10 +90,5 @@ cat <<EOF
 $relyx_warning_txt
 EOF
 fi
-cat <<EOF
-Configuration of LyX was successful.  
-Type 'make' to compile the program, 
-and then 'make install' to install it.
-EOF
 fi])