ooo-build r11428 - in branches/ooo-build-2-3: . patches/src680

[rengelhard svn gnome org]

Author: rengelhard
Date: Mon Jan 28 10:30:09 2008
New Revision: 11428
URL: http://svn.gnome.org/viewvc/ooo-build?rev=11428&view=rev

Log:
2008-01-28 Rene Engelhard  <reneÅdebian.org>

        * patches/src680/apply,
          patches/src680/buildfix-jawt-check-C.diff: force check to use C


Added:
   branches/ooo-build-2-3/patches/src680/buildfix-jawt-check-C.diff
Modified:
   branches/ooo-build-2-3/ChangeLog
   branches/ooo-build-2-3/patches/src680/apply

Modified: branches/ooo-build-2-3/patches/src680/apply
==============================================================================
--- branches/ooo-build-2-3/patches/src680/apply	(original)
+++ branches/ooo-build-2-3/patches/src680/apply	Mon Jan 28 10:30:09 2008
@@ -883,6 +883,8 @@
 
 reportdesign-stlportism.diff, i80721
 
+buildfix-jawt-check-C.diff
+
 [ BuildBits >= oog680-m8 ]
 # allow to define java target, so the build is usable with the JVM 1.4
 # even when it is built with JDK 1.5

Added: branches/ooo-build-2-3/patches/src680/buildfix-jawt-check-C.diff
==============================================================================
--- (empty file)
+++ branches/ooo-build-2-3/patches/src680/buildfix-jawt-check-C.diff	Mon Jan 28 10:30:09 2008
@@ -0,0 +1,18 @@
+--- config_office/configure.in-old	2008-01-28 10:21:21.000000000 +0000
++++ config_office/configure.in	2008-01-28 10:22:05.000000000 +0000
+@@ -2734,6 +2734,7 @@
+ 
+ AWTLIB=
+ if test "$SOLAR_JAVA" != ""; then
++   AC_LANG_PUSH([C])
+    AC_MSG_CHECKING([for jawt lib name])
+    if test "$JDK" = "gcj"; then 
+       save_CFLAGS=$CFLAGS
+@@ -2774,6 +2775,7 @@
+    if test -z "$AWTLIB"; then
+       AWTLIB=-ljawt
+    fi
++   AC_LANG_POP([C])
+    AC_MSG_RESULT([$AWTLIB])
+    AC_SUBST(AWTLIB)
+ fi