On 26 Aug, ksch...@apache.org wrote: > Author: kschenk > Date: Fri Aug 26 14:49:44 2016 > New Revision: 1757861 > > URL: http://svn.apache.org/viewvc?rev=1757861&view=rev > Log: > Put configure.ac back to r1755455 before junit, hamcrest vesion checks. > Newere versions have not been reverted. > > > Modified: > openoffice/trunk/main/configure.ac > > Modified: openoffice/trunk/main/configure.ac > URL: > http://svn.apache.org/viewvc/openoffice/trunk/main/configure.ac?rev=1757861&r1=1757860&r2=1757861&view=diff > ============================================================================== > --- openoffice/trunk/main/configure.ac (original) > +++ openoffice/trunk/main/configure.ac Fri Aug 26 14:49:44 2016 > @@ -680,17 +680,10 @@ AC_ARG_WITH(ant-home, > AC_ARG_WITH(junit, > [ --with-junit Specifies the JUnit 4 jar file to use for > JUnit-based > tests. --without-junit disables those tests. Not > - relevant in the --without-java case. The > --with-hamcrest-core > - option is also necessary. > + relevant in the --without-java case. > > Usage: --with-junit=<absolute path to JUnit 4 jar> > ],,with_junit=yes) > -AC_ARG_WITH(hamcrest-core, > -[ --with-hamcrest-core Specifies the hamcrest-core 1.3 jar file to use > for > - JUnit-based tests. --without-junit disables those > - tests. Not relevant in the --without-java or > - --without-junit cases. > -],,with_hamcrest_core=yes) > AC_ARG_WITH(perl-home, > [ --with-perl-home If you have installed the Perl 5 Distribution, on > your > system, please supply the path here. > @@ -870,12 +863,6 @@ AC_ARG_WITH(asm-home, > > Usage: --with-asm-home=<path to ml.exe directory> > ],,) > -AC_ARG_WITH(nasm-home, > -[ --with-nasm-home For Windows users, please supply the path for the > - nasm.exe assembler. > - > - Usage: --with-nasm-home=<path to nasm.exe > directory> > -],,)
The nasm stuff is needed is now needed for Windows builds ... --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@openoffice.apache.org For additional commands, e-mail: dev-h...@openoffice.apache.org
