diff options
-rwxr-xr-x | config_office/configure | 794 | ||||
-rw-r--r-- | config_office/configure.in | 1 | ||||
-rw-r--r-- | scp2/source/writer/file_writer.scp | 6 | ||||
-rw-r--r-- | scp2/source/writer/module_writer.scp | 9 | ||||
-rw-r--r-- | scp2/source/writer/module_writer.ulf | 5 | ||||
-rw-r--r-- | solenv/config/sdev300.ini | 2 |
6 files changed, 759 insertions, 58 deletions
diff --git a/config_office/configure b/config_office/configure index 86d97fdbccfc..a5e96ab5e061 100755 --- a/config_office/configure +++ b/config_office/configure @@ -1897,6 +1897,7 @@ Optional Packages: --with-flute-jar=JARFILE Specify path to jarfile manually --with-jfreereport-jar=JARFILE Specify path to jarfile manually --with-liblayout-jar=JARFILE Specify path to jarfile manually + --with-libloader-jar=JARFILE Specify path to jarfile manually --with-libformula-jar=JARFILE Specify path to jarfile manually --with-librepository-jar=JARFILE Specify path to jarfile manually --with-libfonts-jar=JARFILE Specify path to jarfile manually @@ -3213,6 +3214,13 @@ if test "${with_liblayout_jar+set}" = set; then fi +# Check whether --with-libloader-jar was given. +if test "${with_libloader_jar+set}" = set; then + withval=$with_libloader_jar; LIBLOADER_JAR="$withval" + +fi + + # Check whether --with-libformula-jar was given. if test "${with_libformula_jar+set}" = set; then withval=$with_libformula_jar; LIBFORMULA_JAR="$withval" @@ -15194,9 +15202,59 @@ if test -n "$with_system_lucene" -o -n "$with_system_libs" && \ echo "${ECHO_T}external" >&6; } SYSTEM_LUCENE=YES if test -z $LUCENE_CORE_JAR; then - LUCENE_CORE_JAR=/usr/share/java/lucene-core-2.3.jar - fi - as_ac_File=`echo "ac_cv_file_$LUCENE_CORE_JAR" | $as_tr_sh` + { echo "$as_me:$LINENO: checking for /usr/share/java/lucene-core-2.3.jar" >&5 +echo $ECHO_N "checking for /usr/share/java/lucene-core-2.3.jar... $ECHO_C" >&6; } +if test "${ac_cv_file__usr_share_java_lucene_core_2_3_jar+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + test "$cross_compiling" = yes && + { { 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 "/usr/share/java/lucene-core-2.3.jar"; then + ac_cv_file__usr_share_java_lucene_core_2_3_jar=yes +else + ac_cv_file__usr_share_java_lucene_core_2_3_jar=no +fi +fi +{ echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_lucene_core_2_3_jar" >&5 +echo "${ECHO_T}$ac_cv_file__usr_share_java_lucene_core_2_3_jar" >&6; } +if test $ac_cv_file__usr_share_java_lucene_core_2_3_jar = yes; then + LUCENE_CORE_JAR=/usr/share/java/lucene-core-2.3.jar +else + + { echo "$as_me:$LINENO: checking for /usr/share/java/lucene.jar" >&5 +echo $ECHO_N "checking for /usr/share/java/lucene.jar... $ECHO_C" >&6; } +if test "${ac_cv_file__usr_share_java_lucene_jar+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + test "$cross_compiling" = yes && + { { 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 "/usr/share/java/lucene.jar"; then + ac_cv_file__usr_share_java_lucene_jar=yes +else + ac_cv_file__usr_share_java_lucene_jar=no +fi +fi +{ echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_lucene_jar" >&5 +echo "${ECHO_T}$ac_cv_file__usr_share_java_lucene_jar" >&6; } +if test $ac_cv_file__usr_share_java_lucene_jar = yes; then + LUCENE_CORE_JAR=/usr/share/java/lucene.jar +else + { { echo "$as_me:$LINENO: error: lucene-core.jar replacement not found" >&5 +echo "$as_me: error: lucene-core.jar replacement not found" >&2;} + { (exit 1); exit 1; }; } + +fi + + + +fi + + else + as_ac_File=`echo "ac_cv_file_$LUCENE_CORE_JAR" | $as_tr_sh` { echo "$as_me:$LINENO: checking for $LUCENE_CORE_JAR" >&5 echo $ECHO_N "checking for $LUCENE_CORE_JAR... $ECHO_C" >&6; } if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then @@ -15223,12 +15281,64 @@ echo "$as_me: error: lucene-core.jar not found." >&2;} { (exit 1); exit 1; }; } fi - if test -z $LUCENE_ANALYZERS_JAR; then - LUCENE_ANALYZERS_JAR=/usr/share/java/lucene-analyzers-2.3.jar fi - as_ac_File=`echo "ac_cv_file_$LUCENE_ANALYZERS_JAR" | $as_tr_sh` -{ echo "$as_me:$LINENO: checking for $LUCENE_ANALYZERS_JAR" >&5 -echo $ECHO_N "checking for $LUCENE_ANALYZERS_JAR... $ECHO_C" >&6; } + + if test -z $LUCENE_ANALYZERS_JAR; then + { echo "$as_me:$LINENO: checking for /usr/share/java/lucene-analyzers-2.3.jar" >&5 +echo $ECHO_N "checking for /usr/share/java/lucene-analyzers-2.3.jar... $ECHO_C" >&6; } +if test "${ac_cv_file__usr_share_java_lucene_analyzers_2_3_jar+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + test "$cross_compiling" = yes && + { { 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 "/usr/share/java/lucene-analyzers-2.3.jar"; then + ac_cv_file__usr_share_java_lucene_analyzers_2_3_jar=yes +else + ac_cv_file__usr_share_java_lucene_analyzers_2_3_jar=no +fi +fi +{ echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_lucene_analyzers_2_3_jar" >&5 +echo "${ECHO_T}$ac_cv_file__usr_share_java_lucene_analyzers_2_3_jar" >&6; } +if test $ac_cv_file__usr_share_java_lucene_analyzers_2_3_jar = yes; then + LUCENE_ANALYZERS_JAR=/usr/share/java/lucene-analyzers-2.3.jar +else + + { echo "$as_me:$LINENO: checking for /usr/share/java/lucene-contrib/lucene-analyzers.jar" >&5 +echo $ECHO_N "checking for /usr/share/java/lucene-contrib/lucene-analyzers.jar... $ECHO_C" >&6; } +if test "${ac_cv_file__usr_share_java_lucene_contrib_lucene_analyzers_jar+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + test "$cross_compiling" = yes && + { { 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 "/usr/share/java/lucene-contrib/lucene-analyzers.jar"; then + ac_cv_file__usr_share_java_lucene_contrib_lucene_analyzers_jar=yes +else + ac_cv_file__usr_share_java_lucene_contrib_lucene_analyzers_jar=no +fi +fi +{ echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_lucene_contrib_lucene_analyzers_jar" >&5 +echo "${ECHO_T}$ac_cv_file__usr_share_java_lucene_contrib_lucene_analyzers_jar" >&6; } +if test $ac_cv_file__usr_share_java_lucene_contrib_lucene_analyzers_jar = yes; then + LUCENE_ANALYZERS_JAR=/usr/share/java/lucene-contrib/lucene-analyzers.jar +else + { { echo "$as_me:$LINENO: error: lucene-analyzers.jar replacement not found." >&5 +echo "$as_me: error: lucene-analyzers.jar replacement not found." >&2;} + { (exit 1); exit 1; }; } + +fi + + + +fi + + else + as_ac_File=`echo "ac_cv_file_$LUCENE_CORE_JAR" | $as_tr_sh` +{ echo "$as_me:$LINENO: checking for $LUCENE_CORE_JAR" >&5 +echo $ECHO_N "checking for $LUCENE_CORE_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 @@ -15236,7 +15346,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 "$LUCENE_ANALYZERS_JAR"; then +if test -r "$LUCENE_CORE_JAR"; then eval "$as_ac_File=yes" else eval "$as_ac_File=no" @@ -15248,11 +15358,12 @@ echo "${ECHO_T}$ac_res" >&6; } if test `eval echo '${'$as_ac_File'}'` = yes; then : else - { { echo "$as_me:$LINENO: error: lucene-analyzers.jar not found." >&5 + { { echo "$as_me:$LINENO: error: lucene-analyzers.jar not found." >&5 echo "$as_me: error: lucene-analyzers.jar not found." >&2;} { (exit 1); exit 1; }; } fi + fi else { echo "$as_me:$LINENO: result: internal" >&5 echo "${ECHO_T}internal" >&6; } @@ -24338,6 +24449,11 @@ echo "${ECHO_T}no" >&6; } { echo "$as_me:$LINENO: checking whether to enable GIO support" >&5 echo $ECHO_N "checking whether to enable GIO support... $ECHO_C" >&6; } if test "$_os" != "WINNT" -a "$_os" != "Darwin" -a "$enable_gio" = "yes"; then + if test "$ENABLE_GNOMEVFS" = "TRUE" ; then + { { echo "$as_me:$LINENO: error: please use --enable-gio only together with --disable-gnome-vfs." >&5 +echo "$as_me: error: please use --enable-gio only together with --disable-gnome-vfs." >&2;} + { (exit 1); exit 1; }; } + fi ENABLE_GIO="TRUE" { echo "$as_me:$LINENO: result: yes" >&5 echo "${ECHO_T}yes" >&6; } @@ -25127,7 +25243,7 @@ echo "${ECHO_T}external" >&6; } if test -z "$COMMONS_CODEC_JAR"; then COMMONS_CODEC_JAR=/usr/share/java/commons-codec-1.3.jar fi - as_ac_File=`echo "ac_cv_file_$COMMONS_CODEC_JAR" | $as_tr_sh` + as_ac_File=`echo "ac_cv_file_$COMMONS_CODEC_JAR" | $as_tr_sh` { echo "$as_me:$LINENO: checking for $COMMONS_CODEC_JAR" >&5 echo $ECHO_N "checking for $COMMONS_CODEC_JAR... $ECHO_C" >&6; } if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then @@ -25157,7 +25273,7 @@ fi if test -z "$COMMONS_LANG_JAR"; then COMMONS_LANG_JAR=/usr/share/java/commons-lang-2.3.jar fi - as_ac_File=`echo "ac_cv_file_$COMMONS_LANG_JAR" | $as_tr_sh` + as_ac_File=`echo "ac_cv_file_$COMMONS_LANG_JAR" | $as_tr_sh` { echo "$as_me:$LINENO: checking for $COMMONS_LANG_JAR" >&5 echo $ECHO_N "checking for $COMMONS_LANG_JAR... $ECHO_C" >&6; } if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then @@ -25187,7 +25303,7 @@ fi if test -z "$COMMONS_HTTPCLIENT_JAR"; then COMMONS_HTTPCLIENT_JAR=/usr/share/java/commons-httpclient-3.1.jar fi - as_ac_File=`echo "ac_cv_file_$COMMONS_HTTPCLIENT_JAR" | $as_tr_sh` + 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; } if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then @@ -25214,10 +25330,61 @@ echo "$as_me: error: commons-httpclient.jar not found." >&2;} { (exit 1); exit 1; }; } 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_LOGGING_JAR" | $as_tr_sh` + + if test -z $COMMONS_LOGGING_JAR; then + { echo "$as_me:$LINENO: checking for /usr/share/java/commons-logging-1.1.1.jar" >&5 +echo $ECHO_N "checking for /usr/share/java/commons-logging-1.1.1.jar... $ECHO_C" >&6; } +if test "${ac_cv_file__usr_share_java_commons_logging_1_1_1_jar+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + test "$cross_compiling" = yes && + { { 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 "/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 +{ echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_commons_logging_1_1_1_jar" >&5 +echo "${ECHO_T}$ac_cv_file__usr_share_java_commons_logging_1_1_1_jar" >&6; } +if test $ac_cv_file__usr_share_java_commons_logging_1_1_1_jar = yes; then + COMMONS_LOGGING_JAR=/usr/share/java/commons-logging-1.1.1.jar +else + + { echo "$as_me:$LINENO: checking for /usr/share/java/commons-logging.jar" >&5 +echo $ECHO_N "checking for /usr/share/java/commons-logging.jar... $ECHO_C" >&6; } +if test "${ac_cv_file__usr_share_java_commons_logging_jar+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + test "$cross_compiling" = yes && + { { 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 "/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 +{ echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_commons_logging_jar" >&5 +echo "${ECHO_T}$ac_cv_file__usr_share_java_commons_logging_jar" >&6; } +if test $ac_cv_file__usr_share_java_commons_logging_jar = yes; then + COMMONS_LOGGING_JAR=/usr/share/java/commons-logging.jar +else + { { echo "$as_me:$LINENO: error: commons-logging.jar replacement not found." >&5 +echo "$as_me: error: commons-logging.jar replacement not found." >&2;} + { (exit 1); exit 1; }; } + +fi + + + +fi + + else + 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 @@ -25244,6 +25411,7 @@ echo "$as_me: error: commons-logging.jar not found." >&2;} { (exit 1); exit 1; }; } fi + fi else { echo "$as_me:$LINENO: result: internal" >&5 echo "${ECHO_T}internal" >&6; } @@ -25320,11 +25488,61 @@ echo "${ECHO_T}yes" >&6; } echo $ECHO_N "checking which jfreereport libs to use... $ECHO_C" >&6; } if test "$with_system_jfreereport" == "yes"; then SYSTEM_JFREEREPORT=YES - { echo "$as_me:$LINENO: result: external" >&5 + { echo "$as_me:$LINENO: result: external" >&5 echo "${ECHO_T}external" >&6; } - if test -z $JCOMMON_JAR; then - JCOMMON_JAR=/usr/share/java/jcommon-1.0.10.jar - fi + if test -z $JCOMMON_JAR; then + { echo "$as_me:$LINENO: checking for /usr/share/java/jcommon-1.0.10.jar" >&5 +echo $ECHO_N "checking for /usr/share/java/jcommon-1.0.10.jar... $ECHO_C" >&6; } +if test "${ac_cv_file__usr_share_java_jcommon_1_0_10_jar+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + test "$cross_compiling" = yes && + { { 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 "/usr/share/java/jcommon-1.0.10.jar"; then + ac_cv_file__usr_share_java_jcommon_1_0_10_jar=yes +else + ac_cv_file__usr_share_java_jcommon_1_0_10_jar=no +fi +fi +{ echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_jcommon_1_0_10_jar" >&5 +echo "${ECHO_T}$ac_cv_file__usr_share_java_jcommon_1_0_10_jar" >&6; } +if test $ac_cv_file__usr_share_java_jcommon_1_0_10_jar = yes; then + JCOMMON_JAR=/usr/share/java/jcommon-1.0.10.jar +else + + { echo "$as_me:$LINENO: checking for /usr/share/java/jcommon.jar" >&5 +echo $ECHO_N "checking for /usr/share/java/jcommon.jar... $ECHO_C" >&6; } +if test "${ac_cv_file__usr_share_java_jcommon_jar+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + test "$cross_compiling" = yes && + { { 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 "/usr/share/java/jcommon.jar"; then + ac_cv_file__usr_share_java_jcommon_jar=yes +else + ac_cv_file__usr_share_java_jcommon_jar=no +fi +fi +{ echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_jcommon_jar" >&5 +echo "${ECHO_T}$ac_cv_file__usr_share_java_jcommon_jar" >&6; } +if test $ac_cv_file__usr_share_java_jcommon_jar = yes; then + JCOMMON_JAR=/usr/share/java/jcommon.jar +else + { { echo "$as_me:$LINENO: error: jcommon.jar replacement not found." >&5 +echo "$as_me: error: jcommon.jar replacement not found." >&2;} + { (exit 1); exit 1; }; } + +fi + + + +fi + + else as_ac_File=`echo "ac_cv_file_$JCOMMON_JAR" | $as_tr_sh` { echo "$as_me:$LINENO: checking for $JCOMMON_JAR" >&5 echo $ECHO_N "checking for $JCOMMON_JAR... $ECHO_C" >&6; } @@ -25352,10 +25570,12 @@ echo "$as_me: error: jcommon.jar not found." >&2;} { (exit 1); exit 1; }; } fi - if test -z $SAC_JAR; then - SAC_JAR=/usr/share/java/sac.jar - fi - as_ac_File=`echo "ac_cv_file_$SAC_JAR" | $as_tr_sh` + fi + + if test -z $SAC_JAR; then + SAC_JAR=/usr/share/java/sac.jar + fi + as_ac_File=`echo "ac_cv_file_$SAC_JAR" | $as_tr_sh` { echo "$as_me:$LINENO: checking for $SAC_JAR" >&5 echo $ECHO_N "checking for $SAC_JAR... $ECHO_C" >&6; } if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then @@ -25382,9 +25602,60 @@ echo "$as_me: error: sac.jar not found." >&2;} { (exit 1); exit 1; }; } fi - if test -z $LIBXML_JAR; then - LIBXML_JAR=/usr/share/java/libxml-0.9.9.jar - fi + + if test -z $LIBXML_JAR; then + { echo "$as_me:$LINENO: checking for /usr/share/java/libxml-0.9.9.jar" >&5 +echo $ECHO_N "checking for /usr/share/java/libxml-0.9.9.jar... $ECHO_C" >&6; } +if test "${ac_cv_file__usr_share_java_libxml_0_9_9_jar+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + test "$cross_compiling" = yes && + { { 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 "/usr/share/java/libxml-0.9.9.jar"; then + ac_cv_file__usr_share_java_libxml_0_9_9_jar=yes +else + ac_cv_file__usr_share_java_libxml_0_9_9_jar=no +fi +fi +{ echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_libxml_0_9_9_jar" >&5 +echo "${ECHO_T}$ac_cv_file__usr_share_java_libxml_0_9_9_jar" >&6; } +if test $ac_cv_file__usr_share_java_libxml_0_9_9_jar = yes; then + LIBXML_JAR=/usr/share/java/libxml-0.9.9.jar +else + + { echo "$as_me:$LINENO: checking for /usr/share/java/libxml.jar" >&5 +echo $ECHO_N "checking for /usr/share/java/libxml.jar... $ECHO_C" >&6; } +if test "${ac_cv_file__usr_share_java_libxml_jar+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + test "$cross_compiling" = yes && + { { 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 "/usr/share/java/libxml.jar"; then + ac_cv_file__usr_share_java_libxml_jar=yes +else + ac_cv_file__usr_share_java_libxml_jar=no +fi +fi +{ echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_libxml_jar" >&5 +echo "${ECHO_T}$ac_cv_file__usr_share_java_libxml_jar" >&6; } +if test $ac_cv_file__usr_share_java_libxml_jar = yes; then + LIBXML_JAR=/usr/share/java/libxml.jar +else + { { echo "$as_me:$LINENO: error: libxml.jar replacement not found." >&5 +echo "$as_me: error: libxml.jar replacement not found." >&2;} + { (exit 1); exit 1; }; } + +fi + + + +fi + + else as_ac_File=`echo "ac_cv_file_$LIBXML_JAR" | $as_tr_sh` { echo "$as_me:$LINENO: checking for $LIBXML_JAR" >&5 echo $ECHO_N "checking for $LIBXML_JAR... $ECHO_C" >&6; } @@ -25412,9 +25683,61 @@ echo "$as_me: error: libxml.jar not found." >&2;} { (exit 1); exit 1; }; } fi - if test -z $FLUTE_JAR; then - FLUTE_JAR=/usr/share/java/flute-1.3-jfree-20061107.jar - fi + fi + + if test -z $FLUTE_JAR; then + { echo "$as_me:$LINENO: checking for /usr/share/java/flute-1.3-jfree-20061107.jar" >&5 +echo $ECHO_N "checking for /usr/share/java/flute-1.3-jfree-20061107.jar... $ECHO_C" >&6; } +if test "${ac_cv_file__usr_share_java_flute_1_3_jfree_20061107_jar+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + test "$cross_compiling" = yes && + { { 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 "/usr/share/java/flute-1.3-jfree-20061107.jar"; then + ac_cv_file__usr_share_java_flute_1_3_jfree_20061107_jar=yes +else + ac_cv_file__usr_share_java_flute_1_3_jfree_20061107_jar=no +fi +fi +{ echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_flute_1_3_jfree_20061107_jar" >&5 +echo "${ECHO_T}$ac_cv_file__usr_share_java_flute_1_3_jfree_20061107_jar" >&6; } +if test $ac_cv_file__usr_share_java_flute_1_3_jfree_20061107_jar = yes; then + FLUTE_JAR=/usr/share/java/flute-1.3-jfree-20061107.jar +else + + { echo "$as_me:$LINENO: checking for /usr/share/java/flute.jar" >&5 +echo $ECHO_N "checking for /usr/share/java/flute.jar... $ECHO_C" >&6; } +if test "${ac_cv_file__usr_share_java_flute_jar+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + test "$cross_compiling" = yes && + { { 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 "/usr/share/java/flute.jar"; then + ac_cv_file__usr_share_java_flute_jar=yes +else + ac_cv_file__usr_share_java_flute_jar=no +fi +fi +{ echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_flute_jar" >&5 +echo "${ECHO_T}$ac_cv_file__usr_share_java_flute_jar" >&6; } +if test $ac_cv_file__usr_share_java_flute_jar = yes; then + FLUTE_JAR=/usr/share/java/flute.jar +else + { { echo "$as_me:$LINENO: error: flute-1.3-jfree.jar replacement not found." >&5 +echo "$as_me: error: flute-1.3-jfree.jar replacement not found." >&2;} + { (exit 1); exit 1; }; } + +fi + + + +fi + + else as_ac_File=`echo "ac_cv_file_$FLUTE_JAR" | $as_tr_sh` { echo "$as_me:$LINENO: checking for $FLUTE_JAR" >&5 echo $ECHO_N "checking for $FLUTE_JAR... $ECHO_C" >&6; } @@ -25442,9 +25765,61 @@ echo "$as_me: error: flute-1.3-jfree.jar not found." >&2;} { (exit 1); exit 1; }; } fi - if test -z $JFREEREPORT_JAR; then - JFREEREPORT_JAR=/usr/share/java/pentaho-reporting-flow-engine-0.9.2.jar - fi + fi + + if test -z $JFREEREPORT_JAR; then + { echo "$as_me:$LINENO: checking for /usr/share/java/pentaho-reporting-flow-engine-0.9.2.jar" >&5 +echo $ECHO_N "checking for /usr/share/java/pentaho-reporting-flow-engine-0.9.2.jar... $ECHO_C" >&6; } +if test "${ac_cv_file__usr_share_java_pentaho_reporting_flow_engine_0_9_2_jar+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + test "$cross_compiling" = yes && + { { 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 "/usr/share/java/pentaho-reporting-flow-engine-0.9.2.jar"; then + ac_cv_file__usr_share_java_pentaho_reporting_flow_engine_0_9_2_jar=yes +else + ac_cv_file__usr_share_java_pentaho_reporting_flow_engine_0_9_2_jar=no +fi +fi +{ echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_pentaho_reporting_flow_engine_0_9_2_jar" >&5 +echo "${ECHO_T}$ac_cv_file__usr_share_java_pentaho_reporting_flow_engine_0_9_2_jar" >&6; } +if test $ac_cv_file__usr_share_java_pentaho_reporting_flow_engine_0_9_2_jar = yes; then + JFREEREPORT_JAR=/usr/share/java/pentaho-reporting-flow-engine-0.9.2.jar +else + + { echo "$as_me:$LINENO: checking for /usr/share/java/pentaho-reporting-flow-engine.jar" >&5 +echo $ECHO_N "checking for /usr/share/java/pentaho-reporting-flow-engine.jar... $ECHO_C" >&6; } +if test "${ac_cv_file__usr_share_java_pentaho_reporting_flow_engine_jar+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + test "$cross_compiling" = yes && + { { 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 "/usr/share/java/pentaho-reporting-flow-engine.jar"; then + ac_cv_file__usr_share_java_pentaho_reporting_flow_engine_jar=yes +else + ac_cv_file__usr_share_java_pentaho_reporting_flow_engine_jar=no +fi +fi +{ echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_pentaho_reporting_flow_engine_jar" >&5 +echo "${ECHO_T}$ac_cv_file__usr_share_java_pentaho_reporting_flow_engine_jar" >&6; } +if test $ac_cv_file__usr_share_java_pentaho_reporting_flow_engine_jar = yes; then + JFREEREPORT_JAR=/usr/share/java/pentaho-reporting-flow-engine.jar +else + { { echo "$as_me:$LINENO: error: jfreereport.jar replacement not found." >&5 +echo "$as_me: error: jfreereport.jar replacement not found." >&2;} + { (exit 1); exit 1; }; } + +fi + + + +fi + + else as_ac_File=`echo "ac_cv_file_$JFREEREPORT_JAR" | $as_tr_sh` { echo "$as_me:$LINENO: checking for $JFREEREPORT_JAR" >&5 echo $ECHO_N "checking for $JFREEREPORT_JAR... $ECHO_C" >&6; } @@ -25472,9 +25847,61 @@ echo "$as_me: error: jfreereport.jar not found." >&2;} { (exit 1); exit 1; }; } fi - if test -z $LIBLAYOUT_JAR; then - LIBLAYOUT_JAR=/usr/share/java/liblayout-0.2.8.jar - fi + fi + + if test -z $LIBLAYOUT_JAR; then + { echo "$as_me:$LINENO: checking for /usr/share/java/liblayout-0.2.8.jar" >&5 +echo $ECHO_N "checking for /usr/share/java/liblayout-0.2.8.jar... $ECHO_C" >&6; } +if test "${ac_cv_file__usr_share_java_liblayout_0_2_8_jar+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + test "$cross_compiling" = yes && + { { 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 "/usr/share/java/liblayout-0.2.8.jar"; then + ac_cv_file__usr_share_java_liblayout_0_2_8_jar=yes +else + ac_cv_file__usr_share_java_liblayout_0_2_8_jar=no +fi +fi +{ echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_liblayout_0_2_8_jar" >&5 +echo "${ECHO_T}$ac_cv_file__usr_share_java_liblayout_0_2_8_jar" >&6; } +if test $ac_cv_file__usr_share_java_liblayout_0_2_8_jar = yes; then + LIBLAYOUT_JAR=/usr/share/java/liblayout-0.2.8.jar +else + + { echo "$as_me:$LINENO: checking for /usr/share/java/liblayout.jar" >&5 +echo $ECHO_N "checking for /usr/share/java/liblayout.jar... $ECHO_C" >&6; } +if test "${ac_cv_file__usr_share_java_liblayout_jar+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + test "$cross_compiling" = yes && + { { 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 "/usr/share/java/liblayout.jar"; then + ac_cv_file__usr_share_java_liblayout_jar=yes +else + ac_cv_file__usr_share_java_liblayout_jar=no +fi +fi +{ echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_liblayout_jar" >&5 +echo "${ECHO_T}$ac_cv_file__usr_share_java_liblayout_jar" >&6; } +if test $ac_cv_file__usr_share_java_liblayout_jar = yes; then + LIBLAYOUT_JAR=/usr/share/java/liblayout.jar +else + { { echo "$as_me:$LINENO: error: liblayout.jar replacement not found." >&5 +echo "$as_me: error: liblayout.jar replacement not found." >&2;} + { (exit 1); exit 1; }; } + +fi + + + +fi + + else as_ac_File=`echo "ac_cv_file_$LIBLAYOUT_JAR" | $as_tr_sh` { echo "$as_me:$LINENO: checking for $LIBLAYOUT_JAR" >&5 echo $ECHO_N "checking for $LIBLAYOUT_JAR... $ECHO_C" >&6; } @@ -25502,9 +25929,61 @@ echo "$as_me: error: liblayout.jar not found." >&2;} { (exit 1); exit 1; }; } fi - if test -z $LIBLOADER_JAR; then - LIBLOADER_JAR=/usr/share/java/libloader-0.3.6.jar - fi + fi + + if test -z $LIBLOADER_JAR; then + { echo "$as_me:$LINENO: checking for /usr/share/java/libloader-0.3.6.jar" >&5 +echo $ECHO_N "checking for /usr/share/java/libloader-0.3.6.jar... $ECHO_C" >&6; } +if test "${ac_cv_file__usr_share_java_libloader_0_3_6_jar+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + test "$cross_compiling" = yes && + { { 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 "/usr/share/java/libloader-0.3.6.jar"; then + ac_cv_file__usr_share_java_libloader_0_3_6_jar=yes +else + ac_cv_file__usr_share_java_libloader_0_3_6_jar=no +fi +fi +{ echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_libloader_0_3_6_jar" >&5 +echo "${ECHO_T}$ac_cv_file__usr_share_java_libloader_0_3_6_jar" >&6; } +if test $ac_cv_file__usr_share_java_libloader_0_3_6_jar = yes; then + LIBLOADER_JAR=/usr/share/java/libloader-0.3.6.jar +else + + { echo "$as_me:$LINENO: checking for /usr/share/java/libloader.jar" >&5 +echo $ECHO_N "checking for /usr/share/java/libloader.jar... $ECHO_C" >&6; } +if test "${ac_cv_file__usr_share_java_libloader_jar+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + test "$cross_compiling" = yes && + { { 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 "/usr/share/java/libloader.jar"; then + ac_cv_file__usr_share_java_libloader_jar=yes +else + ac_cv_file__usr_share_java_libloader_jar=no +fi +fi +{ echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_libloader_jar" >&5 +echo "${ECHO_T}$ac_cv_file__usr_share_java_libloader_jar" >&6; } +if test $ac_cv_file__usr_share_java_libloader_jar = yes; then + LIBLOADER_JAR=/usr/share/java/libloader.jar +else + { { echo "$as_me:$LINENO: error: libloader.jar replacement not found." >&5 +echo "$as_me: error: libloader.jar replacement not found." >&2;} + { (exit 1); exit 1; }; } + +fi + + + +fi + + else as_ac_File=`echo "ac_cv_file_$LIBLOADER_JAR" | $as_tr_sh` { echo "$as_me:$LINENO: checking for $LIBLOADER_JAR" >&5 echo $ECHO_N "checking for $LIBLOADER_JAR... $ECHO_C" >&6; } @@ -25532,9 +26011,61 @@ echo "$as_me: error: libloader.jar not found." >&2;} { (exit 1); exit 1; }; } fi - if test -z $LIBFORMULA_JAR; then - LIBFORMULA_JAR=/usr/share/java/libformula-0.1.14.jar - fi + fi + + if test -z $LIBFORMULA_JAR; then + { echo "$as_me:$LINENO: checking for /usr/share/java/libformula-0.1.14.jar" >&5 +echo $ECHO_N "checking for /usr/share/java/libformula-0.1.14.jar... $ECHO_C" >&6; } +if test "${ac_cv_file__usr_share_java_libformula_0_1_14_jar+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + test "$cross_compiling" = yes && + { { 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 "/usr/share/java/libformula-0.1.14.jar"; then + ac_cv_file__usr_share_java_libformula_0_1_14_jar=yes +else + ac_cv_file__usr_share_java_libformula_0_1_14_jar=no +fi +fi +{ echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_libformula_0_1_14_jar" >&5 +echo "${ECHO_T}$ac_cv_file__usr_share_java_libformula_0_1_14_jar" >&6; } +if test $ac_cv_file__usr_share_java_libformula_0_1_14_jar = yes; then + LIBFORMULA_JAR=/usr/share/java/libformula-0.1.14.jar +else + + { echo "$as_me:$LINENO: checking for /usr/share/java/libformula.jar" >&5 +echo $ECHO_N "checking for /usr/share/java/libformula.jar... $ECHO_C" >&6; } +if test "${ac_cv_file__usr_share_java_libformula_jar+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + test "$cross_compiling" = yes && + { { 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 "/usr/share/java/libformula.jar"; then + ac_cv_file__usr_share_java_libformula_jar=yes +else + ac_cv_file__usr_share_java_libformula_jar=no +fi +fi +{ echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_libformula_jar" >&5 +echo "${ECHO_T}$ac_cv_file__usr_share_java_libformula_jar" >&6; } +if test $ac_cv_file__usr_share_java_libformula_jar = yes; then + LIBFORMULA_JAR=/usr/share/java/libformula.jar +else + { { echo "$as_me:$LINENO: error: libformula.jar replacement not found." >&5 +echo "$as_me: error: libformula.jar replacement not found." >&2;} + { (exit 1); exit 1; }; } + +fi + + + +fi + + else as_ac_File=`echo "ac_cv_file_$LIBFORMULA_JAR" | $as_tr_sh` { echo "$as_me:$LINENO: checking for $LIBFORMULA_JAR" >&5 echo $ECHO_N "checking for $LIBFORMULA_JAR... $ECHO_C" >&6; } @@ -25562,9 +26093,61 @@ echo "$as_me: error: libformula.jar not found." >&2;} { (exit 1); exit 1; }; } fi - if test -z $LIBREPOSITORY_JAR; then - LIBREPOSITORY_JAR=/usr/share/java/librepository-0.1.4.jar - fi + fi + + if test -z $LIBREPOSITORY_JAR; then + { echo "$as_me:$LINENO: checking for /usr/share/java/librepository-0.1.4.jar" >&5 +echo $ECHO_N "checking for /usr/share/java/librepository-0.1.4.jar... $ECHO_C" >&6; } +if test "${ac_cv_file__usr_share_java_librepository_0_1_4_jar+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + test "$cross_compiling" = yes && + { { 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 "/usr/share/java/librepository-0.1.4.jar"; then + ac_cv_file__usr_share_java_librepository_0_1_4_jar=yes +else + ac_cv_file__usr_share_java_librepository_0_1_4_jar=no +fi +fi +{ echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_librepository_0_1_4_jar" >&5 +echo "${ECHO_T}$ac_cv_file__usr_share_java_librepository_0_1_4_jar" >&6; } +if test $ac_cv_file__usr_share_java_librepository_0_1_4_jar = yes; then + LIBREPOSITORY_JAR=/usr/share/java/librepository-0.1.4.jar +else + + { echo "$as_me:$LINENO: checking for /usr/share/java/librepository.jar" >&5 +echo $ECHO_N "checking for /usr/share/java/librepository.jar... $ECHO_C" >&6; } +if test "${ac_cv_file__usr_share_java_librepository_jar+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + test "$cross_compiling" = yes && + { { 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 "/usr/share/java/librepository.jar"; then + ac_cv_file__usr_share_java_librepository_jar=yes +else + ac_cv_file__usr_share_java_librepository_jar=no +fi +fi +{ echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_librepository_jar" >&5 +echo "${ECHO_T}$ac_cv_file__usr_share_java_librepository_jar" >&6; } +if test $ac_cv_file__usr_share_java_librepository_jar = yes; then + LIBREPOSITORY_JAR=/usr/share/java/librepository.jar +else + { { echo "$as_me:$LINENO: error: librepository.jar replacement not found." >&5 +echo "$as_me: error: librepository.jar replacement not found." >&2;} + { (exit 1); exit 1; }; } + +fi + + + +fi + + else as_ac_File=`echo "ac_cv_file_$LIBREPOSITORY_JAR" | $as_tr_sh` { echo "$as_me:$LINENO: checking for $LIBREPOSITORY_JAR" >&5 echo $ECHO_N "checking for $LIBREPOSITORY_JAR... $ECHO_C" >&6; } @@ -25592,9 +26175,61 @@ echo "$as_me: error: librepository.jar not found." >&2;} { (exit 1); exit 1; }; } fi - if test -z $LIBFONTS_JAR; then - LIBFONTS_JAR=/usr/share/java/libfonts-0.3.3.jar - fi + fi + + if test -z $LIBFONTS_JAR; then + { echo "$as_me:$LINENO: checking for /usr/share/java/libfonts-0.3.3.jar" >&5 +echo $ECHO_N "checking for /usr/share/java/libfonts-0.3.3.jar... $ECHO_C" >&6; } +if test "${ac_cv_file__usr_share_java_libfonts_0_3_3_jar+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + test "$cross_compiling" = yes && + { { 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 "/usr/share/java/libfonts-0.3.3.jar"; then + ac_cv_file__usr_share_java_libfonts_0_3_3_jar=yes +else + ac_cv_file__usr_share_java_libfonts_0_3_3_jar=no +fi +fi +{ echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_libfonts_0_3_3_jar" >&5 +echo "${ECHO_T}$ac_cv_file__usr_share_java_libfonts_0_3_3_jar" >&6; } +if test $ac_cv_file__usr_share_java_libfonts_0_3_3_jar = yes; then + LIBFONTS_JAR=/usr/share/java/libfonts-0.3.3.jar +else + + { echo "$as_me:$LINENO: checking for /usr/share/java/libfonts.jar" >&5 +echo $ECHO_N "checking for /usr/share/java/libfonts.jar... $ECHO_C" >&6; } +if test "${ac_cv_file__usr_share_java_libfonts_jar+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + test "$cross_compiling" = yes && + { { 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 "/usr/share/java/libfonts.jar"; then + ac_cv_file__usr_share_java_libfonts_jar=yes +else + ac_cv_file__usr_share_java_libfonts_jar=no +fi +fi +{ echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_libfonts_jar" >&5 +echo "${ECHO_T}$ac_cv_file__usr_share_java_libfonts_jar" >&6; } +if test $ac_cv_file__usr_share_java_libfonts_jar = yes; then + LIBFONTS_JAR=/usr/share/java/libfonts.jar +else + { { echo "$as_me:$LINENO: error: libfonts.jar replacement not found." >&5 +echo "$as_me: error: libfonts.jar replacement not found." >&2;} + { (exit 1); exit 1; }; } + +fi + + + +fi + + else as_ac_File=`echo "ac_cv_file_$LIBFONTS_JAR" | $as_tr_sh` { echo "$as_me:$LINENO: checking for $LIBFONTS_JAR" >&5 echo $ECHO_N "checking for $LIBFONTS_JAR... $ECHO_C" >&6; } @@ -25622,9 +26257,61 @@ echo "$as_me: error: libfonts.jar not found." >&2;} { (exit 1); exit 1; }; } fi - if test -z $JCOMMON_SERIALIZER_JAR; then - JCOMMON_SERIALIZER_JAR=/usr/share/java/jcommon-serializer-0.2.0.jar - fi + fi + + if test -z $JCOMMON_SERIALIZER_JAR; then + { echo "$as_me:$LINENO: checking for /usr/share/java/jcommon-serializer-0.2.0.jar" >&5 +echo $ECHO_N "checking for /usr/share/java/jcommon-serializer-0.2.0.jar... $ECHO_C" >&6; } +if test "${ac_cv_file__usr_share_java_jcommon_serializer_0_2_0_jar+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + test "$cross_compiling" = yes && + { { 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 "/usr/share/java/jcommon-serializer-0.2.0.jar"; then + ac_cv_file__usr_share_java_jcommon_serializer_0_2_0_jar=yes +else + ac_cv_file__usr_share_java_jcommon_serializer_0_2_0_jar=no +fi +fi +{ echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_jcommon_serializer_0_2_0_jar" >&5 +echo "${ECHO_T}$ac_cv_file__usr_share_java_jcommon_serializer_0_2_0_jar" >&6; } +if test $ac_cv_file__usr_share_java_jcommon_serializer_0_2_0_jar = yes; then + JCOMMON_SERIALIZER_JAR=/usr/share/java/jcommon-serializer-0.2.0.jar +else + + { echo "$as_me:$LINENO: checking for /usr/share/java/jcommon-serializer.jar" >&5 +echo $ECHO_N "checking for /usr/share/java/jcommon-serializer.jar... $ECHO_C" >&6; } +if test "${ac_cv_file__usr_share_java_jcommon_serializer_jar+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + test "$cross_compiling" = yes && + { { 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 "/usr/share/java/jcommon-serializer.jar"; then + ac_cv_file__usr_share_java_jcommon_serializer_jar=yes +else + ac_cv_file__usr_share_java_jcommon_serializer_jar=no +fi +fi +{ echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_jcommon_serializer_jar" >&5 +echo "${ECHO_T}$ac_cv_file__usr_share_java_jcommon_serializer_jar" >&6; } +if test $ac_cv_file__usr_share_java_jcommon_serializer_jar = yes; then + JCOMMON_SERIALIZER_JAR=/usr/share/java/jcommon-serializer.jar +else + { { echo "$as_me:$LINENO: error: jcommon-serializer.jar replacement not found." >&5 +echo "$as_me: error: jcommon-serializer.jar replacement not found." >&2;} + { (exit 1); exit 1; }; } + +fi + + + +fi + + else as_ac_File=`echo "ac_cv_file_$JCOMMON_SERIALIZER_JAR" | $as_tr_sh` { echo "$as_me:$LINENO: checking for $JCOMMON_SERIALIZER_JAR" >&5 echo $ECHO_N "checking for $JCOMMON_SERIALIZER_JAR... $ECHO_C" >&6; } @@ -25652,6 +26339,8 @@ echo "$as_me: error: jcommon-serializer.jar not found." >&2;} { (exit 1); exit 1; }; } fi + fi + else { echo "$as_me:$LINENO: result: internal" >&5 echo "${ECHO_T}internal" >&6; } @@ -26380,6 +27069,7 @@ 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; } diff --git a/config_office/configure.in b/config_office/configure.in index d1482470b877..98bf8022a0b1 100644 --- a/config_office/configure.in +++ b/config_office/configure.in @@ -5914,6 +5914,7 @@ 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 diff --git a/scp2/source/writer/file_writer.scp b/scp2/source/writer/file_writer.scp index 988f60814d16..8df9f80c5a2e 100644 --- a/scp2/source/writer/file_writer.scp +++ b/scp2/source/writer/file_writer.scp @@ -62,10 +62,10 @@ End #ifdef SOLAR_JAVA #ifndef WITHOUT_WRITER2LATEX -File gid_File_Jar_Writer2latex +File gid_File_Oxt_Writer2latex TXT_FILE_BODY; - Name = "writer2latex.jar"; - Dir = gid_Dir_Classes; + Name = "writer2latex.oxt"; + Dir = gid_Brand_Dir_Share_Extension_Install; Styles = (PACKED); End #endif diff --git a/scp2/source/writer/module_writer.scp b/scp2/source/writer/module_writer.scp index c220775b570b..7f9cae744902 100644 --- a/scp2/source/writer/module_writer.scp +++ b/scp2/source/writer/module_writer.scp @@ -59,7 +59,6 @@ Module gid_Module_Prg_Wrt_Bin gid_File_Jar_Email, gid_File_Jar_Mail, gid_File_Jar_Activation, - gid_File_Jar_Writer2latex, gid_File_Oo_Office_Ui_Writercommands_Xcs, gid_File_Oo_Office_Ui_Writercommands_Xcu, gid_File_Registry_Spool_Oo_Common_Writer_Xcu, @@ -111,4 +110,12 @@ 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; + PackageInfo = "packinfo_office.txt"; + Files = (gid_File_Oxt_Writer2latex); +End + #include "alllangmodules_writer.inc" diff --git a/scp2/source/writer/module_writer.ulf b/scp2/source/writer/module_writer.ulf index 3dd6998c0e21..32b9bf2804fb 100644 --- a/scp2/source/writer/module_writer.ulf +++ b/scp2/source/writer/module_writer.ulf @@ -46,5 +46,8 @@ en-US = "%PRODUCTNAME Writer Help" [STR_DESC_MODULE_PRG_WRT_HELP] en-US = "Help about %PRODUCTNAME Writer" +[STR_NAME_MODULE_PRG_WRT_WRITER2LATEX] +en-US = "LaTeX Export" - +[STR_DESC_MODULE_PRG_WRT_WRITER2LATEX] +en-US = "LaTeX export filter for Writer documents." diff --git a/solenv/config/sdev300.ini b/solenv/config/sdev300.ini index dd5ef7ef764a..c23d01aabc5f 100644 --- a/solenv/config/sdev300.ini +++ b/solenv/config/sdev300.ini @@ -18,7 +18,7 @@ common BMP_WRITES_FLAG TRUE BTARGET 1 BUILD_SPECIAL TRUE - BUILD_TYPE SO OOo EXT BINFILTER BITSTREAM_VERA_FONTS BSH CURL DICTIONARIES HSQLDB HUNSPELL JPEG LIBXML2 LIBXMLSEC LPSOLVE MOZ NEON TWAIN PYTHON ZLIB SANE UNIXODBC X11_EXTENSIONS LIBWPD EPM QADEVOOO ODK MSFONTEXTRACT MATHMLDTD BOOST EXPAT CRASHREP BERKELEYDB LIBXSLT SUN AGG GTK ICU SYSTRAY_GTK JAVAINSTALLER2 VIGRA OPENSSL JFREEREPORT APACHE_COMMONS TOMCAT REPORTDESIGN SDEXT SWEXT XPDF LUCENE REDLAND SAXON + BUILD_TYPE SO OOo EXT BINFILTER BITSTREAM_VERA_FONTS BSH CURL DICTIONARIES HSQLDB HUNSPELL JPEG LIBXML2 LIBXMLSEC LPSOLVE MOZ NEON TWAIN PYTHON ZLIB SANE UNIXODBC X11_EXTENSIONS LIBWPD EPM QADEVOOO ODK MSFONTEXTRACT MATHMLDTD BOOST EXPAT CRASHREP BERKELEYDB LIBXSLT SUN AGG GTK ICU SYSTRAY_GTK JAVAINSTALLER2 VIGRA OPENSSL JFREEREPORT APACHE_COMMONS TOMCAT REPORTDESIGN SDEXT SWEXT XPDF LUCENE REDLAND SAXON WRITER2LATEX common_build TRUE COMMON_OUTDIR common CONFIG_PROJECT config_office |