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

[jannieuw svn gnome org]

Author: jannieuw
Date: Thu Jul  3 11:34:30 2008
New Revision: 13044
URL: http://svn.gnome.org/viewvc/ooo-build?rev=13044&view=rev

Log:
2008-07-03  Jan Nieuwenhuizen  <janneke gnu org>

	* patches/dev300/layout-default-enable-config_office.diff: New file.
	
	* patches/dev300/apply (NotDebian): Add it.  Layouted dialogs need
	more visibility, but we want to prevent development snapshots being
	shipped.


Added:
   trunk/patches/dev300/layout-default-enable-config_office.diff
Modified:
   trunk/ChangeLog
   trunk/patches/dev300/apply

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Thu Jul  3 11:34:30 2008
@@ -826,6 +826,8 @@
 # disabled for Debian as Debian policy (for now) is to use=both
 speed-hash-style.diff, pmladek
 
+# Enable layout'ed dialogs.  Not to be released, therefore NotDebian.
+layout-default-enable-config_office.diff, janniew
 
 [ CustomUserConfig ]
 

Added: trunk/patches/dev300/layout-default-enable-config_office.diff
==============================================================================
--- (empty file)
+++ trunk/patches/dev300/layout-default-enable-config_office.diff	Thu Jul  3 11:34:30 2008
@@ -0,0 +1,22 @@
+diff --git a/config_office/configure.in b/config_office/configure.in
+index 39f9cbe..c6bf26f 100644
+--- config_office/configure.in
++++ config_office/configure.in
+@@ -228,7 +228,7 @@ AC_ARG_ENABLE(static-gtk,
+                           (enables -Bstatic linker flag for gtk libraries)
+ ],,)
+ AC_ARG_ENABLE(layout,
+-[  --enable-layout         Enable the compilation and use of layout dialogs
++[  --disable-layout        Disable the compilation and use of layout dialogs
+ ],,)
+ AC_ARG_ENABLE(build-mozilla,
+ [  --disable-build-mozilla Use this option if you do not want to build the
+@@ -6338,7 +6338,7 @@ fi
+ AC_SUBST(ENABLE_STATIC_GTK)
+ 
+ AC_MSG_CHECKING([whether to use layout dialogs])
+-if test -n "$enable_layout" && test "$enable_layout" != "no"; then
++if test -z "$enable_layout" || test "$enable_layout" != "no"; then
+    ENABLE_LAYOUT="TRUE"
+    AC_MSG_RESULT([yes])
+ else