diff options
| author | Caolán McNamara <cmc@openoffice.org> | 2010-05-31 22:58:51 +0100 |
|---|---|---|
| committer | Caolán McNamara <cmc@openoffice.org> | 2010-05-31 22:58:51 +0100 |
| commit | 25de2a6c3883d4509f9534cb596131a9d2682d03 (patch) | |
| tree | 937d5619250ed88c8d436e41ce4311173ba130da /configure.in | |
| parent | 2e11b140f8db478f3118203a96bef2b62799e803 (diff) | |
| parent | 0770b2664645eca8a6669bb134ab9a59349ff0b6 (diff) | |
cmcfixes74: merge with DEV300 m80
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 24 |
1 files changed, 3 insertions, 21 deletions
diff --git a/configure.in b/configure.in index ec2dfd57834c..254c9d81286f 100644 --- a/configure.in +++ b/configure.in @@ -118,10 +118,6 @@ AC_ARG_ENABLE(odk, [ --disable-odk OO.o includes an ODK, office development kit which some packagers may with to build without ],,enable_odk="yes") -AC_ARG_ENABLE(qadevooo, -[ --disable-qadevooo OO.o includes some qa testsuites which some - packagers may wish to build without -],,enable_qadevooo="yes") AC_ARG_ENABLE(mathmldtd, [ --disable-mathmldtd disable mathmldtd (useful for distributions that want to avoid packaging @@ -3496,20 +3492,6 @@ AC_SUBST(MINGWCXX) AC_SUBST(MINGWSTRIP) dnl =================================================================== -dnl Check for building qadevOOo -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 dnl =================================================================== if test "$_os" = "Linux" -a -z "$with_system_stdlibs" -a -z "$with_system_libs"; then @@ -6748,9 +6730,9 @@ if test "$SOLAR_JAVA" != "" && test "$with_junit" != "no"; then AC_MSG_RESULT([$OOO_JUNIT_JAR]) else AC_MSG_RESULT([no]) - AC_MSG_ERROR([cannot find JUnit 4 jar at $OOO_JUNIT_JAR; -please install one and/or specify its pathname via --with-junit=..., -or disable it via --without-junit]) + AC_MSG_ERROR([cannot find JUnit 4 jar; please install one in the default +location (/usr/share/java), specify its pathname via +--with-junit=..., or disable it via --without-junit]) fi fi AC_SUBST(OOO_JUNIT_JAR) |