svn commit: r1179044 [3/3] - in /incubator/ooo/trunk/main: configure configure.in oox/source/token/makefile.mk set_soenv.in

[pf...@apache.org]

Modified: incubator/ooo/trunk/main/configure.in
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/configure.in?rev=1179044&r1=1179043&r2=1179044&view=diff
==============================================================================
--- incubator/ooo/trunk/main/configure.in (original)
+++ incubator/ooo/trunk/main/configure.in Wed Oct  5 03:08:15 2011
@@ -25,6 +25,9 @@ AC_ARG_WITH(agg,
 AC_ARG_WITH(gnu-cp,
 [  --with-gnu-cp           Specify location of GNU cp on Solaris or FreeBSD
 ],,)
+AC_ARG_WITH(gperf,
+[  --with-gperf           Specify location of gperf on Solaris or FreeBSD
+],,)
 AC_ARG_ENABLE(graphite,
 [  --enable-graphite       Enables the compilation of Graphite smart font rendering
 ],,)
@@ -3487,15 +3490,26 @@ dnl ====================================
 dnl Check for gperf
 dnl ===================================================================
 AC_PATH_PROG(GPERF, gperf)
-if test -z "$GPERF"; then
-	AC_MSG_ERROR([gperf not found but needed. Install it.])
+if test -z "$with_gperf"; then
+    AC_PATH_PROG(GPERF, gperf)
+    if test -z "$GPERF"; then
+       AC_MSG_ERROR([gperf not found but needed. Install it and/or specify --with-gperf=/path/to/it.])
+    fi
+else
+  if test -x "$with_gperf"; then
+    GPERF=$with_gperf
+  else
+    AC_MSG_ERROR([--with-gperf did not point to an executable])
+  fi
 fi
 AC_MSG_CHECKING([gperf version])
 if test "`$GPERF --version | $EGREP ^GNU\ gperf | $AWK '{ print $3 }' | cut -d. -f1`" -ge "3"; then
 	AC_MSG_RESULT([OK])
+   GPERF=$GPERF
 else
 	AC_MSG_ERROR([too old, you need at least 3.0.0])
 fi
+AC_SUBST(GPERF)
 
 dnl ===================================================================
 dnl Check for building stax

Modified: incubator/ooo/trunk/main/oox/source/token/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/oox/source/token/makefile.mk?rev=1179044&r1=1179043&r2=1179044&view=diff
==============================================================================
--- incubator/ooo/trunk/main/oox/source/token/makefile.mk (original)
+++ incubator/ooo/trunk/main/oox/source/token/makefile.mk Wed Oct  5 03:08:15 2011
@@ -47,6 +47,9 @@ SLOFILES = \
 # --- Targets -------------------------------------------------------
 
 .INCLUDE :  target.mk
+.IF "$(GPERF)" == "" || !DEFINED $(GPERF)
+GPERF=gperf
+.ENDIF
 
 GENHEADERPATH = $(INCCOM)$/oox$/token
 
@@ -56,7 +59,7 @@ $(MISC)$/tokenhash.gperf $(INCCOM)$/toke
 $(SLO)$/tokenmap.obj : $(INCCOM)$/tokenhash.inc $(INCCOM)$/tokennames.inc $(GENHEADERPATH)$/tokens.hxx $(MISC)$/do_tokens
 
 $(INCCOM)$/tokenhash.inc : $(MISC)$/tokenhash.gperf $(MISC)$/do_tokens
-	$(AUGMENT_LIBRARY_PATH) gperf --compare-strncmp $(MISC)$/tokenhash.gperf | $(SED) -e "s/(char\*)0/(char\*)0, 0/g" | $(GREP) -v "^#line" >$(INCCOM)$/tokenhash.inc
+	$(AUGMENT_LIBRARY_PATH) $(GPERF) --compare-strncmp $(MISC)$/tokenhash.gperf | $(SED) -e "s/(char\*)0/(char\*)0, 0/g" | $(GREP) -v "^#line" >$(INCCOM)$/tokenhash.inc
 
 $(MISC)$/do_tokens $(do_phony) : tokens.txt tokens.pl tokens.hxx.head tokens.hxx.tail $(GENHEADERPATH)$/tokens.hxx $(INCCOM)$/tokennames.inc $(MISC)$/tokenhash.gperf
     @@-$(RM) $@

Modified: incubator/ooo/trunk/main/set_soenv.in
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/set_soenv.in?rev=1179044&r1=1179043&r2=1179044&view=diff
==============================================================================
--- incubator/ooo/trunk/main/set_soenv.in (original)
+++ incubator/ooo/trunk/main/set_soenv.in Wed Oct  5 03:08:15 2011
@@ -2072,12 +2072,13 @@ if ( $platform =~ m/cygwin/ ) {
     ToFile( "", $empty, "n");
 }
 
-# on Solaris, MacOSX and FreeBSD, set GNUCOPY and GNUPATCH
+# on Solaris, MacOSX and FreeBSD, set GNUCOPY, GNUPATCH and GPERF
 if ($platform =~ m/solaris|darwin|freebsd/)
 {
+  ToFile( "GNUCOPY",	"@GNUCP@",	"e");
   ToFile( "GNUPATCH",   "@GNUPATCH@",	"e");
+  ToFile( "GPERF", "@GPERF@",	"e");
 }
-ToFile( "GNUCOPY",	"@GNUCP@",	"e");
 # OS/2 define .pl as executable for 4os2
 # use - as switch char for dmake (os2/switchar.c)
 if ($platform =~ m/os2/)