diff --git a/configure.in b/configure.in index 481c9ea..260e2a4 100644 --- a/configure.in +++ b/configure.in @@ -4131,6 +4131,7 @@ if test "`$GPERF --version | $EGREP ^GNU\ gperf | $AWK '{ print $3 }' | cut -d. else AC_MSG_ERROR([too old, you need at least 3.0.0]) fi +AC_SUBST(GPERF) dnl =================================================================== dnl Check for pkg-config diff --git a/set_soenv.in b/set_soenv.in index 2c56a4d..33c159f 100644 --- a/set_soenv.in +++ b/set_soenv.in @@ -1898,6 +1898,7 @@ if ( '@ENABLE_RPATH@' eq "no" ) { ToFile( "EPM", "@EPM@", "e" ); ToFile( "EPM_FLAGS", $EPM_FLAGS, "e" ); ToFile( "BUILD_EPM", "@BUILD_EPM@", "e" ); +ToFile( "GPERF", "@GPERF@", "e" ); ToFile( "PKGFORMAT", "@PKGFORMAT@", "e" ); ToFile( "SYSTEM_STDLIBS", "@SYSTEM_STDLIBS@", "e" ); ToFile( "SYSTEM_ZLIB", "@SYSTEM_ZLIB@", "e" ); diff --git a/filter/source/svg/makefile.mk b/filter/source/svg/makefile.mk index 715ed82..a7df46b 100644 --- a/filter/source/svg/makefile.mk +++ b/filter/source/svg/makefile.mk @@ -97,7 +97,7 @@ $(INCCOM)$/tokens.hxx $(MISC)$/tokens.gperf : tokens.txt gentoken.pl $(PERL) gentoken.pl tokens.txt $(INCCOM)$/tokens.hxx $(MISC)$/tokens.gperf $(INCCOM)$/tokens.cxx : $(MISC)$/tokens.gperf makefile.mk - gperf --compare-strncmp -C -m 20 $(MISC)$/tokens.gperf | $(SED) -e "s/(char\*)0/(char\*)0, 0/g" >$(INCCOM)$/tokens.cxx + $(GPERF) --compare-strncmp -C -m 20 $(MISC)$/tokens.gperf | $(SED) -e "s/(char\*)0/(char\*)0, 0/g" >$(INCCOM)$/tokens.cxx $(SLO)$/tokenmap.obj : $(INCCOM)$/tokens.cxx $(INCCOM)$/tokens.hxx diff --git a/oox/source/token/makefile.mk b/oox/source/token/makefile.mk index 7884c37..07822f6 100644 --- a/oox/source/token/makefile.mk +++ b/oox/source/token/makefile.mk @@ -66,7 +66,7 @@ $(MISC)$/do_namespaces $(do_phony) : namespaces.txt gennamespaces.pl $(PERL) gennamespaces.pl namespaces.txt $(INCCOM)$/oox$/core$/namespaces.hxx && $(TOUCH) $@ $(INCCOM)$/tokens.inc : $(MISC)$/tokens.gperf $(MISC)$/do_tokens - $(AUGMENT_LIBRARY_PATH) gperf --compare-strncmp $(MISC)$/tokens.gperf | $(SED) -e "s/(char\*)0/(char\*)0, 0/g" | $(GREP) -v "^#line" >$(INCCOM)$/tokens.inc + $(AUGMENT_LIBRARY_PATH) $(GPERF) --compare-strncmp $(MISC)$/tokens.gperf | $(SED) -e "s/(char\*)0/(char\*)0, 0/g" | $(GREP) -v "^#line" >$(INCCOM)$/tokens.inc $(SLO)$/tokenmap.obj : $(INCCOM)$/tokens.inc $(INCCOM)$/tokenwords.inc $(INCCOM)$/tokens.hxx $(INCCOM)$/oox$/core$/namespaces.hxx $(MISC)$/do_tokens $(MISC)$/do_namespaces diff --git a/writerfilter/source/ooxml/makefile.mk b/writerfilter/source/ooxml/makefile.mk index c6a40b4..e05b7d0 100644 --- a/writerfilter/source/ooxml/makefile.mk +++ b/writerfilter/source/ooxml/makefile.mk @@ -234,7 +234,7 @@ $(OOXMLNAMESPACEIDSHXX): $(OOXMLHXXOUTDIRCREATED) $(OOXMLNAMESPACEIDSXSL) \ $(GPERFFASTTOKENHXX): $(OOXMLGPERFFASTTOKENXSL) $(MODELPROCESSED) @echo "Making: " $(@:f) - $(COMMAND_ECHO)$(XSLTPROC) $(OOXMLGPERFFASTTOKENXSL) $(MODELPROCESSED) | tr -d '\r' | gperf -I -t -E -S1 -c -G -LC++ > $@ + $(COMMAND_ECHO)$(XSLTPROC) $(OOXMLGPERFFASTTOKENXSL) $(MODELPROCESSED) | tr -d '\r' | $(GPERF) -I -t -E -S1 -c -G -LC++ > $@ $(SLOFACTORIESNAMESPACES): $(OOXMLFACTORYSCXXS) $(OOXMLGENHEADERS) diff --git a/writerfilter/source/ooxml/rngtocxx b/writerfilter/source/ooxml/rngtocxx index 8b75d65..d4c902c 100755 --- a/writerfilter/source/ooxml/rngtocxx +++ b/writerfilter/source/ooxml/rngtocxx @@ -28,5 +28,5 @@ xalan -xsl tokenmapinit.xsl -in model_processed.xml > TokenMapInit.cxx xalan -xsl valuesimpl.xsl -in model_processed.xml > OOXMLvalues.cxx xalan -xsl qnametostr.xsl -in model_processed.xml > qnametostr.tmp xalan -xsl resourceids.xsl -in model_processed.xml > ../../inc/ooxml/resourceids.hxx -xalan -xsl gperfattributes.xsl -in model_processed.xml | gperf -t -E -S1 -LC++ > gperfattributes.hxx -xalan -xsl gperfelements.xsl -in model_processed.xml | gperf -t -E -S1 -LC++ > gperfelements.hxx +xalan -xsl gperfattributes.xsl -in model_processed.xml | $GPERF -t -E -S1 -LC++ > gperfattributes.hxx +xalan -xsl gperfelements.xsl -in model_processed.xml | $GPERF -t -E -S1 -LC++ > gperfelements.hxx