cmcfixes69: merge with DEV300 m69

1 files changed, 236 insertions, 307 deletions

diff --git a/configure b/configure
index 7abdef2b06bf..7298fe182c7c 100755
--- a/configure
+++ b/configure
@@ -614,8 +614,6 @@ SCPDEFS
 WITHOUT_AFMS
 WITHOUT_PPDS
 WITH_FONTS
-SYSTEM_MSPACK
-WITH_FONTOOO
 ENABLE_KAB
 ENABLE_EVOAB2
 GOBJECT_LIBS
@@ -1008,11 +1006,9 @@ with_epm
 with_package_format
 enable_odk
 enable_qadevooo
-enable_fontooo
 enable_mathmldtd
 enable_evolution2
 with_system_stdlibs
-with_system_mspack
 enable_cups
 enable_fontconfig
 enable_directx
@@ -1150,7 +1146,6 @@ with_zip_home
 with_mingwin
 with_use_shell
 with_build_version
-enable_sgistl
 with_alloc
 enable_verbose
 enable_largefile
@@ -1814,9 +1809,6 @@ Optional Features:
   --disable-qadevooo      OO.o includes some qa testsuites which some
                           packagers may wish to build without
 
-  --disable-fontooo       disable FontOOo
-                          (useful for distributions using fontconfig for OOo)
-
   --disable-mathmldtd     disable mathmldtd
                           (useful for distributions that want to avoid packaging
                           it)
@@ -1972,11 +1964,6 @@ Optional Features:
                           explicitly enable if your version of ccache doesn't
                           identify as version 2.4_OOo
 
-  --enable-sgistl         for IRIX users, use this option option to build
-                          OpenOffice.org using SGI's STL.
-
-                          Usage: --enable-sgistl=yes
-
   --enable-verbose        Increase build verbosity.
   --disable-verbose       Decrease build verbosity.
 
@@ -2038,8 +2025,6 @@ Optional Packages:
 
   --with-system-stdlibs   use libstdc++/libgcc_s already on system
 
-  --with-system-mspack    use libmspack already installed on system
-
   --with-system-cairo      Use Cairo libraries already on system
 
   --with-mozilla-version  Choose which version of mozilla to use while building
@@ -3768,13 +3753,6 @@ else
   enable_qadevooo="yes"
 fi
 
-# Check whether --enable-fontooo was given.
-if test "${enable_fontooo+set}" = set; then :
-  enableval=$enable_fontooo;
-else
-  enable_fontooo="yes"
-fi
-
 # Check whether --enable-mathmldtd was given.
 if test "${enable_mathmldtd+set}" = set; then :
   enableval=$enable_mathmldtd;
@@ -3795,12 +3773,6 @@ else
   checkforstdlibproblems=yes
 fi
 
-
-# Check whether --with-system-mspack was given.
-if test "${with_system_mspack+set}" = set; then :
-  withval=$with_system_mspack;
-fi
-
 # Check whether --enable-cups was given.
 if test "${enable_cups+set}" = set; then :
   enableval=$enable_cups;
@@ -4656,11 +4628,6 @@ if test "${with_build_version+set}" = set; then :
   withval=$with_build_version; with_build_version=$withval
 fi
 
-# Check whether --enable-sgistl was given.
-if test "${enable_sgistl+set}" = set; then :
-  enableval=$enable_sgistl;
-fi
-
 
 # Check whether --with-alloc was given.
 if test "${with_alloc+set}" = set; then :
@@ -5229,9 +5196,6 @@ $as_echo "ok ($build_cpu)" >&6; }
 		test_cups=yes
         test_randr=yes
 		test_freetype=yes
-		if getconf GNU_LIBPTHREAD_VERSION |grep -q NPTL; then
-			PTHREAD_CFLAGS="-DNPTL"
-		fi
 		_os=Linux
 		;;
 	gnu)
@@ -5316,12 +5280,6 @@ $as_echo "$PTHREAD_LIBS" >&6; }
 		PTHREAD_LIBS="-pthread -lpthread"
 		_os=NetBSD
 		;;
-	irix*)
-		test_cups=no
-        test_randr=no
-		test_freetype=yes
-		_os=IRIX
-		;;
 	aix*)
 		test_cups=no
         test_randr=no
@@ -6649,7 +6607,8 @@ done
 
         COMPATH=`echo $COMPATH | $SED "s@/[^/:]*\\\$@@"`;
 fi
-
+COMPATH=`echo $COMPATH | $SED "s@/[Bb][Ii][Nn]\\\$@@"`;
+echo $COMPATH
 GCCVER=20995
 if test \( "$_os" != "WINNT" -o "$WITH_MINGWIN" = "yes" \) -a "$GCC" = "yes"; then
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking the GNU gcc compiler version" >&5
@@ -6857,7 +6816,7 @@ fi
   test -n "$_cc" && break
 done
 
-      COMPATH=`echo $_cc | $SED -n "s/\/cc//p"`
+      COMPATH=`echo $_cc | $SED -n "s/\/bin\/cc//p"`
       { $as_echo "$as_me:${as_lineno-$LINENO}: checking the SunStudio C/C++ compiler version" >&5
 $as_echo_n "checking the SunStudio C/C++ compiler version... " >&6; }
             _sunstudio_string=`$CC -V 2>&1 | grep '^cc' | sed -e 's/.* C //'`
@@ -6915,72 +6874,6 @@ $as_echo "not found " >&6; }
 fi
 
 
-if test "$_os" = "IRIX" -o "$_os" = "IRIX64"; then
-   if test "$CC" = "cc"; then
-      for ac_prog in cc
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path__cc+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $_cc in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path__cc="$_cc" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_path__cc="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  ;;
-esac
-fi
-_cc=$ac_cv_path__cc
-if test -n "$_cc"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $_cc" >&5
-$as_echo "$_cc" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  test -n "$_cc" && break
-done
-
-      COMPATH=`echo $_cc | $SED -n "s/\/cc//p"`
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking the SGI MIPSpro C compiler version" >&5
-$as_echo_n "checking the SGI MIPSpro C compiler version... " >&6; }
-            _mipspro_version=`$CC -version 2>&1 | $AWK '{ print $4 }'`
-      _mipspro_major=`echo $_mipspro_version | $AWK -F. '{ print $1 }'`
-      if test "$_mipspro_major" != "7"; then
-         as_fn_error "found version \"$_mipspro_version\", use version 7.2+ of the SGI MIPSpro C compiler" "$LINENO" 5
-      else
-         _mipspro_minor=`echo $_mipspro_version | $AWK -F. '{ if ($2 <= 1) print "false"; else print "true" }'`
-         if test "$_mipspro_minor" = "false"; then
-            as_fn_error "found version \"$_mipspro_version\", use version 7.2+ of the SGI MIPSpro C compiler" "$LINENO" 5
-         else
-                        { $as_echo "$as_me:${as_lineno-$LINENO}: result: checked" >&5
-$as_echo "checked" >&6; }
-         fi
-      fi
-   fi
-fi
-
 if test "$_os" = "OSF1"; then
    if test "$CC" = "cc"; then
       for ac_prog in cc
@@ -7028,7 +6921,7 @@ fi
   test -n "$_cc" && break
 done
 
-      COMPATH=`echo $_cc | $SED -n "s/\/cc//p"`
+      COMPATH=`echo $_cc | $SED -n "s/\/bin\/cc//p"`
       { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: ******* $_cc , $COMPATH" >&5
 $as_echo "$as_me: WARNING: ******* $_cc , $COMPATH" >&2;}
       { $as_echo "$as_me:${as_lineno-$LINENO}: checking the Compaq C compiler version" >&5
@@ -7297,8 +7190,8 @@ fi
 			# Remove /cl.exe from CC case insensitive
 			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: found ($CC)" >&5
 $as_echo "found ($CC)" >&6; }
-			COMPATH=`echo $CC | $SED 's@/[cC][lL]\.[eE][xX][eE]@@'`
-			export INCLUDE=`cygpath -d "$COMPATH/../Include"`
+			COMPATH=`echo $CC | $SED 's@\/[Bb][Ii][Nn]\/[cC][lL]\.[eE][xX][eE]@@'`
+			export INCLUDE=`cygpath -d "$COMPATH/Include"`
 						{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the Version of Microsoft C/C++ Compiler" >&5
 $as_echo_n "checking the Version of Microsoft C/C++ Compiler... " >&6; }
 			CCNUMVER=`$CC 2>&1 | $AWK "/Microsoft/ && /..\\...\\...../ {
@@ -9571,7 +9464,7 @@ $as_echo_n "checking whether to use dynamic libgcc... " >&6; }
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic libgcc name" >&5
 $as_echo_n "checking dynamic libgcc name... " >&6; }
     MINGW_GCCDLL_pattern=`nm $MINGW_CLIB_DIR/libgcc_s.a | sed -ne 's@.* _libgcc\(.*\)_dll_iname@libgcc\1.dll@p' | uniq | sed -e 's@_@?@g'`
-    MINGW_GCCDLL=`cd $COMPATH && ls $MINGW_GCCDLL_pattern 2>/dev/null`
+    MINGW_GCCDLL=`cd $COMPATH/bin && ls $MINGW_GCCDLL_pattern 2>/dev/null`
     if test -n "$MINGW_GCCDLL"; then
         MINGW_SHARED_GCCLIB=YES
         { $as_echo "$as_me:${as_lineno-$LINENO}: result: use $MINGW_GCCDLL" >&5
@@ -9593,7 +9486,7 @@ $as_echo_n "checking whether to use dynamic libstdc++... " >&6; }
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic libstdc++ name" >&5
 $as_echo_n "checking dynamic libstdc++ name... " >&6; }
     MINGW_GXXDLL_pattern=`nm $MINGW_CLIB_DIR/libstdc++_s.a | sed -ne 's@.* _libstdc__\(.*\)_dll_iname@libstdc++\1.dll@p' | uniq | sed -e 's@_@?@g'`
-    MINGW_GXXDLL=`cd $COMPATH && ls $MINGW_GXXDLL_pattern 2>/dev/null`
+    MINGW_GXXDLL=`cd $COMPATH/bin && ls $MINGW_GXXDLL_pattern 2>/dev/null`
     if test -n "$MINGW_GXXDLL"; then
         MINGW_SHARED_GXXLIB=YES
         { $as_echo "$as_me:${as_lineno-$LINENO}: result: use $MINGW_GXXDLL" >&5
@@ -9643,20 +9536,6 @@ $as_echo "checked" >&6; }
       fi
    fi
 fi
-if test "$_os" = "IRIX" -o "$_os" = "IRIX64"; then
-      if test "$CC" = "cc"; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking SGI MIPSpro C++ Compiler" >&5
-$as_echo_n "checking SGI MIPSpro C++ Compiler... " >&6; }
-      if test "$CXX" != "CC"; then
-         { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: SGI MIPSpro C++ was not found" >&5
-$as_echo "$as_me: WARNING: SGI MIPSpro C++ was not found" >&2;}
-         echo "SGI MIPSpro C++ was not found" >> warn
-      else
-         { $as_echo "$as_me:${as_lineno-$LINENO}: result: checked" >&5
-$as_echo "checked" >&6; }
-      fi
-   fi
-fi
 if test "$_os" = "OSF1"; then
    { $as_echo "$as_me:${as_lineno-$LINENO}: checking Compaq C++ compiler version" >&5
 $as_echo_n "checking Compaq C++ compiler version... " >&6; }
@@ -9815,23 +9694,6 @@ $as_echo "$as_me: WARNING: patch 107733-06 not found, please install linker patc
    fi
 fi
 
-if test -n "$enable_sgistl" && "$enable_sgistl" != "no"; then
-	if test "$_os" = "IRIX" -o "$_os" = "IRIX64"; then
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SGI STL" >&5
-$as_echo_n "checking for SGI STL... " >&6; }
-		if test -d /usr/include/CC ; then
-			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes." >&5
-$as_echo "yes." >&6; }
-
-		else
-			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: not found." >&5
-$as_echo "not found." >&6; }
-		fi
-	else
-		as_fn_error "Option --enable-sgistl is only valid for IRIX" "$LINENO" 5
-	fi
-else
-
    { $as_echo "$as_me:${as_lineno-$LINENO}: checking what the default STL should be" >&5
 $as_echo_n "checking what the default STL should be... " >&6; }
    DEFAULT_TO_STLPORT="no"
@@ -9932,22 +9794,6 @@ $as_echo "checked" >&6; }
 		      else
 			      as_fn_error "STLport libraries not found" "$LINENO" 5
 		      fi
-	      elif test "$_os" = "IRIX" -o "$_os" = "IRIX64"; then
-		      if test -f "$STLPORT4/lib/libstlport_mipspro_41.so"; then
-			      { $as_echo "$as_me:${as_lineno-$LINENO}: result: checked" >&5
-$as_echo "checked" >&6; }
-			   else
-				   if test -f "$STLPORT4/lib/libstlport_gcc.so"; then
-					   { $as_echo "$as_me:${as_lineno-$LINENO}: result: checked" >&5
-$as_echo "checked" >&6; }
-				   elif test -f "$STLPORT4/lib/libstlport.so"; then
-					   { $as_echo "$as_me:${as_lineno-$LINENO}: result: checked" >&5
-$as_echo "checked" >&6; }
-					   STLPORT_VER=500
-				   else
-					   as_fn_error "STLport libraries not found" "$LINENO" 5
-				   fi
-			   fi
 		   else
 			   if test -f "$STLPORT4/lib/libstlport_gcc.so"; then
 				   { $as_echo "$as_me:${as_lineno-$LINENO}: result: checked" >&5
@@ -9967,7 +9813,6 @@ $as_echo "$as_me: WARNING: using stlport. Warning, breaks your ABI compatability
          echo "using stlport. Warning, breaks your ABI compatability!" >>warn
       fi
    fi
-fi
 
 if test -z "$STLPORT4"; then
   STLPORT4="NO_STLPORT4"
@@ -10254,11 +10099,18 @@ _ACEOF
       if ! $CXX $CXXFLAGS $CPPFLAGS -fpic -S visibility.cxx 2>/dev/null > /dev/null; then
          gccvisbroken=yes
       else
-         if $EGREP -q '@PLT|\$stub|\(PLT\)' visibility.s; then
-             gccvisbroken=no;
-         else
-             gccvisbroken=yes;
-         fi
+         case "$build_cpu" in
+            i?86|x86_64)
+               if $EGREP -q '@PLT' visibility.s; then
+                  gccvisbroken=no
+               else
+                  gccvisbroken=yes
+               fi
+               ;;
+            *)
+               gccvisbroken=no
+               ;;
+         esac
       fi
       rm -f visibility.s
 
@@ -10654,7 +10506,7 @@ $as_echo_n "checking re-checking JDK... " >&6; }
 $as_echo "checked (ecj)" >&6; }
         #TODO: what's to do here? some switch to do 1.5 compiling?
         JAVAFLAGS="-source 1.5 -target 1.5"
-        _gij_longver="50000"
+        _gij_longver="40200"
     fi
 fi
 
@@ -10779,7 +10631,7 @@ fi
 
 if test "$SOLAR_JAVA" != ""; then
         if test "$JDK" == "gcj" -a -z "$JAVA_HOME"; then
-      if test "x$with_jdk_home" = "x" -a "$_gij_longver" -ge "50000"; then
+      if test "x$with_jdk_home" = "x" -a "$_gij_longver" -ge "40200"; then
         cat > findhome.java <<_ACEOF
 import java.io.File;
 
@@ -10826,7 +10678,7 @@ $as_echo "$JAVA_HOME" >&6; }
       fi
     fi
 
-        if test "$JDK" != "gcj" -o "$_gij_longver" -ge "50000"; then
+        if test "$JDK" != "gcj" -o "$_gij_longver" -ge "40200"; then
       # check if JAVA_HOME was (maybe incorrectly?) set automatically to /usr
       if test "$JAVA_HOME" = "/usr" -a "x$with_jdk_home" = "x"; then
 
@@ -11362,9 +11214,6 @@ $as_echo_n "checking which package format to use... " >&6; }
 	OSF1)
 		PKGFORMAT=setld
 		;;
-	IRIX)
-		PKGFORMAT=tardist
-		;;
 	# we never should get here since we check the arciecture/os at the beginning,
 	# but go sure...
 	*)
@@ -13150,8 +12999,7 @@ fi
 
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether db is at least 4.1" >&5
 $as_echo_n "checking whether db is at least 4.1... " >&6; }
-    for v in `seq 1 7`; do
-       if test "$cross_compiling" = yes; then :
+    if test "$cross_compiling" = yes; then :
   { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error "cannot run test program while cross compiling
@@ -13163,29 +13011,21 @@ else
 #include <db.h>
 
 int main(int argc, char **argv) {
-       if(DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR == $v) return 0;
+       if(DB_VERSION_MAJOR > 4 || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1)) return 0;
        else return 1;
 }
 
 _ACEOF
 if ac_fn_c_try_run "$LINENO"; then :
-  DB_VERSION_MINOR=$v
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+else
+  as_fn_error "no. you need at least db 4.1" "$LINENO" 5
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
   conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
-    done
-    if test "$DB_VERSION_MINOR" -gt "1"; then
-       { $as_echo "$as_me:${as_lineno-$LINENO}: result: OK" >&5
-$as_echo "OK" >&6; }
-       DB_VERSION=4.$DB_VERSION_MINOR
-    else
-       as_fn_error "no. you need at least db 4.1" "$LINENO" 5
-    fi
-    # does not work :/
-    #AC_CHECK_LIB(db, db_create, [],
-    #  [AC_MSG_ERROR([db library not installed or functional])], [])
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -ldb" >&5
 $as_echo_n "checking for main in -ldb... " >&6; }
 if test "${ac_cv_lib_db_main+set}" = set; then :
@@ -16779,7 +16619,8 @@ done
 $as_echo "yes" >&6; }
        for ac_header in X11/Xaw/Label.h
 do :
-  ac_fn_c_check_header_mongrel "$LINENO" "X11/Xaw/Label.h" "ac_cv_header_X11_Xaw_Label_h" "$ac_includes_default"
+  ac_fn_c_check_header_compile "$LINENO" "X11/Xaw/Label.h" "ac_cv_header_X11_Xaw_Label_h" "#include <X11/Intrinsic.h>
+"
 if test "x$ac_cv_header_X11_Xaw_Label_h" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_X11_XAW_LABEL_H 1
@@ -18917,8 +18758,8 @@ $as_echo_n "checking for instmsia.exe/instmsiw.exe... " >&6; }
       { $as_echo "$as_me:${as_lineno-$LINENO}: result: found" >&5
 $as_echo "found" >&6; }
    else
-      MSIAPATH=`/bin/find "$COMPATH/../.." -iname instmsia.exe | head -n 1`
-      MSIWPATH=`/bin/find "$COMPATH/../.." -iname instmsiw.exe | head -n 1`
+      MSIAPATH=`/bin/find "$COMPATH/.." -iname instmsia.exe | head -n 1`
+      MSIWPATH=`/bin/find "$COMPATH/.." -iname instmsiw.exe | head -n 1`
       if test -n "$MSIAPATH" -a -n "$MSIWPATH"; then
          cp "$MSIAPATH" ./external/msi/ && chmod +x ./external/msi/instmsia.exe && MSIACOPY="OK"
          cp "$MSIWPATH" ./external/msi/ && chmod +x ./external/msi/instmsiw.exe && MSIWCOPY="OK"
@@ -20969,14 +20810,58 @@ if test "$ENABLE_MEDIAWIKI" = "YES" -o "$ENABLE_REPORTBUILDER" = "YES"; then
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking which Apache commons-* libs to use" >&5
 $as_echo_n "checking which Apache commons-* libs to use... " >&6; }
   if test "$with_system_apache_commons" = "yes"; then
-       SYSTEM_APACHE_COMMONS=YES
-       { $as_echo "$as_me:${as_lineno-$LINENO}: result: external" >&5
+    SYSTEM_APACHE_COMMONS=YES
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: external" >&5
 $as_echo "external" >&6; }
     if test "$ENABLE_MEDIAWIKI" = "YES"; then
-        if test -z "$COMMONS_CODEC_JAR"; then
-                COMMONS_CODEC_JAR=/usr/share/java/commons-codec-1.3.jar
-        fi
-   as_ac_File=`$as_echo "ac_cv_file_$COMMONS_CODEC_JAR" | $as_tr_sh`
+      if test -z $COMMONS_CODEC_JAR; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for /usr/share/java/commons-codec-1.3.jar" >&5
+$as_echo_n "checking for /usr/share/java/commons-codec-1.3.jar... " >&6; }
+if test "${ac_cv_file__usr_share_java_commons_codec_1_3_jar+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  test "$cross_compiling" = yes &&
+  as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5
+if test -r "/usr/share/java/commons-codec-1.3.jar"; then
+  ac_cv_file__usr_share_java_commons_codec_1_3_jar=yes
+else
+  ac_cv_file__usr_share_java_commons_codec_1_3_jar=no
+fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_file__usr_share_java_commons_codec_1_3_jar" >&5
+$as_echo "$ac_cv_file__usr_share_java_commons_codec_1_3_jar" >&6; }
+if test "x$ac_cv_file__usr_share_java_commons_codec_1_3_jar" = x""yes; then :
+   COMMONS_CODEC_JAR=/usr/share/java/commons-codec-1.3.jar
+else
+
+            { $as_echo "$as_me:${as_lineno-$LINENO}: checking for /usr/share/java/commons-codec.jar" >&5
+$as_echo_n "checking for /usr/share/java/commons-codec.jar... " >&6; }
+if test "${ac_cv_file__usr_share_java_commons_codec_jar+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  test "$cross_compiling" = yes &&
+  as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5
+if test -r "/usr/share/java/commons-codec.jar"; then
+  ac_cv_file__usr_share_java_commons_codec_jar=yes
+else
+  ac_cv_file__usr_share_java_commons_codec_jar=no
+fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_file__usr_share_java_commons_codec_jar" >&5
+$as_echo "$ac_cv_file__usr_share_java_commons_codec_jar" >&6; }
+if test "x$ac_cv_file__usr_share_java_commons_codec_jar" = x""yes; then :
+   COMMONS_CODEC_JAR=/usr/share/java/commons-codecs.jar
+else
+  as_fn_error "commons-codec.jar replacement not found." "$LINENO" 5
+
+fi
+
+
+
+fi
+
+      else
+        as_ac_File=`$as_echo "ac_cv_file_$COMMONS_CODEC_JAR" | $as_tr_sh`
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $COMMONS_CODEC_JAR" >&5
 $as_echo_n "checking for $COMMONS_CODEC_JAR... " >&6; }
 if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then :
@@ -21000,10 +20885,56 @@ else
   as_fn_error "commons-codec.jar not found." "$LINENO" 5
 fi
 
-        if test -z "$COMMONS_LANG_JAR"; then
-                COMMONS_LANG_JAR=/usr/share/java/commons-lang-2.3.jar
-        fi
-   as_ac_File=`$as_echo "ac_cv_file_$COMMONS_LANG_JAR" | $as_tr_sh`
+      fi
+
+      if test -z $COMMONS_LANG_JAR; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for /usr/share/java/commons-lang-2.3.jar" >&5
+$as_echo_n "checking for /usr/share/java/commons-lang-2.3.jar... " >&6; }
+if test "${ac_cv_file__usr_share_java_commons_lang_2_3_jar+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  test "$cross_compiling" = yes &&
+  as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5
+if test -r "/usr/share/java/commons-lang-2.3.jar"; then
+  ac_cv_file__usr_share_java_commons_lang_2_3_jar=yes
+else
+  ac_cv_file__usr_share_java_commons_lang_2_3_jar=no
+fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_file__usr_share_java_commons_lang_2_3_jar" >&5
+$as_echo "$ac_cv_file__usr_share_java_commons_lang_2_3_jar" >&6; }
+if test "x$ac_cv_file__usr_share_java_commons_lang_2_3_jar" = x""yes; then :
+   COMMONS_LANG_JAR=/usr/share/java/commons-lang-2.3.jar
+else
+
+            { $as_echo "$as_me:${as_lineno-$LINENO}: checking for /usr/share/java/commons-lang.jar" >&5
+$as_echo_n "checking for /usr/share/java/commons-lang.jar... " >&6; }
+if test "${ac_cv_file__usr_share_java_commons_lang_jar+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  test "$cross_compiling" = yes &&
+  as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5
+if test -r "/usr/share/java/commons-lang.jar"; then
+  ac_cv_file__usr_share_java_commons_lang_jar=yes
+else
+  ac_cv_file__usr_share_java_commons_lang_jar=no
+fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_file__usr_share_java_commons_lang_jar" >&5
+$as_echo "$ac_cv_file__usr_share_java_commons_lang_jar" >&6; }
+if test "x$ac_cv_file__usr_share_java_commons_lang_jar" = x""yes; then :
+   COMMONS_LANG_JAR=/usr/share/java/commons-lang.jar
+else
+  as_fn_error "commons-lang.jar replacement not found." "$LINENO" 5
+
+fi
+
+
+
+fi
+
+      else
+        as_ac_File=`$as_echo "ac_cv_file_$COMMONS_LANG_JAR" | $as_tr_sh`
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $COMMONS_LANG_JAR" >&5
 $as_echo_n "checking for $COMMONS_LANG_JAR... " >&6; }
 if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then :
@@ -21027,10 +20958,56 @@ else
   as_fn_error "commons-lang.jar not found." "$LINENO" 5
 fi
 
-        if test -z "$COMMONS_HTTPCLIENT_JAR"; then
-                COMMONS_HTTPCLIENT_JAR=/usr/share/java/commons-httpclient-3.1.jar
-        fi
-   as_ac_File=`$as_echo "ac_cv_file_$COMMONS_HTTPCLIENT_JAR" | $as_tr_sh`
+      fi
+
+      if test -z $COMMONS_HTTPCLIENT_JAR; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for /usr/share/java/commons-httpclient-3.1.jar" >&5
+$as_echo_n "checking for /usr/share/java/commons-httpclient-3.1.jar... " >&6; }
+if test "${ac_cv_file__usr_share_java_commons_httpclient_3_1_jar+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  test "$cross_compiling" = yes &&
+  as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5
+if test -r "/usr/share/java/commons-httpclient-3.1.jar"; then
+  ac_cv_file__usr_share_java_commons_httpclient_3_1_jar=yes
+else
+  ac_cv_file__usr_share_java_commons_httpclient_3_1_jar=no
+fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_file__usr_share_java_commons_httpclient_3_1_jar" >&5
+$as_echo "$ac_cv_file__usr_share_java_commons_httpclient_3_1_jar" >&6; }
+if test "x$ac_cv_file__usr_share_java_commons_httpclient_3_1_jar" = x""yes; then :
+   COMMONS_HTTPCLIENT_JAR=/usr/share/java/commons-httpclient-3.1.jar
+else
+
+            { $as_echo "$as_me:${as_lineno-$LINENO}: checking for /usr/share/java/commons-httpclient.jar" >&5
+$as_echo_n "checking for /usr/share/java/commons-httpclient.jar... " >&6; }
+if test "${ac_cv_file__usr_share_java_commons_httpclient_jar+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  test "$cross_compiling" = yes &&
+  as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5
+if test -r "/usr/share/java/commons-httpclient.jar"; then
+  ac_cv_file__usr_share_java_commons_httpclient_jar=yes
+else
+  ac_cv_file__usr_share_java_commons_httpclient_jar=no
+fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_file__usr_share_java_commons_httpclient_jar" >&5
+$as_echo "$ac_cv_file__usr_share_java_commons_httpclient_jar" >&6; }
+if test "x$ac_cv_file__usr_share_java_commons_httpclient_jar" = x""yes; then :
+   COMMONS_HTTPCLIENT_JAR=/usr/share/java/commons-httpclient.jar
+else
+  as_fn_error "commons-httpclient.jar replacement not found." "$LINENO" 5
+
+fi
+
+
+
+fi
+
+      else
+        as_ac_File=`$as_echo "ac_cv_file_$COMMONS_HTTPCLIENT_JAR" | $as_tr_sh`
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $COMMONS_HTTPCLIENT_JAR" >&5
 $as_echo_n "checking for $COMMONS_HTTPCLIENT_JAR... " >&6; }
 if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then :
@@ -21054,12 +21031,57 @@ else
   as_fn_error "commons-httpclient.jar not found." "$LINENO" 5
 fi
 
+      fi
     fi
     if test "$ENABLE_MEDIAWIKI" = "YES" -o "$ENABLE_REPORTBUILDER" = "YES"; then
-        if test -z "$COMMONS_LOGGING_JAR"; then
-                COMMONS_LOGGING_JAR=/usr/share/java/commons-logging-1.1.1.jar
-        fi
-   as_ac_File=`$as_echo "ac_cv_file_$COMMONS_LOGGING_JAR" | $as_tr_sh`
+      if test -z $COMMONS_LOGGING_JAR; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for /usr/share/java/commons-logging-1.1.1.jar" >&5
+$as_echo_n "checking for /usr/share/java/commons-logging-1.1.1.jar... " >&6; }
+if test "${ac_cv_file__usr_share_java_commons_logging_1_1_1_jar+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  test "$cross_compiling" = yes &&
+  as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5
+if test -r "/usr/share/java/commons-logging-1.1.1.jar"; then
+  ac_cv_file__usr_share_java_commons_logging_1_1_1_jar=yes
+else
+  ac_cv_file__usr_share_java_commons_logging_1_1_1_jar=no
+fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_file__usr_share_java_commons_logging_1_1_1_jar" >&5
+$as_echo "$ac_cv_file__usr_share_java_commons_logging_1_1_1_jar" >&6; }
+if test "x$ac_cv_file__usr_share_java_commons_logging_1_1_1_jar" = x""yes; then :
+   COMMONS_LOGGING_JAR=/usr/share/java/commons-logging-1.1.1.jar
+else
+
+            { $as_echo "$as_me:${as_lineno-$LINENO}: checking for /usr/share/java/commons-logging.jar" >&5
+$as_echo_n "checking for /usr/share/java/commons-logging.jar... " >&6; }
+if test "${ac_cv_file__usr_share_java_commons_logging_jar+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  test "$cross_compiling" = yes &&
+  as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5
+if test -r "/usr/share/java/commons-logging.jar"; then
+  ac_cv_file__usr_share_java_commons_logging_jar=yes
+else
+  ac_cv_file__usr_share_java_commons_logging_jar=no
+fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_file__usr_share_java_commons_logging_jar" >&5
+$as_echo "$ac_cv_file__usr_share_java_commons_logging_jar" >&6; }
+if test "x$ac_cv_file__usr_share_java_commons_logging_jar" = x""yes; then :
+   COMMONS_LOGGING_JAR=/usr/share/java/commons-logging.jar
+else
+  as_fn_error "commons-logging.jar replacement not found." "$LINENO" 5
+
+fi
+
+
+
+fi
+
+      else
+        as_ac_File=`$as_echo "ac_cv_file_$COMMONS_LOGGING_JAR" | $as_tr_sh`
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $COMMONS_LOGGING_JAR" >&5
 $as_echo_n "checking for $COMMONS_LOGGING_JAR... " >&6; }
 if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then :
@@ -21083,13 +21105,13 @@ else
   as_fn_error "commons-logging.jar not found." "$LINENO" 5
 fi
 
-
+      fi
     fi
   else
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: internal" >&5
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: internal" >&5
 $as_echo "internal" >&6; }
-        SYSTEM_APACHE_COMMONS=NO
-        BUILD_TYPE="$BUILD_TYPE APACHE_COMMONS TOMCAT"
+    SYSTEM_APACHE_COMMONS=NO
+    BUILD_TYPE="$BUILD_TYPE APACHE_COMMONS TOMCAT"
   fi
 fi
 
@@ -21587,99 +21609,6 @@ $as_echo "no" >&6; }
 fi
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to include FontOOo" >&5
-$as_echo_n "checking whether to include FontOOo... " >&6; }
-if test -n "$enable_fontooo"; then
-  if test "$enable_fontooo" = "no"; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-    WITH_FONTOOO=NO
-    SCPDEFS="$SCPDEFS -DWITHOUT_FONTOOO"
-  else
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-    WITH_FONTOOO=YES
-    BUILD_TYPE="$BUILD_TYPE MSFONTEXTRACT"
-  fi
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-  WITH_FONTOOO=NO
-  SCPDEFS="$SCPDEFS -DWITHOUT_FONTOOO"
-fi
-
-
-if test "$WITH_FONTOOO" = "YES"; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to use system libmspack" >&5
-$as_echo_n "checking whether to use system libmspack... " >&6; }
-  if test -n "$with_system_mspack" -o -n "$with_system_libs" && \
-	  test "$with_system_mspack" != "no"; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-    SYSTEM_MSPACK=YES
-    ac_fn_c_check_header_mongrel "$LINENO" "mspack.h" "ac_cv_header_mspack_h" "$ac_includes_default"
-if test "x$ac_cv_header_mspack_h" = x""yes; then :
-
-else
-  as_fn_error "mspack.h not found, install libmspack" "$LINENO" 5
-fi
-
-
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for mspack_create_cab_decompressor in -lmspack" >&5
-$as_echo_n "checking for mspack_create_cab_decompressor in -lmspack... " >&6; }
-if test "${ac_cv_lib_mspack_mspack_create_cab_decompressor+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lmspack  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char mspack_create_cab_decompressor ();
-int
-main ()
-{
-return mspack_create_cab_decompressor ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_mspack_mspack_create_cab_decompressor=yes
-else
-  ac_cv_lib_mspack_mspack_create_cab_decompressor=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_mspack_mspack_create_cab_decompressor" >&5
-$as_echo "$ac_cv_lib_mspack_mspack_create_cab_decompressor" >&6; }
-if test "x$ac_cv_lib_mspack_mspack_create_cab_decompressor" = x""yes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBMSPACK 1
-_ACEOF
-
-  LIBS="-lmspack $LIBS"
-
-else
-  as_fn_error "libmspack not installed or functional" "$LINENO" 5
-fi
-
-  else
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-    SYSTEM_MSPACK=NO
-  fi
-fi
-
-
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to include MathMLDTD" >&5
 $as_echo_n "checking whether to include MathMLDTD... " >&6; }
 if test -n "$enable_mathmldtd"; then