[ooo-build-commit] .: Branch 'ooo-build-3-2-1' - patches/dev300

[René Engelhard]

 patches/dev300/apply                        |    2 
 patches/dev300/configure-test-operator.diff |   98 ++++++++++++++++++++++++++++
 2 files changed, 100 insertions(+)

New commits:
commit 436fbede7e130ef0924fc0be58cdd4a4843f5c2a
Author: Rene Engelhard <rene at debian.org>
Date:   Fri May 28 00:56:04 2010 +0200

    fix bashisms in upstream configure (== vs. =)
    
    * patches/dev300/apply:
    * patches/dev300/configure-test-operator.diff:

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 6e89104..e660606 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -3508,6 +3508,8 @@ sd-ppt-fix-document-summary-reading.diff, n#546758, rodo
 # fixes crasher in xml parser
 unoxml-fix-empty-xmlns.diff, rodo
 configure-fix-lpsolve-depends.diff, janneke
+# fix bashisms in configure.in (== vs. =)
+configure-test-operator.diff, i#107645, rengelha
 build-fix-xulrunner-npapi-inc.diff, janneke
 toolkit-proper-erase-fix.diff, i#106575, thorsten
 
diff --git a/patches/dev300/configure-test-operator.diff b/patches/dev300/configure-test-operator.diff
new file mode 100644
index 0000000..e505e5a
--- /dev/null
+++ b/patches/dev300/configure-test-operator.diff
@@ -0,0 +1,98 @@
+diff --git a/configure.in b/configure.in
+--- configure.in
++++ configure.in
+@@ -3049,7 +3049,7 @@
+ 
+ if test "$SOLAR_JAVA" != ""; then
+     dnl first check if we have been asked to autodetect JAVA_HOME with a recent gij
+-    if test "$JDK" == "gcj" -a -z "$JAVA_HOME"; then
++    if test "$JDK" = "gcj" -a -z "$JAVA_HOME"; then
+       if test "x$with_jdk_home" = "x" -a "$_gij_longver" -ge "50000"; then
+         cat > findhome.java <<_ACEOF
+ [import java.io.File;
+@@ -3137,7 +3137,7 @@
+          echo "JAVA_HOME was not explicitly informed with --with-jdk-home. the configure script" >> warn
+          echo "attempted to find JAVA_HOME automatically, but apparently it failed" >> warn
+          echo "in case JAVA_HOME is incorrectly set, some projects with not be built correctly" >> warn
+-#         if test "$JDK" == "gcj"; then
++#         if test "$JDK" = "gcj"; then
+ #             echo "e.g. install java-1.4.2-gcj-compat-devel and use --with-jdk-home=/usr/lib/jvm/java-1.4.2-gcj" >> warn
+ #         fi
+       fi
+@@ -3731,7 +3731,7 @@
+ if test -n "$with_system_libxslt" -o -n "$with_system_libs" && \
+    test "$with_system_libxslt" != "no"; then
+     if test -z "$with_system_libxml" -a -z "$with_system_libs" || \
+-      test "$with_system_libxml" == "no"; then
++      test "$with_system_libxml" = "no"; then
+       # somehow AC_MSG_WARN won't work...
+        echo "to prevent incompatibilities between internal libxml2 and libxslt, the office will be build with system-libxml"
+        echo "to prevent incompatibilities between internal libxml2 and libxslt, the office will be build with system-libxml" >> warn
+@@ -3741,7 +3741,7 @@
+ if test -n "$with_system_libxml" -o -n "$with_system_libs" && \
+    test "$with_system_libxml" != "no"; then
+     if test -z "$with_system_libxslt" -a -z "$with_system_libs" || \
+-      test "$with_system_libxslt" == "no"; then
++      test "$with_system_libxslt" = "no"; then
+       # somehow AC_MSG_WARN won't work...
+        echo "to prevent incompatibilities between internal libxslt and libxml2, the office will be build with system-libxslt"
+        echo "to prevent incompatibilities between internal libxslt and libxml2, the office will be build with system-libxslt" >> warn
+@@ -4443,7 +4443,7 @@
+ 
+     #e.g. http://fedoraproject.org/wiki/Releases/FeatureXULRunnerAPIChanges
+     #the plugin pkg-config etc. reverts to "mozilla-plugin" with libxul
+-    if test "$MOZ_FLAVOUR" == "libxul"; then
++    if test "$MOZ_FLAVOUR" = "libxul"; then
+         MOZ_FLAVOUR="mozilla"
+     fi
+ 
+@@ -4696,7 +4696,7 @@
+ dnl ===================================================================
+ 
+ AC_MSG_CHECKING([whether to enable graphite support])
+-if test "$_os" = "WINNT" -o "$_os" = "Linux" && test "z$enable_graphite" == "z" -o "$enable_graphite" != "no" ; then
++if test "$_os" = "WINNT" -o "$_os" = "Linux" && test "z$enable_graphite" = "z" -o "$enable_graphite" != "no" ; then
+     AC_MSG_RESULT([yes])
+     ENABLE_GRAPHITE="TRUE"
+     AC_MSG_CHECKING([which graphite to use])
+@@ -5851,7 +5851,7 @@
+ fi
+ AC_SUBST(ENABLE_MEDIAWIKI)
+ 
+-if test "$ENABLE_MEDIAWIKI" == "YES"; then
++if test "$ENABLE_MEDIAWIKI" = "YES"; then
+   AC_MSG_CHECKING([which Servlet API Jar to use])
+   if test -n "$with_system_servlet_api"; then
+     AC_MSG_RESULT([external])
+@@ -5881,7 +5881,7 @@
+     AC_MSG_ERROR([not existing. get it (did you get the -extensions tarball?)])
+   fi
+   AC_MSG_CHECKING([which jfreereport libs to use])
+-  if test "$with_system_jfreereport" == "yes"; then
++  if test "$with_system_jfreereport" = "yes"; then
+    	SYSTEM_JFREEREPORT=YES
+   	   AC_MSG_RESULT([external])
+       if test -z $SAC_JAR; then
+@@ -6251,7 +6251,7 @@
+    kde_incdirs="/usr/include $x_includes"
+    kde_libdirs="/usr/lib $x_libraries"
+    
+-   if test "$build_cpu" == "x86_64" ; then
++   if test "$build_cpu" = "x86_64" ; then
+       qt_libdirs="$qt_libdirs /usr/lib64/qt4 /usr/lib64/qt /usr/lib64"
+       kde_libdirs="$kde_libdirs /usr/lib64 /usr/lib64/kde4"
+    fi
+@@ -6809,11 +6809,11 @@
+ # ===================================================================
+ AC_MSG_CHECKING([build verbosity])
+ if test -n "$enable_verbose"; then
+-   if test "$enable_verbose" == "yes"; then
++   if test "$enable_verbose" = "yes"; then
+       VERBOSE="TRUE"
+       AC_MSG_RESULT([high])
+    fi
+-   if test "$enable_verbose" == "no"; then
++   if test "$enable_verbose" = "no"; then
+       VERBOSE="FALSE"
+       AC_MSG_RESULT([low])
+    fi