diff options
| author | Ivo Hinkelmann <ihi@openoffice.org> | 2009-04-23 11:44:51 +0000 |
|---|---|---|
| committer | Ivo Hinkelmann <ihi@openoffice.org> | 2009-04-23 11:44:51 +0000 |
| commit | bc54cd7501259e237bbcf1edab5412cf6160b348 (patch) | |
| tree | a67b3ebfe410ad59139dbe87c13e4180fda15c64 /configure.in | |
| parent | e2ebac26ff56ba14e26c7fb493226229a728e2ec (diff) | |
CWS-TOOLING: integrate CWS native241correct_DEV300
2009-04-06 15:56:56 +0200 rene r270566 : autoconf
2009-04-06 15:56:02 +0200 rene r270565 : remove writer2latex
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 24 |
1 files changed, 2 insertions, 22 deletions
diff --git a/configure.in b/configure.in index 33950defa86d..6dd68f6e6550 100644 --- a/configure.in +++ b/configure.in @@ -303,11 +303,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 @@ -5672,8 +5667,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 @@ -5963,21 +5958,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]) |