Attachment #75640 for issue #112240

View | Details | Raw Unified | Return to issue 112240
Collapse All | Expand All

Lines 5314-5331 if test -n "$with_system_icu" -o -n "$with_system_libs" && \ Link Here

(-)a/configure.in (-10 / +16 lines)
5314	if test -z "$SYSTEM_GENCMN"; then	5314	if test -z "$SYSTEM_GENCMN"; then
5315	AC_MSG_ERROR([\"gencmn\" not found in \$PATH, install the icu development tool \"gencmn"\])	5315	AC_MSG_ERROR([\"gencmn\" not found in \$PATH, install the icu development tool \"gencmn"\])
5316	fi	5316	fi
		5317
		5318	AC_PATH_PROG( ICUCONFIG, icu-config)
5317	AC_MSG_CHECKING([ICU version])	5319	AC_MSG_CHECKING([ICU version])
5318	AC_TRY_RUN([	5320	ICU_VERSION=`$ICUCONFIG --version`
5319	#include <unicode/uversion.h>	5321	ICU_MAJOR=`$ICUCONFIG --version \| cut -d"." -f1`
		5322	ICU_MINOR=`$ICUCONFIG --version \| cut -d"." -f2`
		5323	ICU_MICRO=`$ICUCONFIG --version \| cut -d"." -f3`
5320		5324
5321	int main(int argc, char **argv) {	5325	if test "$ICU_MAJOR" -ge "4"; then
5322	if(U_ICU_VERSION_MAJOR_NUM < 4)	5326	AC_MSG_RESULT([OK])
5323	return 1;	5327	else
5324	else	5328	AC_MSG_ERROR([not suitable, only >= 4.0 supported currently])
5325	return 0;	5329	fi
5326	}	5330
5327	], [AC_MSG_RESULT(OK)], [AC_MSG_ERROR([not suitable, only >= 4.0 supported currently])])	5331	AC_LANG_POP([C++])
5328	AC_LANG_POP([C++])
5329	else	5332	else
5330	AC_MSG_RESULT([internal])	5333	AC_MSG_RESULT([internal])
5331	SYSTEM_ICU=NO	5334	SYSTEM_ICU=NO
Lines 5335-5340 AC_SUBST(SYSTEM_ICU) Link Here
5335	AC_SUBST(SYSTEM_GENBRK)	5338	AC_SUBST(SYSTEM_GENBRK)
5336	AC_SUBST(SYSTEM_GENCCODE)	5339	AC_SUBST(SYSTEM_GENCCODE)
5337	AC_SUBST(SYSTEM_GENCMN)	5340	AC_SUBST(SYSTEM_GENCMN)
		5341	AC_SUBST(ICU_MAJOR)
		5342	AC_SUBST(ICU_MINOR)
		5343	AC_SUBST(ICU_MICRO)
5338		5344
5339	dnl ===================================================================	5345	dnl ===================================================================
5340	dnl Graphite	5346	dnl Graphite

Lines 1906-1911 if ($SYSTEM_PYTHON eq "NO") { Link Here

(-)a/set_soenv.in (+3 lines)
1906	ToFile( "HOME", "@HOME@", "e" );	1906	ToFile( "HOME", "@HOME@", "e" );
1907	}	1907	}
1908	ToFile( "SYSTEM_ICU", "@SYSTEM_ICU@", "e" );	1908	ToFile( "SYSTEM_ICU", "@SYSTEM_ICU@", "e" );
		1909	ToFile( "ICU_MAJOR", "@ICU_MAJOR@", "e" );
		1910	ToFile( "ICU_MINOR", "@ICU_MINOR@", "e" );
		1911	ToFile( "ICU_MICRO", "@ICU_MICRO@", "e" );
1909	ToFile( "SYSTEM_GENBRK", "@SYSTEM_GENBRK@", "e" );	1912	ToFile( "SYSTEM_GENBRK", "@SYSTEM_GENBRK@", "e" );
1910	ToFile( "SYSTEM_GENCCODE", "@SYSTEM_GENCCODE@", "e" );	1913	ToFile( "SYSTEM_GENCCODE", "@SYSTEM_GENCCODE@", "e" );
1911	ToFile( "SYSTEM_GENCMN", "@SYSTEM_GENCMN@", "e" );	1914	ToFile( "SYSTEM_GENCMN", "@SYSTEM_GENCMN@", "e" );

Lines 25-33 Link Here

(-)a/icu/icuversion.mk (-3 / +3 lines)
25	#	25	#
26	#*************************************************************************	26	#*************************************************************************
27	# major	27	# major
28	ICU_MAJOR=4	28	ICU_MAJOR*=4
29	# minor	29	# minor
30	ICU_MINOR=0	30	ICU_MINOR*=0
31	# micro	31	# micro
32	ICU_MICRO=1	32	ICU_MICRO*=1
33		33




GENCCODE:=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)$/genccode
.ENDIF

.INCLUDE .IGNORE :  icuversion.mk

$(MISC)$/%.txt : data/%.txt
# fdo#31271 ")" reclassified in more recent ICU/Unicode Standards
.IF "$(ICU_MAJOR)" >= "5" || ("$(ICU_MAJOR)" == "4" && "$(ICU_MINOR)" >= "4")
    $(SED) "s#\[:LineBreak =  Close_Punctuation:\]#\[\[:LineBreak =  Close_Punctuation:\] \[:LineBreak = Close_Parenthesis:\]\]#" $< > $@
.ELSE
    $(COPY) $< $@
.ENDIF

$(MISC)$/%.brk : $(MISC)/%.txt
    $(WRAPCMD) $(GENBRK) -r $< -o $(MISC)$/$*.brk

$(MISC)$/%_brk.c : $(MISC)$/%.brk

Return to issue 112240

Lines 79-85 GENBRK:=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)$/genbrk Link Here

(-)a/i18npool/source/breakiterator/makefile.mk (-1 / +11 lines)
79	GENCCODE:=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)$/genccode	79	GENCCODE:=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)$/genccode
80	.ENDIF	80	.ENDIF
81		81
82	$(MISC)$/%.brk : data/%.txt	82	.INCLUDE .IGNORE : icuversion.mk
		83
		84	$(MISC)$/%.txt : data/%.txt
		85	# fdo#31271 ")" reclassified in more recent ICU/Unicode Standards
		86	.IF "$(ICU_MAJOR)" >= "5" \|\| ("$(ICU_MAJOR)" == "4" && "$(ICU_MINOR)" >= "4")
		87	$(SED) "s#\[:LineBreak = Close_Punctuation:\]#\[\[:LineBreak = Close_Punctuation:\] \[:LineBreak = Close_Parenthesis:\]\]#" $< > $@
		88	.ELSE
		89	$(COPY) $< $@
		90	.ENDIF
		91
		92	$(MISC)$/%.brk : $(MISC)/%.txt
83	$(WRAPCMD) $(GENBRK) -r $< -o $(MISC)$/$*.brk	93	$(WRAPCMD) $(GENBRK) -r $< -o $(MISC)$/$*.brk
84		94
85	$(MISC)$/%_brk.c : $(MISC)$/%.brk	95	$(MISC)$/%_brk.c : $(MISC)$/%.brk