ooo-build r14045 - in trunk: . patches/dev300

[szalaik svn gnome org]

Author: szalaik
Date: Tue Sep 23 13:18:56 2008
New Revision: 14045
URL: http://svn.gnome.org/viewvc/ooo-build?rev=14045&view=rev

Log:
2008-09-23  Kalman Szalai - KAMI <kamihir freemail hu>

	* patches/dev300/extensions_configure.diff
	* patches/dev300/extras_configure.diff
	* configure.in:
	Updated configure bits.



Modified:
   trunk/configure.in
   trunk/patches/dev300/extensions_configure.diff
   trunk/patches/dev300/extras_configure.diff

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Tue Sep 23 13:18:56 2008
@@ -1225,7 +1225,7 @@
 AC_SUBST(SYSTEM_LIBWPG)
 
 
-AC_MSG_CHECKING([for SUN templates intergration (only supported languages displayed)])
+AC_MSG_CHECKING([for Sun Professional Template Pack intergration (only supported languages displayed)])
 if test "z$with_sun_templates" = "z" -o "z$with_sun_templates" = "zno" ; then
     SUNTEMPLATES_LANG=""
     AC_MSG_RESULT([no integration])

Modified: trunk/patches/dev300/extensions_configure.diff
==============================================================================
--- trunk/patches/dev300/extensions_configure.diff	(original)
+++ trunk/patches/dev300/extensions_configure.diff	Tue Sep 23 13:18:56 2008
@@ -1,5 +1,32 @@
 --- config_office/configure.in.original	2008-05-30 10:58:01.000000000 +0200
 +++ config_office/configure.in	2008-05-30 11:03:00.000000000 +0200
+@@ -69,6 +69,13 @@
+                           binary for your platform, to build without this
+                           version, use this option.
+ ],,enable_mozilla="yes")
++
++AC_ARG_WITH(sun-templates,
++[
++  --with-sun-templates      Provides automatic download and integration of SUN
++			  Microsystems' template packages relesead to Extensions site.],
++,)
++
+ AC_ARG_WITH(fonts,
+ [  --without-fonts         Removes Bitstream Vera fonts from
+                            openoffice.org installation set, for people building
+@@ -810,6 +817,12 @@
+ [  --with-alloc            Define which allocator to build with
+ 			                 (choices are oo, system, tcmalloc)
+ ],,)
++AC_ARG_WITH(sun-templates,
++[
++  --with-sun-templates      Provides automatic download and integration of SUN
++			  Microsystems' template packages relesead to Extensions site.],
++,)
++
+ AC_ARG_ENABLE(verbose,
+ [  --enable-verbose        Increase build verbosity.
+   --disable-verbose       Decrease build verbosity.
 @@ -5407,6 +5407,7 @@
  else
     AC_MSG_RESULT([no])
@@ -32,3 +59,42 @@
    SYSTEM_JFREEREPORT=NO
  fi
  AC_SUBST(ENABLE_REPORTDESIGN)
+@@ -6055,6 +6068,38 @@
+ fi
+ 
+ dnl ===================================================================
++dnl Test whether to include Sun Professinal Template Pack
++dnl ===================================================================
++AC_MSG_CHECKING([for Sun Professinal Template Pack intergration (only supported languages displayed)])
++if test "z$with_sun_templates" = "z" -o "z$with_sun_templates" = "zno" ; then
++    SUNTEMPLATES_LANG=""
++    AC_MSG_RESULT([no integration])
++else
++    sun_supported_langs="en-US de it fr es"
++    if test "z$with_sun_templates" = "zyes" ; then
++	wanted_sun_templates="$sun_supported_langs"
++    else
++	# check whether the langs are supported by Sun
++	wanted_sun_templates=
++	for lang in $with_sun_templates ; do
++	    if test -n "`echo $sun_supported_langs | grep "$lang"`" ; then
++		wanted_sun_templates="$wanted_sun_templates $lang"
++	    fi
++	done
++    fi
++    SUNTEMPLATES_LANG=
++    # check whether the langs are requested at all
++    for lang in $wanted_sun_templates ; do
++	if test -n "`echo $with_lang | grep "$lang"`" ; then
++		SUNTEMPLATES_LANG="$SUNTEMPLATES_LANG $lang"
++      SCPDEFS="$SCPDEFS -DWITH_WITH_EXTENSION_SUN_TEMPLATE_PACK_$lang"
++	fi
++    done
++    AC_MSG_RESULT([$SUNTEMPLATES_LANG])
++fi
++AC_SUBST(SUNTEMPLATES_LANG)
++
++dnl ===================================================================
+ dnl Test whether to include fonts
+ dnl ===================================================================
+ AC_MSG_CHECKING([whether to include Bitstream Vera fonts])

Modified: trunk/patches/dev300/extras_configure.diff
==============================================================================
--- trunk/patches/dev300/extras_configure.diff	(original)
+++ trunk/patches/dev300/extras_configure.diff	Tue Sep 23 13:18:56 2008
@@ -1,9 +1,9 @@
 --- config_office/configure.in.org	2007-11-17 16:00:31.000000000 +0100
 +++ config_office/configure.in	2007-12-24 13:26:16.000000000 +0100
 @@ -681,6 +681,26 @@
- [  --with-alloc            Define which allocator to build with
- 			                 (choices are oo, system, tcmalloc)
- ],,)
+ 			  Microsystems' template packages relesead to Extensions site.],
+ ,)
+ 
 +AC_ARG_WITH(extra-gallery,
 +[  --with-extra-gallery    Add extra gallery content of OxygenOffice Professional.
 +],,)