From: Lars Gullik Bjønnes <larsbj@gullik.org>
Date: Mon, 6 Nov 2000 22:49:06 +0000 (+0000)
Subject: make to compilation with gcc 2.96 better handle (/.../.../xxx.sty) in dependency... 
X-Git-Tag: 1.6.10~21835
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=f29feefd7970d406ac0c714edf0cdcabe33b3494;p=lyx.git

make to compilation with gcc 2.96 better handle (/.../.../xxx.sty) in dependency checking


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@1201 a592a061-630c-0410-9148-cb99ea01b6c8
---

diff --git a/ChangeLog b/ChangeLog
index ba2bae0ad6..dff67d472d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2000-11-07  Lars Gullik Bjønnes  <larsbj@lyx.org>
+
+	* src/LaTeX.C (deplog): change reg1 to handle (/.../.../fil.sty)
+
+	* config/lyxinclude.m4 (LYX_PROG_CXX): remove -fno-rtti when
+	compiling with gcc-2.96
+
 2000-11-06  Jean-Marc Lasgouttes  <Jean-Marc.Lasgouttes@inria.fr>
 
 	* src/support/lyxstring.C: add a couple "using" directives.
diff --git a/config/lyxinclude.m4 b/config/lyxinclude.m4
index b6114f13d2..e5522afec8 100644
--- a/config/lyxinclude.m4
+++ b/config/lyxinclude.m4
@@ -186,7 +186,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 -fno-builtin -ffunction-sectons -fdata-sections";;
       *2.91.*) CXXFLAGS="-g $lyx_opt -fno-rtti -fno-exceptions";;
       *)       CXXFLAGS="-g $lyx_opt -fno-rtti -fno-exceptions";;
diff --git a/po/POTFILES.in b/po/POTFILES.in
index cfcf301617..d18943019e 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -47,35 +47,35 @@ src/frontends/kde/refdlg.C
 src/frontends/kde/tocdlg.C
 src/frontends/kde/urldlg.C
 src/frontends/xforms/FormBase.h
-src/frontends/xforms/FormCitation.C
 src/frontends/xforms/form_citation.C
-src/frontends/xforms/FormCopyright.C
+src/frontends/xforms/FormCitation.C
 src/frontends/xforms/form_copyright.C
-src/frontends/xforms/FormDocument.C
+src/frontends/xforms/FormCopyright.C
 src/frontends/xforms/form_document.C
-src/frontends/xforms/FormError.C
+src/frontends/xforms/FormDocument.C
 src/frontends/xforms/form_error.C
-src/frontends/xforms/FormGraphics.C
+src/frontends/xforms/FormError.C
 src/frontends/xforms/form_graphics.C
-src/frontends/xforms/FormIndex.C
+src/frontends/xforms/FormGraphics.C
 src/frontends/xforms/form_index.C
+src/frontends/xforms/FormIndex.C
 src/frontends/xforms/FormInset.h
-src/frontends/xforms/FormParagraph.C
 src/frontends/xforms/form_paragraph.C
-src/frontends/xforms/FormPreferences.C
+src/frontends/xforms/FormParagraph.C
 src/frontends/xforms/form_preferences.C
-src/frontends/xforms/FormPrint.C
+src/frontends/xforms/FormPreferences.C
 src/frontends/xforms/form_print.C
-src/frontends/xforms/FormRef.C
+src/frontends/xforms/FormPrint.C
 src/frontends/xforms/form_ref.C
-src/frontends/xforms/FormTabular.C
+src/frontends/xforms/FormRef.C
 src/frontends/xforms/form_tabular.C
-src/frontends/xforms/FormTabularCreate.C
+src/frontends/xforms/FormTabular.C
 src/frontends/xforms/form_tabular_create.C
-src/frontends/xforms/FormToc.C
+src/frontends/xforms/FormTabularCreate.C
 src/frontends/xforms/form_toc.C
-src/frontends/xforms/FormUrl.C
+src/frontends/xforms/FormToc.C
 src/frontends/xforms/form_url.C
+src/frontends/xforms/FormUrl.C
 src/frontends/xforms/Menubar_pimpl.C
 src/gettext.h
 src/importer.C
diff --git a/src/LaTeX.C b/src/LaTeX.C
index fc3b40343f..0db816277c 100644
--- a/src/LaTeX.C
+++ b/src/LaTeX.C
@@ -593,7 +593,7 @@ void LaTeX::deplog(DepTable & head)
 
 	string logfile = OnlyFilename(ChangeExtension(file, ".log"));
 
-	LRegex reg1(")* *\\(([^ ]+).*");
+	LRegex reg1(")* *\\(([^ \\)]+).*");
 	LRegex reg2("File: ([^ ]+).*");
 	LRegex reg3("No file ([^ ]+)\\..*");
 	LRegex reg4("\\\\openout[0-9]+.*=.*`([^ ]+)'\\..*");