CWS-TOOLING: integrate CWS native241correct

2009-04-06 15:56:56 +0200 rene  r270566 : autoconf
2009-04-06 15:56:02 +0200 rene  r270565 : remove writer2latex

5 files changed, 9 insertions, 78 deletions

diff --git a/configure b/configure
index 1158f56ef..8f84cd995 100755
--- a/configure
+++ b/configure
@@ -963,7 +963,6 @@ SYSTEM_MSPACK
 WITH_FONTS
 WITHOUT_PPDS
 WITHOUT_AFMS
-WITH_WRITER2LATEX
 SCPDEFS
 USE_XINERAMA
 XINERAMA_LINK
@@ -1839,10 +1838,6 @@ Optional Packages:
 
   --with-external-thes-dir Specify external thesaurus dir
 
-  --without-writer2latex Removes writer2latex from openoffice.org installation
-                          set, for people building for specific distributions
-                          where writer2latex is known to be already available
-
   --with-system-libs      Use libs already on system -- enables all
                           --with-system-* flags except mozilla and
                           odbc/sane/xrender-header(s)
@@ -2974,12 +2969,6 @@ if test "${with_external_thes_dir+set}" = set; then
 fi
 
 
-# Check whether --with-writer2latex was given.
-if test "${with_writer2latex+set}" = set; then
-  withval=$with_writer2latex;
-fi
-
-
 # Check whether --with-system-libs was given.
 if test "${with_system_libs+set}" = set; then
   withval=$with_system_libs;
@@ -26534,9 +26523,9 @@ fi
         if test -z "$COMMONS_LOGGING_JAR"; then
                 COMMONS_LOGGING_JAR=/usr/share/java/commons-logging-1.1.1.jar
         fi
-   as_ac_File=`echo "ac_cv_file_$COMMONS_HTTPCLIENT_JAR" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for $COMMONS_HTTPCLIENT_JAR" >&5
-echo $ECHO_N "checking for $COMMONS_HTTPCLIENT_JAR... $ECHO_C" >&6; }
+   as_ac_File=`echo "ac_cv_file_$COMMONS_LOGGING_JAR" | $as_tr_sh`
+{ echo "$as_me:$LINENO: checking for $COMMONS_LOGGING_JAR" >&5
+echo $ECHO_N "checking for $COMMONS_LOGGING_JAR... $ECHO_C" >&6; }
 if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -26544,7 +26533,7 @@ else
   { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
 echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
    { (exit 1); exit 1; }; }
-if test -r "$COMMONS_HTTPCLIENT_JAR"; then
+if test -r "$COMMONS_LOGGING_JAR"; then
   eval "$as_ac_File=yes"
 else
   eval "$as_ac_File=no"
@@ -26556,8 +26545,8 @@ echo "${ECHO_T}$ac_res" >&6; }
 if test `eval echo '${'$as_ac_File'}'` = yes; then
   :
 else
-  { { echo "$as_me:$LINENO: error: commons-httpclient.jar not found." >&5
-echo "$as_me: error: commons-httpclient.jar not found." >&2;}
+  { { echo "$as_me:$LINENO: error: commons-logging.jar not found." >&5
+echo "$as_me: error: commons-logging.jar not found." >&2;}
    { (exit 1); exit 1; }; }
 fi
 
@@ -27271,21 +27260,6 @@ echo "${ECHO_T}no" >&6; }
 fi
 
 
-{ echo "$as_me:$LINENO: checking whether to include writer2latex" >&5
-echo $ECHO_N "checking whether to include writer2latex... $ECHO_C" >&6; }
-if test "$with_writer2latex" != "no" ; then
-  { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
-  WITH_WRITER2LATEX=YES
-  BUILD_TYPE="$BUILD_TYPE WRITER2LATEX"
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-  WITH_WRITER2LATEX=NO
-  SCPDEFS="$SCPDEFS -DWITHOUT_WRITER2LATEX"
-fi
-
-
 
 
 { echo "$as_me:$LINENO: checking whether and how to use Xinerama" >&5
@@ -29141,7 +29115,6 @@ SYSTEM_MSPACK!$SYSTEM_MSPACK$ac_delim
 WITH_FONTS!$WITH_FONTS$ac_delim
 WITHOUT_PPDS!$WITHOUT_PPDS$ac_delim
 WITHOUT_AFMS!$WITHOUT_AFMS$ac_delim
-WITH_WRITER2LATEX!$WITH_WRITER2LATEX$ac_delim
 SCPDEFS!$SCPDEFS$ac_delim
 USE_XINERAMA!$USE_XINERAMA$ac_delim
 XINERAMA_LINK!$XINERAMA_LINK$ac_delim
@@ -29164,7 +29137,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` = 80; then
+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 79; then
     break
   elif $ac_last_try; then
     { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
diff --git a/configure.in b/configure.in
index 1dde72ea7..4a7d5a751 100644
--- a/configure.in
+++ b/configure.in
@@ -304,11 +304,6 @@ AC_ARG_WITH(external-hyph-dir,
 AC_ARG_WITH(external-thes-dir,
 [  --with-external-thes-dir Specify external thesaurus dir
 ],,)
-AC_ARG_WITH(writer2latex,
-[  --without-writer2latex Removes writer2latex from openoffice.org installation
-                          set, for people building for specific distributions
-                          where writer2latex is known to be already available
-],,)
 AC_ARG_WITH(system-libs,
 [  --with-system-libs      Use libs already on system -- enables all
                           --with-system-* flags except mozilla and
@@ -5676,8 +5671,8 @@ 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
-   AC_CHECK_FILE($COMMONS_HTTPCLIENT_JAR, [],
-        [AC_MSG_ERROR(commons-httpclient.jar not found.)], [])
+   AC_CHECK_FILE($COMMONS_LOGGING_JAR, [],
+        [AC_MSG_ERROR(commons-logging.jar not found.)], [])
 
     fi
   else
@@ -5967,21 +5962,6 @@ else
 fi
 AC_SUBST(WITHOUT_AFMS)
 
-dnl ===================================================================
-dnl Test whether to include writer2latex
-dnl ===================================================================
-AC_MSG_CHECKING([whether to include writer2latex])
-if test "$with_writer2latex" != "no" ; then
-  AC_MSG_RESULT([yes])
-  WITH_WRITER2LATEX=YES
-  BUILD_TYPE="$BUILD_TYPE WRITER2LATEX"
-else
-  AC_MSG_RESULT([no])
-  WITH_WRITER2LATEX=NO
-  SCPDEFS="$SCPDEFS -DWITHOUT_WRITER2LATEX"
-fi
-AC_SUBST(WITH_WRITER2LATEX)
-
 AC_SUBST(SCPDEFS)
 
 AC_MSG_CHECKING([whether and how to use Xinerama])
diff --git a/scp2/source/writer/file_writer.scp b/scp2/source/writer/file_writer.scp
index 8df9f80c5..0a9c3fee6 100644
--- a/scp2/source/writer/file_writer.scp
+++ b/scp2/source/writer/file_writer.scp
@@ -60,17 +60,6 @@ File gid_File_Exe_Sweb
 End
 #endif
 
-#ifdef SOLAR_JAVA
-#ifndef WITHOUT_WRITER2LATEX
-File gid_File_Oxt_Writer2latex
-    TXT_FILE_BODY;
-    Name = "writer2latex.oxt";
-    Dir = gid_Brand_Dir_Share_Extension_Install;
-    Styles = (PACKED);
-End
-#endif
-#endif
-
 File gid_File_Registry_Spool_Oo_Office_Embedding_Writer_Xcu
     TXT_FILE_BODY;
     Styles = (PACKED);
diff --git a/scp2/source/writer/module_writer.scp b/scp2/source/writer/module_writer.scp
index ca23625b7..888aa40b4 100644
--- a/scp2/source/writer/module_writer.scp
+++ b/scp2/source/writer/module_writer.scp
@@ -111,14 +111,4 @@ Module gid_Module_Langpack_Writer_Template
              gid_File_Res_T602Filter);
 End
 
-Module gid_Module_Optional_Writer2latex
-    MOD_NAME_DESC(MODULE_PRG_WRT_WRITER2LATEX);
-    ParentID = gid_Module_Optional;
-    Default = YES;
-    InstallOrder = "1980";
-    PackageInfo = "packinfo_office.txt";
-    Styles = (FORCEINTOUPDATE);
-    Files = (gid_File_Oxt_Writer2latex);
-End
-
 #include "alllangmodules_writer.inc"
diff --git a/set_soenv.in b/set_soenv.in
index 189ebaa63..405b935c4 100644
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -1911,7 +1911,6 @@ ToFile( "MOZ_LIB_XPCOM",     "@MOZ_LIB_XPCOM@",    "e" );
 ToFile( "MOZ_NSPR_CFLAGS",   "@MOZ_NSPR_CFLAGS@",  "e" );
 ToFile( "MOZ_NSS_CFLAGS",    "@MOZ_NSS_CFLAGS@",   "e" );
 ToFile( "MOZ_LDAP_CFLAGS",   "@MOZ_LDAP_CFLAGS@",  "e" );
-ToFile( "WITH_WRITER2LATEX", "@WITH_WRITER2LATEX@", "e" );
 ToFile( "WITH_FONTS",        "@WITH_FONTS@",       "e" );
 ToFile( "WITHOUT_AFMS",      "@WITHOUT_AFMS@",     "e" );
 ToFile( "WITHOUT_PPDS",      "@WITHOUT_PPDS@",     "e" );