[goffice] Use Lasem when present.
- From: Jean BrÃfort <jbrefort src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [goffice] Use Lasem when present.
- Date: Wed, 26 Sep 2012 19:21:10 +0000 (UTC)
commit 2714531d16b59114909195224c458fe72953b115
Author: Jean Brefort <jean brefort normalesup org>
Date: Wed Sep 26 21:21:11 2012 +0200
Use Lasem when present.
ChangeLog | 4 ++++
configure.in | 22 ++++++++++++++++++----
2 files changed, 22 insertions(+), 4 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 4f41acd..2153d26 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2012-09-26 Jean Brefort <jean brefort normalesup org>
+
+ * configure.in: automatically use lasem when present.
+
2012-09-23 Jean Brefort <jean brefort normalesup org>
* goffice/graph/gog-axis.c (map_linear_auto_bound): fix scale when data
diff --git a/configure.in b/configure.in
index aeab0e1..6b77a54 100644
--- a/configure.in
+++ b/configure.in
@@ -125,11 +125,24 @@ dnl Should we use lasem ?
dnl ***********************
goffice_with_lasem=false
-AC_ARG_WITH(lasem, [ --with-lasem Build with lasem use])
-if test "x$with_lasem" = xyes; then
- PKG_CHECK_MODULES(Lasem, lasem-0.4 >= 0.3.1)
+AC_ARG_WITH(lasem,
+ AS_HELP_STRING([--with-lasem[=@<:@no/auto/yes@:>@]],
+ [Build with lasem use (default=auto)]),
+ ,[with_lasem=auto])
+echo -n "\nlasem test result is: "
+echo "$with_lasem"
+echo ""
+
+AS_CASE([$with_lasem],
+ [no],[found_lasem="disabled by request"],
+ [auto], [
+ PKG_CHECK_MODULES(Lasem, lasem-0.4 >= 0.3.3,
+ [found_lasem="yes";goffice_with_lasem=true], [found_lasem="no, missing or too old lasem library"])
+ ],
+ [yes],[found_lasem="yes";
+ PKG_CHECK_MODULES(Lasem, lasem-0.4 >= 0.3.3);
goffice_with_lasem=true
-fi
+ ],[AC_MSG_ERROR([invalid argument passed to --with-lasem, should be one of @<:@no/auto/yes@:>@])])
if test "x$goffice_with_lasem" = "xtrue" ; then
AC_DEFINE(GOFFICE_WITH_LASEM, 1, [Define if Lasem is used])
goffice_reqs="$goffice_reqs lasem-0.4 >= 0.3.1 "
@@ -796,6 +809,7 @@ Configuration:
Compiler: ${CC}
Compiler flags: ${CFLAGS}
Long double support: ${float_msg}
+ Equation support in graphs: ${found_lasem}
UI: ${ui_msg}
Configuration backend: ${conf_msg}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]