Summary: | kalzium in 3.5.0 has support for ocaml+libfacile | ||
---|---|---|---|
Product: | Gentoo Linux | Reporter: | Dan Armak (RETIRED) <danarmak> |
Component: | [OLD] KDE | Assignee: | Gentoo KDE team <kde> |
Status: | RESOLVED FIXED | ||
Severity: | normal | CC: | eap |
Priority: | High | ||
Version: | unspecified | ||
Hardware: | All | ||
OS: | All | ||
Whiteboard: | |||
Package list: | Runtime testing required: | --- |
Description
Dan Armak (RETIRED)
2005-10-16 08:00:49 UTC
This has been fixed by upstream for 3.5.0_beta2, which is released tommorow (the configure.in check at least.. facile ebuild comes maybe sometime.. Sorry for bugspam.. It wasn't fixed, Misunderstanding with the developer of kde I was talking to.. patch incoming shortly.. SVN commit 475256 by pino: Add a configure flag to easily disable the Kalzium ocaml solver. @gentoo-kde team: could you please the bug? CCMAIL: 109474@bugs.gentoo.org SVN commit 475256 by pino: Add a configure flag to easily disable the Kalzium ocaml solver. @gentoo-kde team: could you please the bug? CCMAIL: 109474@bugs.gentoo.org M +1 -1 configure.in.bot M +29 -20 configure.in.in --- branches/KDE/3.5/kdeedu/kalzium/configure.in.bot #475255:475256 @@ -1,4 +1,4 @@ -if test "x$eqchem_enabled" = "xno"; then +if test x$eqchem_enabled = xno && test x$with_ocamlsolver != xno ; then cat << EOF The Kalzium Chemical Equation Solver has been disabled. Possible --- branches/KDE/3.5/kdeedu/kalzium/configure.in.in #475255:475256 @@ -29,29 +29,38 @@ AC_SUBST([FACILE]) ]) -OCAML_PROG -if test -n "$OCAML"; then - ocaml_installed=yes - FACILE_PROG -fi +AC_ARG_ENABLE( ocamlsolver, + [ --disable-ocamlsolver Disable support for the OCaml solver @<:@default=check@:>@]], + [ with_ocamlsolver=$enableval ], + [ with_ocamlsolver=check] ) -AH_TEMPLATE(HAVE_FACILE, facile solver available?) +if test "x$with_ocamlsolver" != xno; then + OCAML_PROG + if test -n "$OCAML"; then + ocaml_installed=yes + FACILE_PROG + fi -EQCHEM_SUB= -OCAMLLIB= -EQCHEM_LDADD= -if test "$eqchem_enabled" = "yes"; then - EQCHEM_SUB=solver - OCAMLLIB=`ocamlc -where` - FACILELIB=`ocamlc -where`/facile - EQCHEM_LDADD="-lasmrun -lstr -lnums -lm -ldl solver.o modwrap.o" + AH_TEMPLATE(HAVE_FACILE, facile solver available?) - AC_DEFINE(HAVE_FACILE, 1) -fi + EQCHEM_SUB= + OCAMLLIB= + EQCHEM_LDADD= + if test "$eqchem_enabled" = "yes"; then + EQCHEM_SUB=solver + OCAMLLIB=`ocamlc -where` + FACILELIB=`ocamlc -where`/facile + EQCHEM_LDADD="-lasmrun -lstr -lnums -lm -ldl solver.o modwrap.o" -AC_SUBST(EQCHEM_SUB) -AC_SUBST(OCAMLLIB) -AC_SUBST(FACILELIB) -AC_SUBST(EQCHEM_LDADD) + AC_DEFINE(HAVE_FACILE, 1) + fi + AC_SUBST(EQCHEM_SUB) + AC_SUBST(OCAMLLIB) + AC_SUBST(FACILELIB) + AC_SUBST(EQCHEM_LDADD) + if test "$eqchem_enabled" = "yes"; then + with_ocamlsolver=yes + fi +fi *** Bug 114132 has been marked as a duplicate of this bug. *** Passing --disable-ocamlsolver to configure for now. Will --disable-ocamlsolver be replaced by a useflag sometimes in future? (In reply to comment #6) > Will --disable-ocamlsolver be replaced by a useflag sometimes in future? I guess it won't happen before libfacile is in portage. |