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

[rengelhard svn gnome org]

Author: rengelhard
Date: Mon Dec  8 21:08:21 2008
New Revision: 14784
URL: http://svn.gnome.org/viewvc/ooo-build?rev=14784&view=rev

Log:
2008-12-08  Rene Engelhard  <rene debian org>

        * patches/dev300/extensions-missing-MOZ_INC.diff: add configure.in
          piece


Modified:
   trunk/ChangeLog
   trunk/patches/dev300/extensions-missing-MOZ_INC.diff

Modified: trunk/patches/dev300/extensions-missing-MOZ_INC.diff
==============================================================================
--- trunk/patches/dev300/extensions-missing-MOZ_INC.diff	(original)
+++ trunk/patches/dev300/extensions-missing-MOZ_INC.diff	Mon Dec  8 21:08:21 2008
@@ -1,3 +1,17 @@
+Modified: cws/configuretoplevel/configure.in
+==============================================================================
+--- config_office/configure.in	Mon Dec  8 16:39:46 2008	(r265012)
++++ config_office/configure.in	Mon Dec  8 16:51:28 2008	(r265013)
+@@ -4028,7 +4028,7 @@
+ 
+     if $PKG_CONFIG --exists libxul ; then
+       PKG_CHECK_MODULES( MOZILLAXPCOM, libxul )
+-      MOZ_INC=`$PKG_CONFIG --variable=includedir libxul`
++      MOZ_INC=`$PKG_CONFIG --variable=includedir libxul`/stable
+       MOZ_LIB=`$PKG_CONFIG --variable=libdir libxul`
+       if ! test -e "$MOZ_LIB/libxul.so"; then
+          MOZ_LIB=`$PKG_CONFIG --variable=sdkdir libxul`
+
 Index: makefile.mk
 ===================================================================
 --- extensions/source/plugin/base/makefile.mk	(Revision 264632)