From 532082c2c80a1cca6dd347e6a76b4797da34673d Mon Sep 17 00:00:00 2001 From: Jean-Marc Lasgouttes Date: Fri, 26 Jul 2002 12:17:20 +0000 Subject: [PATCH] fix rpm spec file for gcc 3.[23] git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH-1_2_X@4795 a592a061-630c-0410-9148-cb99ea01b6c8 --- development/ChangeLog | 5 +++++ development/lyx.spec.in | 4 +++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/development/ChangeLog b/development/ChangeLog index 2e599a5292..9544acf3ba 100644 --- a/development/ChangeLog +++ b/development/ChangeLog @@ -1,3 +1,8 @@ +2002-07-26 Kuba Ober + + * lyx.spec.in: when compiling with gcc 3.[12], do not use + --with-included-string. + 2002-07-09 Claus Hentschel * Win32/lyxwin32.c: update to accept arguments diff --git a/development/lyx.spec.in b/development/lyx.spec.in index 194d45d84a..fd7dcc5106 100644 --- a/development/lyx.spec.in +++ b/development/lyx.spec.in @@ -35,10 +35,12 @@ and let the computer take care of the rest. %build unset LINGUAS || true +ISTRING=--with-included-string +if gcc -v 2>&1 | grep -e "version 3.\(1\|2\)"; then ISTRING=; fi CXXFLAGS="$RPM_OPT_FLAGS" CFLAGS="$RPM_OPT_FLAGS" \ ./configure --prefix=%{_prefix} --mandir=%{_mandir} \ --bindir=%{_bindir} --datadir=%{_datadir} \ - --without-warnings --with-included-string + --without-warnings $ISTRING make %install