mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Kill --with-local-solver

Browse Source
This commit is contained in:
Tor Lillqvist 2012-01-09 12:49:35 +02:00
parent 04292aee15
commit 0759e36f88
2 changed files with 2 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
configure.in
View File

@ -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

8
set_soenv.in
View File

@ -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';