#i93073# Enhance --disable-qadevooo option (patch by dtardon)

2 files changed, 14 insertions, 6 deletions

diff --git a/config_office/configure b/config_office/configure
index b83d0c9c7651..3660adb10fc6 100755
--- a/config_office/configure
+++ b/config_office/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.in Revision: 1.288  .
+# From configure.in Revision: 1.290  .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.61.
 #
@@ -762,6 +762,7 @@ GPERF
 MINGWCXX
 MINGWSTRIP
 BUILD_UNOWINREG
+BUILD_QADEVOOO
 SYSTEM_STDLIBS
 SYSTEM_ZLIB
 SYSTEM_JPEG
@@ -13244,12 +13245,15 @@ echo $ECHO_N "checking whether to build qadevOOo... $ECHO_C" >&6; }
 if test "z$enable_qadevooo" = "z" -o "$enable_qadevooo" != "no"; then
    { echo "$as_me:$LINENO: result: yes" >&5
 echo "${ECHO_T}yes" >&6; }
+   BUILD_QADEVOOO="YES"
    BUILD_TYPE="$BUILD_TYPE QADEVOOO"
 else
+   BUILD_QADEVOOO="NO"
    { echo "$as_me:$LINENO: result: no" >&5
 echo "${ECHO_T}no" >&6; }
 fi
 
+
 if test -z "$with_system_stdlibs" -a -z "$with_system_libs"; then
   if test -n "$checkforprelink" -a -f /etc/rpm/macros.prelink; then
     with_system_stdlibs=yes
@@ -27902,6 +27906,7 @@ GPERF!$GPERF$ac_delim
 MINGWCXX!$MINGWCXX$ac_delim
 MINGWSTRIP!$MINGWSTRIP$ac_delim
 BUILD_UNOWINREG!$BUILD_UNOWINREG$ac_delim
+BUILD_QADEVOOO!$BUILD_QADEVOOO$ac_delim
 SYSTEM_STDLIBS!$SYSTEM_STDLIBS$ac_delim
 SYSTEM_ZLIB!$SYSTEM_ZLIB$ac_delim
 SYSTEM_JPEG!$SYSTEM_JPEG$ac_delim
@@ -27946,7 +27951,6 @@ HSQLDB_JAR!$HSQLDB_JAR$ac_delim
 SYSTEM_BSH!$SYSTEM_BSH$ac_delim
 BSH_JAR!$BSH_JAR$ac_delim
 SERIALIZER_JAR!$SERIALIZER_JAR$ac_delim
-SYSTEM_SAXON!$SYSTEM_SAXON$ac_delim
 _ACEOF
 
   if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
@@ -27988,6 +27992,7 @@ _ACEOF
 ac_delim='%!_!# '
 for ac_last_try in false false false false false :; do
   cat >conf$$subs.sed <<_ACEOF
+SYSTEM_SAXON!$SYSTEM_SAXON$ac_delim
 SAXON_JAR!$SAXON_JAR$ac_delim
 CURLCONFIG!$CURLCONFIG$ac_delim
 SYSTEM_CURL!$SYSTEM_CURL$ac_delim
@@ -28084,7 +28089,6 @@ ENABLE_GTK!$ENABLE_GTK$ac_delim
 ENABLE_KDE!$ENABLE_KDE$ac_delim
 GCONF_CFLAGS!$GCONF_CFLAGS$ac_delim
 GCONF_LIBS!$GCONF_LIBS$ac_delim
-ENABLE_GCONF!$ENABLE_GCONF$ac_delim
 _ACEOF
 
   if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
@@ -28126,6 +28130,7 @@ _ACEOF
 ac_delim='%!_!# '
 for ac_last_try in false false false false false :; do
   cat >conf$$subs.sed <<_ACEOF
+ENABLE_GCONF!$ENABLE_GCONF$ac_delim
 GNOMEVFS_CFLAGS!$GNOMEVFS_CFLAGS$ac_delim
 GNOMEVFS_LIBS!$GNOMEVFS_LIBS$ac_delim
 ENABLE_GNOMEVFS!$ENABLE_GNOMEVFS$ac_delim
@@ -28203,7 +28208,7 @@ LIBOBJS!$LIBOBJS$ac_delim
 LTLIBOBJS!$LTLIBOBJS$ac_delim
 _ACEOF
 
-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 75; then
+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 76; then
     break
   elif $ac_last_try; then
     { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
diff --git a/config_office/configure.in b/config_office/configure.in
index 8f5321340754..033b4152321f 100644
--- a/config_office/configure.in
+++ b/config_office/configure.in
@@ -3,7 +3,7 @@ dnl *     vi:set sw=3 ts=3 et:
 dnl *
 dnl * Name: configure.in
 dnl * Auth: Willem van Dorp, Ross Nicholson, Oisin Boydell - Sun Microsystems Ireland
-dnl * Date: $Date: 2008-09-05 14:13:58 $
+dnl * Date: $Date: 2008-09-08 07:38:40 $
 dnl *
 dnl * Desc: This file serves as input for the GNU autoconf package
 dnl *       in order to create a configure script.
@@ -12,7 +12,7 @@ dnl *       necessary to build OpenOffice.org
 dnl *
 dnl *
 dnl ******************************************************************/
-AC_REVISION( $Revision: 1.289 $ )
+AC_REVISION( $Revision: 1.290 $ )
 AC_PREREQ(2.50)
 AC_INIT()
 echo "$@" >config.parms
@@ -3360,10 +3360,13 @@ dnl ===================================================================
 AC_MSG_CHECKING([whether to build qadevOOo])
 if test "z$enable_qadevooo" = "z" -o "$enable_qadevooo" != "no"; then
    AC_MSG_RESULT([yes])
+   BUILD_QADEVOOO="YES"
    BUILD_TYPE="$BUILD_TYPE QADEVOOO"
 else
+   BUILD_QADEVOOO="NO"
    AC_MSG_RESULT([no])
 fi
+AC_SUBST(BUILD_QADEVOOO)
 
 dnl ===================================================================
 dnl Check for prelinked libgcc_s.so.1