* configure.ac: Check the value of `enable_all' before triggering
optional modules.
---
ChangeLog | 7 +++++++
configure.ac | 17 ++++++++---------
2 files changed, 15 insertions(+), 9 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index cb5d835..b65b251 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
2010-10-21 Roland Levillain <roland(a)lrde.epita.fr>
+ Fix configure option `--enable-all'.
+
+ * configure.ac: Check the value of `enable_all' before triggering
+ optional modules.
+
+2010-10-21 Roland Levillain <roland(a)lrde.epita.fr>
+
Revamp the handling of Qt.
* configure.ac: Here.
diff --git a/configure.ac b/configure.ac
index 30064c0..38b3903 100644
--- a/configure.ac
+++ b/configure.ac
@@ -161,17 +161,16 @@ fi
# ``--disable-apps''), then the disable flag has priority.
AC_ARG_ENABLE([all],
- [AS_HELP_STRING([--enable-all],
- [enable maintainer mode])],
- [
- enable_trimesh=yes
- enable_swilena=yes
+ [AS_HELP_STRING([--enable-all], [enable maintainer mode])],
+ [if test "x$enable_all" != xno; then
+ enable_trimesh=yes
+ enable_swilena=yes
dnl<<lrde
- enable_scribo=yes
+ enable_scribo=yes
dnl>>
- enable_apps=yes
- enable_tools=yes
- ])
+ enable_apps=yes
+ enable_tools=yes
+ fi])
## ------------------ ##
--
1.5.6.5