configure.in | 18 ------------------ set_soenv.in | 8 ++------ 2 files changed, 2 insertions(+), 24 deletions(-)
New commits: commit 0759e36f887f5612ecd84efe8f9397a35a10a7fd Author: Tor Lillqvist <tlillqv...@suse.com> Date: Mon Jan 9 12:49:35 2012 +0200 Kill --with-local-solver diff --git a/configure.in b/configure.in index 59c51f2..204065b 100644 --- a/configure.in +++ b/configure.in @@ -1598,14 +1598,6 @@ AC_ARG_WITH(mozilla-build, MOZILLABUILD=$withval , ) -AC_ARG_WITH(local-solver, - AS_HELP_STRING([--with-local-solver], - [If you have solver in a location other than ./solver, please supply the path here.]) - [ - Usage: --with-local-solver=<abs. path to solver> - ], -,) - AC_ARG_WITH(lang, AS_HELP_STRING([--with-lang], [Use this option to build LibreOffice with additional language support. @@ -10395,16 +10387,6 @@ if test -z "$COMPATH"; then fi AC_SUBST(COMPATH) -AC_MSG_CHECKING([solver path]) -if test -z "$with_local_solver"; then - LOCAL_SOLVER="DEFAULT" - AC_MSG_RESULT([default]) -else - LOCAL_SOLVER=$with_local_solver - AC_MSG_RESULT([$with_local_solver]) -fi -AC_SUBST(LOCAL_SOLVER) - AC_SUBST(BUILD_TYPE) if test "$WITH_MINGW" != "yes" ; then diff --git a/set_soenv.in b/set_soenv.in index 57ccb36..129d4f3 100755 --- a/set_soenv.in +++ b/set_soenv.in @@ -428,12 +428,8 @@ if ('@TARFILE_LOCATION@' eq "DEFAULT") # $SOLARENV = PathFormat($SRC_ROOT.$SOLENV); # Location of the solver tree. -if ('@LOCAL_SOLVER@' eq "DEFAULT") -{ $SOLARVER = $SRC_ROOT.$SOLVER; -} -else -{ $SOLARVER = PathFormat('@LOCAL_SOLVER@'); -} +$SOLARVER = $SRC_ROOT.$SOLVER; + #Location of Solar version. $SOLARVERSION = '$SOLARVER'; _______________________________________________ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits